Suraj Shetty
|
57bab84198
|
feat: Add exotel settings
|
2019-05-22 06:25:45 +05:30 |
|
Himanshu Warekar
|
ff1a8b3070
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-05-21 22:42:10 +05:30 |
|
Himanshu Warekar
|
323ea2d33a
|
feat: change SLA as well as priorities
|
2019-05-21 22:39:42 +05:30 |
|
Faris Ansari
|
9e5665dc0a
|
Merge branch 'develop' into upload-attendance-progress
|
2019-05-21 18:01:30 +05:30 |
|
Faris Ansari
|
81e698d225
|
fix(UX): Upload Attendance
Enqueue import if rows more than 200. Show import progress in dashboard.
|
2019-05-21 17:58:55 +05:30 |
|
Rohit Waghchaure
|
c41118bac7
|
Get default warehouse from the stock settings in the get_item_details
|
2019-05-21 15:21:13 +05:30 |
|
Nabin Hait
|
7327f8a901
|
fix: Person / Org name is not mandatory while creation of lead from email (#17676)
|
2019-05-21 15:05:26 +05:30 |
|
Rushabh Mehta
|
98a80407f8
|
Merge pull request #17538 from adityahase/fix-training-feedback
fix(hr): Use event_status instead of status
|
2019-05-21 12:19:03 +05:30 |
|
Rushabh Mehta
|
397a48d11f
|
Merge pull request #17640 from nabinhait/gle-opening-stock-reco-dev
fix: GL Entry for opening stock reconciliation
|
2019-05-21 12:17:22 +05:30 |
|
Rohit Waghchaure
|
5e7b4ca6a4
|
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
|
2019-05-21 12:14:16 +05:30 |
|
Shivam Mishra
|
87a7438d38
|
chore: added macro for page hero
|
2019-05-21 12:05:19 +05:30 |
|
Shivam Mishra
|
c8c790a097
|
feat: Added content page and minor doctype changes
|
2019-05-21 12:04:50 +05:30 |
|
Rushabh Mehta
|
8c78299158
|
fix(readme): logo
|
2019-05-21 11:57:33 +05:30 |
|
Rohit Waghchaure
|
6358370735
|
fix: item group not disaplying in the website if shopping cart is disabled
|
2019-05-21 10:53:39 +05:30 |
|
Suraj Shetty
|
863b93c32d
|
refator: Rename files and move code
|
2019-05-21 07:57:06 +05:30 |
|
Himanshu Warekar
|
f38486b22c
|
Merge develop into sla_fix
|
2019-05-20 23:25:26 +05:30 |
|
deepeshgarg007
|
ff717a7c16
|
fix: List view button for dimensions
|
2019-05-20 18:35:38 +05:30 |
|
Deepesh Garg
|
9982576ea6
|
Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12
feat: added checkbox in the filter of general ledger to show opening entries
|
2019-05-20 15:20:53 +05:30 |
|
Himanshu
|
29d4ae6716
|
feat(Communication): Move Timeline DocType and Name to Dynamic Links (#17593)
* fix: ambigious error
|
2019-05-20 15:14:07 +05:30 |
|
Faris Ansari
|
a1f31e8444
|
feat(regional): Bank remittance report (#17524)
feat(regional): Bank remittance report
|
2019-05-20 15:00:48 +05:30 |
|
Mangesh-Khairnar
|
57c861efc3
|
feat: add patch to create custom fields for india specific client
|
2019-05-20 13:08:18 +05:30 |
|
Rohit Waghchaure
|
97d2a46052
|
feat: added checkbox in the filter of general ledger to show opening entries
|
2019-05-20 12:28:57 +05:30 |
|
Shivam Mishra
|
d7e8298a5f
|
feat: added program and course pages
|
2019-05-20 11:55:32 +05:30 |
|
Himanshu Warekar
|
23a574d794
|
fix: codacy
|
2019-05-19 19:34:45 +05:30 |
|
Shivam Mishra
|
823c79588b
|
feat: Moving to Jinja
|
2019-05-19 16:01:45 +05:30 |
|
Himanshu Warekar
|
7910215968
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-05-19 13:48:27 +05:30 |
|
Himanshu Warekar
|
22d8b3037a
|
tests: fix issue tests
|
2019-05-19 11:56:37 +05:30 |
|
Himanshu Warekar
|
97b05e8b58
|
test: fixes
|
2019-05-19 11:14:59 +05:30 |
|
deepeshgarg007
|
4541605e27
|
fix: Test Case for accounting dimension
|
2019-05-19 11:13:42 +05:30 |
|
deepeshgarg007
|
a285e4c73e
|
fix: Rename function in accounting dimension
|
2019-05-19 11:13:21 +05:30 |
|
Himanshu Warekar
|
f77fe313e3
|
feat: change sla on the fly
|
2019-05-19 11:06:00 +05:30 |
|
deepeshgarg007
|
3d11ac0e75
|
fix: Accounting dimensions for child tables
|
2019-05-19 00:02:01 +05:30 |
|
deepeshgarg007
|
d0a1ed9017
|
fix: Ability to disable dimensions
|
2019-05-18 23:47:42 +05:30 |
|
Suraj Shetty
|
8a178d6f30
|
fix: Update call summary dialog
|
2019-05-18 16:11:29 +05:30 |
|
Anurag Mishra
|
fc86df6453
|
fix: Allow return if delivery note or sales order is required in selling settings(v12) (#17631)
* fix: Allow retrun if delivery note or sales order is required in selling settings
* fix: combined condition
* style: refactor
|
2019-05-18 13:03:08 +05:30 |
|
Rushabh Mehta
|
249d47cd1c
|
fix(readme): logo URL
|
2019-05-18 10:53:01 +05:30 |
|
Syed Mujeer Hashmi
|
045194c230
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2019-05-17 16:26:31 +05:30 |
|
Deepesh Garg
|
2cab66cda1
|
Merge pull request #17658 from deepeshgarg007/territory_item_code_develop
fix: Inactive Sales Item report fixes
|
2019-05-17 16:20:30 +05:30 |
|
deepeshgarg007
|
a4c9134d33
|
fix: Inactive Sales Item report fixes
|
2019-05-17 16:19:15 +05:30 |
|
Deepesh Garg
|
e796d2844c
|
fix: Unable to create item variant based on manufacturer (#17652)
* fix: Unable to create item variant against manufacturer
* fix: Spacing fixes
* fix: Spacing fixes in item.js
|
2019-05-17 15:39:22 +05:30 |
|
Nabin Hait
|
9764eff1a4
|
Merge branch 'develop' into gle-opening-stock-reco-dev
|
2019-05-17 14:34:39 +05:30 |
|
Himanshu Warekar
|
ab596c7236
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-05-17 11:50:58 +05:30 |
|
rohitwaghchaure
|
c356fef9c4
|
Merge pull request #17599 from Anurag810/bom_items_and_scraps
feat: added report for showing complete hierarchy of bom with item details and scraps
|
2019-05-17 11:22:12 +05:30 |
|
deepeshgarg007
|
705c03c093
|
fix: Added dashboard and module links for accounting dimensions
|
2019-05-17 10:23:00 +05:30 |
|
Himanshu Warekar
|
6668e1b8fe
|
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
|
2019-05-17 08:17:33 +05:30 |
|
Himanshu Warekar
|
628ea47c6d
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-05-17 00:48:23 +05:30 |
|
Suraj Shetty
|
dd6b70c7cd
|
feat: Show contact on incoming call
|
2019-05-16 23:55:35 +05:30 |
|
Rohan
|
a094560b8b
|
fix(tests): Save batch instead of submitting it (#17637)
|
2019-05-16 19:44:55 +05:30 |
|
Rushabh Mehta
|
8ec3718aba
|
Merge pull request #17625 from rmehta/link-preview-item-task
fix: link preview for item and task
|
2019-05-16 19:35:05 +05:30 |
|
Nabin Hait
|
06c8cf4321
|
fix: BOM Item rate based on uom conversion factor and exchange rate
|
2019-05-16 19:23:00 +05:30 |
|