Nabin Hait
|
0ce85735b8
|
Merge branch 'develop' into set_default_warehouse_from_the_stock_settings_v12
|
2019-05-22 15:06:04 +05:30 |
|
Nabin Hait
|
13e0fcde0c
|
Merge branch 'develop' into upload-attendance-progress
|
2019-05-22 15:05:50 +05:30 |
|
Nabin Hait
|
5ee08620cb
|
Merge branch 'develop' into po-status-updater-dev-1
|
2019-05-22 15:05:08 +05:30 |
|
rohitwaghchaure
|
8529cde0f0
|
Merge pull request #17687 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_develop
fix: item group not disaplying in the website if shopping cart is disabled
|
2019-05-22 13:23:44 +05:30 |
|
rohitwaghchaure
|
0432d3844b
|
Merge pull request #17700 from rohitwaghchaure/italian_localization_issue_for_invoices_develop
fix: removed translation for customer type and tax charge type
|
2019-05-22 13:23:25 +05:30 |
|
Rohit Waghchaure
|
68a1456672
|
fix: removed translation for customer type and tax charge type
|
2019-05-22 13:22:39 +05:30 |
|
Nabin Hait
|
ecf25907a5
|
fix: set schedule date from MR to PO
|
2019-05-22 13:07:26 +05:30 |
|
Nabin Hait
|
bfb09d51a3
|
fix: test cases
|
2019-05-22 12:15:56 +05:30 |
|
Nabin Hait
|
b7bdcc3992
|
fix: Don't set reqd date in PO based on MR, if less than today
|
2019-05-22 12:01:17 +05:30 |
|
Nabin Hait
|
915edbf9ce
|
fix: po status
|
2019-05-22 12:00:36 +05:30 |
|
Nabin Hait
|
d752051b8d
|
fix: update received qty in PO from PR
|
2019-05-22 11:59:19 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Anurag Mishra
|
15e2546846
|
Merge branch 'develop' into bom_items_and_scraps
|
2019-05-16 18:24:04 +05:30 |
|
Nabin Hait
|
3f119ec256
|
fix: GL Entry for opening stock reconciliation
|
2019-05-16 17:29:10 +05:30 |
|
Anurag Mishra
|
dd5d4c49c4
|
fix: indent
|
2019-05-16 17:08:44 +05:30 |
|
rohitwaghchaure
|
cca5c45ebd
|
Merge pull request #17638 from rohitwaghchaure/changed_fieldtype_from_data_to_float
fix: changed fieldtype from data to float
|
2019-05-16 17:04:51 +05:30 |
|
Rohit Waghchaure
|
cb4e28fb31
|
fix: changed fieldtype from data to float
|
2019-05-16 17:01:05 +05:30 |
|
Shivam Mishra
|
8a976ba8ab
|
feat: LMS is now compatible with Frappe Theme (#17600)
* style: UI fixes for frappe_theme compatibility
* chore: minor ui fixes
|
2019-05-16 16:38:13 +05:30 |
|
Saurabh
|
1bcdb094ea
|
Merge pull request #17630 from nabinhait/multi-fixes-dev
fix: Multiple small fixes
|
2019-05-16 15:21:15 +05:30 |
|
rohitwaghchaure
|
144e60a234
|
Update bom_items_and_scraps.py
|
2019-05-16 15:03:30 +05:30 |
|
Anurag Mishra
|
39c80789c9
|
Merge branch 'develop' into bom_items_and_scraps
|
2019-05-16 14:59:38 +05:30 |
|
Rushabh Mehta
|
a02ab2d3d7
|
Merge pull request #17635 from nabinhait/add-multiple-items-dev
feat: Added 'Add Multiple' options in all sales / purchase transactions
|
2019-05-16 14:57:03 +05:30 |
|
Nabin Hait
|
3fccfaa7ce
|
feat: Added 'Add Multiple' options in all sales / purchase transactions
|
2019-05-16 14:54:05 +05:30 |
|
Anurag Mishra
|
b921d9f94d
|
Merge branch 'develop' into bom_items_and_scraps
|
2019-05-16 14:24:16 +05:30 |
|
rohitwaghchaure
|
dbecd9d45e
|
Merge pull request #17476 from Anurag810/subs
feat: subcontracting report
|
2019-05-16 14:06:44 +05:30 |
|
Nabin Hait
|
2a8c463079
|
fix: show tasks in project order by due date and status
|
2019-05-16 13:46:05 +05:30 |
|