Deepesh Garg
|
12a9a3ffa3
|
Merge branch 'develop' into Product-Bundle-Balance
|
2019-05-29 18:23:21 +05:30 |
|
Shivam Mishra
|
9944ef2baf
|
Merge pull request #17791 from adityahase/remove-manifest
perf: Remove MANIFEST.in
|
2019-05-29 15:31:35 +05:30 |
|
Shivam Mishra
|
63d8cabb3d
|
fix: program card height bug
|
2019-05-29 15:16:59 +05:30 |
|
Shivam Mishra
|
b7874157f7
|
refactor: /lms redirects to home if lms is disbaled
|
2019-05-29 15:15:59 +05:30 |
|
Shivam Mishra
|
65681bf317
|
refactor: allow disbaling self enroll on lms
|
2019-05-29 15:15:30 +05:30 |
|
Aditya Hase
|
960c6138db
|
perf: Remove MANIFEST.in
Faster pip install -e erpnext
https://stackoverflow.com/questions/24727709/do-python-projects-need-a-manifest-in-and-what-should-be-in-it
https://github.com/frappe/frappe/pull/7360
|
2019-05-29 15:14:07 +05:30 |
|
Himanshu Mishra
|
70029b818b
|
Update status_updater.py
|
2019-05-29 14:19:35 +05:30 |
|
Nabin Hait
|
f1cde0ccf6
|
fix: Allowed '{' and '}' in naming series
|
2019-05-29 13:44:03 +05:30 |
|
Shivam Mishra
|
16f3b713bc
|
Merge branch 'lms-refactor' of github.com:scmmishra/erpnext into lms-refactor
|
2019-05-29 13:14:50 +05:30 |
|
Shivam Mishra
|
ae2871f962
|
feat: content not visible to guest users
|
2019-05-29 13:11:34 +05:30 |
|
Nabin Hait
|
99f27b94c1
|
Merge pull request #17773 from Anurag810/request_to_quatation_fix
fix: Changed dialog field to Select when we get supplier in request to quotation
|
2019-05-29 09:58:00 +05:30 |
|
Himanshu Warekar
|
38ed090bf8
|
test: fix test case
|
2019-05-29 00:16:04 +05:30 |
|
Himanshu Warekar
|
775e9e423a
|
refactor: QMS refactor initial bringup
|
2019-05-29 00:05:58 +05:30 |
|
Himanshu Warekar
|
8240f48a8e
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-05-28 23:40:57 +05:30 |
|
Himanshu Warekar
|
beba79c420
|
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
|
2019-05-28 23:40:43 +05:30 |
|
Himanshu Warekar
|
da91cfe1e2
|
fix: set default priority on sla change
|
2019-05-28 23:38:43 +05:30 |
|
deepeshgarg007
|
c97c7c51a9
|
fix: Test cases for accounting dimension
|
2019-05-28 18:51:10 +05:30 |
|
Faris Ansari
|
da2c742cea
|
Merge branch 'develop' into request_to_quatation_fix
|
2019-05-28 18:28:13 +05:30 |
|
Faris Ansari
|
dd016479af
|
fix: Remove print statement
|
2019-05-28 18:27:22 +05:30 |
|
Anurag Mishra
|
5afe9f2200
|
fix: changed dialog field to select
|
2019-05-28 18:23:34 +05:30 |
|
deepeshgarg007
|
233b88dc52
|
fix: Test case fixes
|
2019-05-28 17:58:22 +05:30 |
|
deepeshgarg007
|
ffec8be85f
|
fix: Styling and test case fixes
|
2019-05-28 17:56:07 +05:30 |
|
Nabin Hait
|
e7b8400fc7
|
Merge pull request #17696 from Anurag810/warehouse_type
feat: Added Warehouse Type master
|
2019-05-28 17:25:13 +05:30 |
|
deepeshgarg007
|
e025aabef0
|
fix: Indentation fixes
|
2019-05-28 16:25:55 +05:30 |
|
deepeshgarg007
|
a8cb00f31f
|
fix: Styling and test case fixes
|
2019-05-28 16:03:08 +05:30 |
|
deepeshgarg007
|
adccb2c3a4
|
fix: Remove print statements
|
2019-05-28 12:24:28 +05:30 |
|
deepeshgarg007
|
acc2422167
|
Merge branch develop into dimensions
|
2019-05-28 12:18:32 +05:30 |
|
deepeshgarg007
|
f5b6ee9ae7
|
fix: Multiple fixes in accounting doctype
|
2019-05-28 12:15:56 +05:30 |
|
deepeshgarg007
|
50ea99e35b
|
fix: Is group filter for dimensions for doctype
|
2019-05-28 12:13:53 +05:30 |
|
deepeshgarg007
|
7dfffb5f73
|
fix: Updated test cases for accounting dimensions
|
2019-05-28 12:09:45 +05:30 |
|
Himanshu
|
6f08866640
|
Merge branch 'develop' into sla_fix
|
2019-05-28 11:54:30 +05:30 |
|
Himanshu Warekar
|
9c70da9026
|
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
|
2019-05-28 11:48:16 +05:30 |
|
Himanshu Warekar
|
fee2fee83a
|
fix: test cases
|
2019-05-28 11:47:51 +05:30 |
|
Nabin Hait
|
5fef786441
|
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
fix: Tax calculation on salary slip
|
2019-05-28 11:16:31 +05:30 |
|
Anurag Mishra
|
a69f72988a
|
fix: requested filters changes
|
2019-05-28 11:08:14 +05:30 |
|
Himanshu
|
574f81e984
|
Merge branch 'develop' into sla_fix
|
2019-05-28 00:05:04 +05:30 |
|
Himanshu Warekar
|
c7170f80ce
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-05-28 00:02:54 +05:30 |
|
Himanshu Warekar
|
24f8310ece
|
fix: test cases
|
2019-05-28 00:01:55 +05:30 |
|
Nabin Hait
|
351e9983cf
|
Merge pull request #17389 from mujeerhashmi/develop
feat: Student Group with Student Category filter
|
2019-05-27 19:14:31 +05:30 |
|
Nabin Hait
|
9813897ec3
|
Merge pull request #17759 from saurabh6790/custom_field_fix
fix: add shopify_supplier_id custom field while setting up shopify
|
2019-05-27 19:12:39 +05:30 |
|
Nabin Hait
|
60f04d181d
|
Merge pull request #17756 from nabinhait/property-decorator
fix(subscription): Remove property decorator (#17395)
|
2019-05-27 19:11:17 +05:30 |
|
Nabin Hait
|
7f375d209c
|
fix: Tax calculation on salary slip
|
2019-05-27 18:42:53 +05:30 |
|
Anurag Mishra
|
32c23ae274
|
fix: added read write permission to stock manager
|
2019-05-27 18:37:04 +05:30 |
|
Anurag Mishra
|
61a7b42aea
|
fix: added permission and fix filters in stock balance report
|
2019-05-27 18:37:04 +05:30 |
|
Anurag Mishra
|
7376b4f4f0
|
feat: added warehouse type master
|
2019-05-27 18:37:04 +05:30 |
|
Nabin Hait
|
1f24a4d44c
|
Merge pull request #17691 from netchampfaris/upload-attendance-progress
fix(UX): Upload Attendance
|
2019-05-27 17:17:03 +05:30 |
|
Nabin Hait
|
e662be7508
|
Merge pull request #17697 from nabinhait/po-status-updater-dev-1
fix: update received qty in PO from PR and PI
|
2019-05-27 17:16:40 +05:30 |
|
Nabin Hait
|
54ea9b0978
|
Merge pull request #17709 from nabinhait/opening-stock-entry-dev
fix: Opening accounting entry for stock entry
|
2019-05-27 17:16:19 +05:30 |
|
Nabin Hait
|
4f549cc196
|
Merge branch 'develop' into opening-stock-entry-dev
|
2019-05-27 17:16:03 +05:30 |
|
Nabin Hait
|
aafd64d9b4
|
fix: On change of currency, set margin amount based on exchange rate (#17712)
|
2019-05-27 17:15:47 +05:30 |
|