Mangesh-Khairnar
|
fc3731f15e
|
Merge pull request #18107 from Mangesh-Khairnar/mapped_doc_fix
fix: clear duplicates in mapped doc
|
2019-07-01 17:04:12 +05:30 |
|
Faris Ansari
|
8d2c996b50
|
feat: Call Popup and Exotel Integration (#17763)
feat: Call Popup and Exotel Integration
|
2019-07-01 16:36:32 +05:30 |
|
Shivam Mishra
|
43cebdff4d
|
fix: translated title (#18119)
|
2019-07-01 11:01:28 +00:00 |
|
Nabin Hait
|
659a01d819
|
Update accounts_controller.py
|
2019-07-01 15:16:49 +05:30 |
|
Deepesh Garg
|
71359cc18b
|
Merge branch 'develop' into gstr1-total
|
2019-07-01 14:49:59 +05:30 |
|
Suraj Shetty
|
8e65d5bd5b
|
chore: Delete unwanted files
|
2019-07-01 14:32:29 +05:30 |
|
Suraj Shetty
|
b2e321686d
|
Merge branch 'develop' into call-summary-dialog
|
2019-07-01 14:29:49 +05:30 |
|
Suraj Shetty
|
56242a5077
|
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
|
2019-07-01 14:29:05 +05:30 |
|
Suraj Shetty
|
502565ff56
|
fix: Make required changes
|
2019-07-01 14:28:59 +05:30 |
|
Mangesh-Khairnar
|
4aed7cc310
|
Merge branch 'develop' into mapped_doc_fix
|
2019-07-01 13:40:52 +05:30 |
|
rohitwaghchaure
|
c77bd82083
|
Merge pull request #18118 from rohitwaghchaure/asset_staus_not_showing_in_the_listview
fix: asset status not showing in the list view
|
2019-07-01 13:32:39 +05:30 |
|
Deepesh Garg
|
0cdf55033a
|
Merge branch 'develop' into gstr1-total
|
2019-07-01 12:36:35 +05:30 |
|
Rohit Waghchaure
|
7729fcea19
|
fix: asset status not shwoing in the list view
|
2019-07-01 12:26:34 +05:30 |
|
Mangesh-Khairnar
|
9955b189e4
|
fix: leaderboard chart
|
2019-07-01 12:20:09 +05:30 |
|
rohitwaghchaure
|
9c1dbc5e39
|
Merge pull request #18117 from rohitwaghchaure/accounts_receivable_not_working_if_company_not_selected
fix: accounts receivable / payable not working if the company is not seletced in filter
|
2019-07-01 12:05:14 +05:30 |
|
Rohit Waghchaure
|
2fa6224f8f
|
fix: accounts receivable / payable not working if the company is not seletced in filter
|
2019-07-01 11:55:12 +05:30 |
|
Suraj Shetty
|
edee06fc90
|
Merge branch 'develop' into call-summary-dialog
|
2019-07-01 11:05:59 +05:30 |
|
Himanshu
|
2d0fd9f519
|
fix: travis (#18116)
|
2019-07-01 10:24:02 +05:30 |
|
Suraj Shetty
|
1431bf2a3c
|
fix: User cannot create call log
|
2019-07-01 09:10:23 +05:30 |
|
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 |
|