Rucha Mahabal
|
162f7d1b50
|
auto email and new communication linked to email campaign setup
|
2019-07-01 01:09:58 +05:30 |
|
deepeshgarg007
|
cef54ae3c2
|
fix: Add total row in GSTR-1 report
|
2019-06-30 19:49:26 +05:30 |
|
Rucha Mahabal
|
dcf5fbd35d
|
added some validations
|
2019-06-30 16:36:09 +05:30 |
|
Rucha Mahabal
|
fc03509e46
|
created data structure for email automation
|
2019-06-30 16:24:29 +05:30 |
|
Suraj Shetty
|
a7d618cce0
|
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
|
2019-06-30 15:33:23 +05:30 |
|
Suraj Shetty
|
19e4fde737
|
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
|
2019-06-30 15:30:59 +05:30 |
|
rohitwaghchaure
|
4c2eb0f13b
|
Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop
fix: finance book filters includes the gl data which don't have finance book
|
2019-06-29 15:06:34 +05:30 |
|
rohitwaghchaure
|
ada1e4f0c4
|
Merge pull request #17962 from rohitwaghchaure/not_able_to_save_asset_for_manual_method_develop
fix: not able to save asset if depreciation method is manual
|
2019-06-29 15:05:46 +05:30 |
|
Govind S Menokee
|
a596a7fd2b
|
feat: Add batch operation times in BOM Operation
|
2019-06-29 04:08:26 +05:30 |
|
Don-Leopardo
|
b2b5c3ac0a
|
Merge branch 'develop' into fix_by_voucher_order_develop
|
2019-06-28 19:36:25 -03:00 |
|
Govind S Menokee
|
65633e01b8
|
Merge pull request #1 from frappe/develop
Merge Official Develop
|
2019-06-29 04:04:59 +05:30 |
|
Himanshu Warekar
|
115da67713
|
fix: include standalone sla in issues
|
2019-06-28 22:26:58 +05:30 |
|
Himanshu
|
a917bec8da
|
Merge branch 'develop' into mapped_doc_fix
|
2019-06-28 19:46:00 +05:30 |
|
Himanshu
|
0aa4e40edf
|
Merge pull request #18105 from hrwX/issue-fix
fix: remove frm call for priority change
|
2019-06-28 19:44:41 +05:30 |
|
Himanshu Warekar
|
0611078483
|
Merge branch 'issue-fix' of https://github.com/hrwx/erpnext into issue-fix
|
2019-06-28 19:41:45 +05:30 |
|
Himanshu Warekar
|
bc0bc6677e
|
fix: use db sql to delete property setter
|
2019-06-28 19:41:29 +05:30 |
|
Himanshu
|
9c207e1520
|
Merge branch 'develop' into issue-fix
|
2019-06-28 19:36:36 +05:30 |
|
Mangesh-Khairnar
|
e493490702
|
fix: mapped doc
|
2019-06-28 19:22:51 +05:30 |
|
Himanshu Warekar
|
c163b0de3d
|
Merge branch 'develop' of https://github.com/frappe/erpnext into issue-fix
|
2019-06-28 19:08:08 +05:30 |
|
Himanshu Warekar
|
5cec89d1ab
|
fix: remove frm call for priority change
|
2019-06-28 19:07:13 +05:30 |
|
rohitwaghchaure
|
42c8a4baa0
|
Merge pull request #18102 from adityahase/fix-buying-develop
fix(buying): Translate label for "Supplier Addresses And Contacts" Report
|
2019-06-28 14:44:21 +05:30 |
|
Aditya Hase
|
d825ee57b7
|
fix(buying): Translate label for "Supplier Addresses And Contacts" Report
|
2019-06-28 14:40:59 +05:30 |
|
Himanshu
|
ea4c42d47b
|
fix(Utils): Do not add duplicate items (#17896)
* fix: do not add duplicate items
* Update erpnext/public/js/utils.js
Co-Authored-By: Rohan <Alchez@users.noreply.github.com>
* fix: compare warehouses, batch and qty for an item
* fix: code fixes
* Update utils.js
* fix: check required_date and delivery_date
* Update utils.js
* fix: mixed tabs and spaces
|
2019-06-28 14:13:13 +05:30 |
|
Deepesh Garg
|
fb29ffc90c
|
fix: Usability fixes to Serial No and batch selector (#18071)
* fix: Usability fixes to Serial No and batch selector
* fix: Codacy
* Update sales_common.js
|
2019-06-28 14:08:08 +05:30 |
|
Frappe PR Bot
|
a15d100cbd
|
feat: Updated translation (#17954)
|
2019-06-28 13:05:19 +05:30 |
|
KanchanChauhan
|
2433fb1596
|
feat: Terms and Conditions section in Blanket Order (#17991)
|
2019-06-28 12:54:12 +05:30 |
|
Deepesh Garg
|
dbe9a41389
|
feat: Confirmation to submit material request against Production Plan (#18062)
* feat: Confirmation to submit material request against Production Plan
* fix: Test cases for production plan
* fix: Test Cases for production plan
|
2019-06-28 12:48:28 +05:30 |
|
Nabin Hait
|
f5aff98589
|
fix: Validate changes in batch, serial nos, val method fields (#18064)
|
2019-06-28 12:47:44 +05:30 |
|
Karthikeyan S
|
e6236094a6
|
fix(item): fix patch for barcode childtable migration in item (#18069)
* fix(item): fix patch for barcode childtable migration in item
(cherry picked from commit b2c43ee2d91599038f7bdf2038bbc4c4e7b36285)
* fix(item): fixing broken patch item_barcode_childtable_migrate
(cherry picked from commit beca677276e0b5b143cd6d1d08efa8529663f60c)
|
2019-06-28 12:46:42 +05:30 |
|
rohitwaghchaure
|
9dd7d3ebb3
|
fix: not able to make salary slip based on timesheet (#18088)
|
2019-06-28 12:40:52 +05:30 |
|
Mangesh-Khairnar
|
4000fb5bb8
|
fix: add a more descriptive message when no records are found (#18082)
* fix: add a more descriptive message when no records are found
* fix: translation by passing string to translation function
|
2019-06-28 12:38:40 +05:30 |
|
Don-Leopardo
|
c3f6bed650
|
Merge branch 'develop' into fix_by_voucher_order_develop
|
2019-06-27 18:09:19 -03:00 |
|
Don-Leopardo
|
a01d0a5311
|
Merge branch 'develop' into sales_analytics_with_order_type_develop
|
2019-06-27 18:09:09 -03:00 |
|
Himanshu
|
130dcffcc8
|
Merge pull request #18099 from hrwX/issue_fix
fix: Remove whitelisted method
|
2019-06-28 00:02:01 +05:30 |
|
Himanshu Warekar
|
43e3dacba2
|
fix: remove whitelisted method
|
2019-06-28 00:00:48 +05:30 |
|
Himanshu
|
152efd2be5
|
Merge pull request #18098 from hrwX/patch
fix: change to link field in Issue WebForm
|
2019-06-27 23:01:36 +05:30 |
|
Himanshu Warekar
|
be0001ece6
|
fix: change to link field
|
2019-06-27 22:59:52 +05:30 |
|
Aditya Hase
|
ce9cdfb056
|
fix(ui): better message after creating serial numbers (#18093)
fix(ui): better message after creating serial numbers
|
2019-06-27 18:20:13 +05:30 |
|
Aditya Hase
|
798528eaaa
|
fix: set serial numbers as data field (#18094)
fix: set serial numbers as data field
|
2019-06-27 18:19:29 +05:30 |
|
Aditya Hase
|
7f3ebb1d06
|
Merge branch 'develop' into stock-ledger-link
|
2019-06-27 18:19:15 +05:30 |
|
Aditya Hase
|
b9c9ada3f8
|
Merge pull request #18090 from scmmishra/twelve-fixes
fix: print message for insufficient stock
|
2019-06-27 18:18:24 +05:30 |
|
Aditya Hase
|
a10912787c
|
fix: styling for sort selector (#18092)
fix: styling for sort selector
|
2019-06-27 18:17:35 +05:30 |
|
Anurag Mishra
|
322eca61e6
|
fix: Wrong Casual Leave Opening in Employee Leave Balance Report
fix: Wrong Casual Leave Opening in Employee Leave Balance Report
|
2019-06-27 17:00:55 +05:30 |
|
Shivam Mishra
|
c41403c8a9
|
fix: remove move and add buttons from stock summary
|
2019-06-27 16:34:38 +05:30 |
|
Shivam Mishra
|
0ec772194d
|
Merge branch 'develop' into page-sort-selector
|
2019-06-27 15:38:18 +05:30 |
|
Shivam Mishra
|
eeeccdb6da
|
Merge branch 'develop' into twelve-fixes
|
2019-06-27 15:37:58 +05:30 |
|
Shivam Mishra
|
0f67d22edd
|
Merge branch 'develop' into stock-ledger-link
|
2019-06-27 15:37:44 +05:30 |
|
Rushabh Mehta
|
09fed465fb
|
Merge pull request #18081 from Mangesh-Khairnar/fix-department
fix: open department in tree view via awesome bar
|
2019-06-27 15:02:53 +05:30 |
|
Shivam Mishra
|
468d5563c6
|
fix: set serial numbers as data field
|
2019-06-27 14:13:54 +05:30 |
|
Shivam Mishra
|
e1aec5519b
|
fix(ui): better message after creating serial numbers
|
2019-06-27 13:14:41 +05:30 |
|