Mangesh-Khairnar
98409159c8
Merge pull request #18120 from Mangesh-Khairnar/fix-leaderboard
...
fix: leaderboard charts
2019-07-02 10:13:15 +05:30
Deepesh Garg
78a86af7fd
fix: Fiter passing fix in get batch query ( #18131 )
2019-07-02 10:10:55 +05:30
rohitwaghchaure
f949c5ddf7
Merge pull request #18104 from rohitwaghchaure/incorrect_value_of_accumualated_depreciation_in_the_sales_invoice_develop
...
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-02 01:23:56 +05:30
Rohit Waghchaure
8847ecfe25
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-01 20:47:35 +05:30
Aditya Hase
8d70073cf8
refactor: Remove implicit auto assignment feature ( #18124 )
...
This behaviour now can be replicated with Assignment Rule configurations.
2019-07-01 19:35:17 +05:30
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
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
deepeshgarg007
cef54ae3c2
fix: Add total row in GSTR-1 report
2019-06-30 19:49:26 +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
Don-Leopardo
b2b5c3ac0a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-28 19:36:25 -03:00
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 Warekar
bc0bc6677e
fix: use db sql to delete property setter
2019-06-28 19:41:29 +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 Warekar
43e3dacba2
fix: remove whitelisted method
2019-06-28 00:00:48 +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
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
Shivam Mishra
bc777b1732
fix: styling for sort selector
2019-06-27 12:43:39 +05:30
Mangesh-Khairnar
3b60fac3b7
fix: open department in tree view via awesome bar
2019-06-27 11:43:22 +05:30
Shivam Mishra
9e07b7d2b8
Merge branch 'develop' into twelve-fixes
2019-06-27 09:44:41 +05:30
Himanshu Warekar
5ebdf76669
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-27 01:29:25 +05:30
Himanshu Warekar
24b9d1e5a6
fix: patch fixes
2019-06-27 01:29:00 +05:30
Himanshu
6596f6e218
Merge branch 'develop' into sla_fix
2019-06-27 00:18:56 +05:30
Rohit Waghchaure
6de3ed5416
fix: dn test cases
2019-06-26 21:58:42 +05:30
Himanshu
27c1e844c7
Merge branch 'develop' into sla_fix
2019-06-26 18:24:29 +05:30
Faris Ansari
50644b5315
fix: Allow Rename in Issue Type ( #18079 )
...
fix: Allow Rename in Issue Type
2019-06-26 17:51:30 +05:30
Faris Ansari
df7a6520b9
fix: Allow Rename in Issue Type
2019-06-26 16:57:33 +05:30
Himanshu
b134709aaf
Merge branch 'develop' into sla_fix
2019-06-26 16:36:51 +05:30
Karthikeyan S
48535e95e6
Fix(integrations): Adding Error Logs for Woocommerce ( #18061 )
...
(cherry picked from commit ae255d6328b70b148d28d9a88a695932656bf276)
2019-06-26 13:41:49 +05:30
rohitwaghchaure
387ee8f511
fix: returned qty issue while making sales invoice from dn if same item added multiple times ( #18076 )
2019-06-26 13:40:26 +05:30
Rushabh Mehta
b8b506b105
Merge pull request #18072 from hrwX/att_gantt_fix_v12
...
fix(Attendance): Attendance gantt fix
2019-06-26 13:36:37 +05:30
Faris Ansari
2ab8d3ebcc
fix: Move links to appropriate section ( #17999 )
...
* fix: Move links to appropriate section
* fix: New section Accounting Entries
2019-06-26 13:32:41 +05:30
Faris Ansari
fbc861320f
fix: Don't append None values in against_account ( #18031 )
2019-06-26 13:31:31 +05:30
Anurag Mishra
0181eb0652
fix: removed unused function
2019-06-26 13:26:50 +05:30
Anurag Mishra
8a6255078b
fix: wrong Casual Leave opening
2019-06-26 13:22:34 +05:30
Himanshu
9323c3ae29
Merge branch 'develop' into sla_fix
2019-06-26 12:54:08 +05:30
Himanshu Warekar
d48b2ac126
fix: attendance gantt fix
2019-06-26 11:37:49 +05:30
Mangesh-Khairnar
8c621ab90c
fix: precision for certain calculations in buying controller ( #18008 )
...
* fix: precision for certain numbers
* fix: check precision of the received_qty
* Update buying_controller.py
2019-06-26 11:10:17 +05:30
Deepesh Garg
ea0574679f
fix: Removed submitted status from Quotation ( #18055 )
...
* fix: Change in list view and status updater
* fix: Change status in doctype
* fix: Patch for submitted status
2019-06-26 11:05:51 +05:30
Mangesh-Khairnar
07aae76bbf
fix: change the department to tree view ( #18057 )
2019-06-26 11:03:57 +05:30
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 ( #18067 )
2019-06-26 10:57:45 +05:30
Shivam Mishra
9479f7f1ef
fix: print message for insufficient stock
2019-06-26 10:37:00 +05:30
rohitwaghchaure
b98e825ceb
Merge pull request #18060 from adityahase/fix-sales-funnel
...
fix(sales-funnel): Use frappe.Chart() instead of Chart()
2019-06-25 21:36:26 +05:30
Himanshu
bd3ccad513
Merge branch 'develop' into sla_fix
2019-06-25 21:14:52 +05:30
Aditya Hase
2caaa1b03d
fix(sales-funnel): Remove duplicate code
2019-06-25 17:17:38 +05:30
Aditya Hase
10562b67fc
fix(sales-funnel): Use frappe.Chart() instead of Chart()
2019-06-25 17:07:41 +05:30
rohitwaghchaure
2b6cb6160f
Merge pull request #18042 from rohitwaghchaure/closed_job_opening_disaplying_in_job_applicant
...
fix: Closed job opening disaplying in job applicant
2019-06-25 16:51:03 +05:30
Himanshu Warekar
6931ea68a2
Merge sla_fix into sla_fix
2019-06-25 16:27:58 +05:30
Himanshu Warekar
2373c095ed
Merge develop into sla_fix
2019-06-25 16:27:06 +05:30
Himanshu Warekar
99d46844d5
fix: minor patch fix
2019-06-25 16:25:51 +05:30
rohitwaghchaure
f9de144f07
Merge pull request #18045 from deepeshgarg007/accounts_controller_develop
...
fix: Float division by zero error handling in group similar item
2019-06-25 15:25:42 +05:30
rohitwaghchaure
827ac1e291
Merge pull request #18040 from Mangesh-Khairnar/fix-price-list
...
fix(price list): change the field name
2019-06-25 15:23:44 +05:30
rohitwaghchaure
8aff023abe
Merge pull request #18049 from deepeshgarg007/rounded_total_develop
...
fix: Currency symbol fix for rounded total
2019-06-25 15:14:34 +05:30
sahil28297
b056595029
Merge branch 'develop' into fix_bom_exploded_item
2019-06-25 14:12:23 +05:30
Deepesh Garg
cc0bebacd2
Merge branch 'develop' into accounts_controller_develop
2019-06-25 13:15:42 +05:30
Himanshu
ce7603acc5
Merge branch 'develop' into sla_fix
2019-06-25 11:48:41 +05:30
Rohit Waghchaure
a64e4037d2
fix: revert changes of bom recursion
2019-06-25 07:08:59 +05:30
deepeshgarg007
ab13192dd4
fix: Currency symbol fix for rounded total
2019-06-24 21:22:52 +05:30
Don-Leopardo
fb2a05cb3f
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-24 11:29:28 -03:00
Don-Leopardo
54b9fd5bef
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-06-24 11:29:23 -03:00
Himanshu
0e26deb463
Merge branch 'develop' into sla_fix
2019-06-24 19:30:36 +05:30
deepeshgarg007
e8d21cd8fa
fix: Division by zero error fix in group similar item
2019-06-24 18:49:24 +05:30
Rohit Waghchaure
78d6086739
fix: Closed job opening disaplying in job applicant
2019-06-24 18:05:10 +05:30
rohitwaghchaure
55c9eb6d9e
Merge pull request #18037 from rohitwaghchaure/bom_update_tool_optimization
...
fix: optimize bom update tool
2019-06-24 18:00:17 +05:30
Mangesh-Khairnar
558a5c199f
fix(price list): change the field name
2019-06-24 17:32:04 +05:30
NahuelOperto
42fe68d065
feat: order type in trr type filter
2019-06-24 08:29:14 -03:00
Himanshu Warekar
4538658d02
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-24 15:22:25 +05:30
Himanshu Warekar
54ece39aef
fix: review changes
2019-06-24 15:18:56 +05:30
karthikeyan5
eadc144477
fix(HR): fixing bug introduced during merge conflict resolution.
...
> while merging with https://github.com/frappe/erpnext/pull/17837
2019-06-24 15:15:38 +05:30
karthikeyan5
82256bc58b
fix(hr): Auto Attendance
...
> fixing minor bug in shift calculation
> adding 'Mark Auto Attendance' button in shift and related fixes
> changed employee checkin naming series
> added aditional validation for employee checkin
> added/updated dashboard for Attendance, Employee, Shift Type
2019-06-24 15:15:38 +05:30
karthikeyan5
32197355ad
rename(HR): Employee Attendance Log DocType to Employee Checkin
2019-06-24 15:15:38 +05:30
karthikeyan5
e0c5176383
refactor(HR): Auto Attendance
...
> moved all auto attendance settings from HR Settings to shift
> added shift in attendance and Employee Attendance Log
> reordered and cleaned up fields in HR Settings and Employee DocType
2019-06-24 15:15:38 +05:30
karthikeyan5
66e459b35d
fix(auto attendance): changes as requested in review
...
> removed unused field from shift assignment
> renamed 'biometric_rf_id' to 'attendance_device_id'
> added more test cases
> few other minor changes after demo
2019-06-24 15:15:38 +05:30
karthikeyan5
23cedfd6c8
feat(HR): Auto Attendance
...
>Marking attendance based on Employee Attendance Log
2019-06-24 15:15:38 +05:30
karthikeyan5
ceea328542
fix(HR): validations and bug fixes for Attendance Log
2019-06-24 15:15:38 +05:30
karthikeyan5
a4d0ba222b
fix(HR): changes as per PR review
...
> renamed 'Employee Checkin Log' DocType to 'Employee_attendance_log' DocType
> renamed biometric_id to biometric_rf_if
2019-06-24 15:15:38 +05:30
karthikeyan5
e4bbda6ff5
feat(HR): Added Employee CheckIn Log
...
> Employee CheckIn Log can be used to store IN/OUT Logs of employees from biometric/RFID devices.
>added biometric_id in the Employee Doctype
2019-06-24 15:15:38 +05:30
Rohit Waghchaure
1777e60dc2
fix: test case for payment terms in quotation
2019-06-24 14:11:06 +05:30
Rohit Waghchaure
d95909c39a
fix: optimize bom update tool
2019-06-24 12:57:44 +05:30
Rohit Waghchaure
a2408a63da
feat: payment reconciliation enhancements
2019-06-24 02:11:51 +05:30
Himanshu Warekar
3780508ec5
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-24 00:33:01 +05:30
Himanshu Warekar
de8c38f0fe
fix: datetime import
2019-06-24 00:31:33 +05:30
Himanshu
3ec19b7afa
Merge branch 'develop' into sla_fix
2019-06-23 23:22:53 +05:30
sahil28297
9a6517f8f0
fix(BOM): update modified field
2019-06-23 20:06:18 +05:30
Himanshu Warekar
d70c656142
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-21 22:57:34 +05:30
Himanshu Warekar
d1ca820e1e
fix: add function for timedelta conversion
2019-06-21 22:57:06 +05:30
NahuelOperto
4448e2d66b
fix order in general ledger
2019-06-21 08:50:37 -03:00
Sahil Khan
aef77058b6
fix(BOM): set default value of include_exploded_item to 0
2019-06-21 11:37:45 +05:30
Rushabh Mehta
41721fe1c3
Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO
...
fix: copy_payment_schedule_from_quot_to_SO
2019-06-21 09:19:20 +05:30
Aditya Hase
2f4f9a2af0
Merge branch 'develop' into not_able_to_save_asset_for_manual_method_develop
2019-06-21 06:11:13 +05:30
Himanshu
c26ce5c506
Merge branch 'develop' into sla_fix
2019-06-20 23:58:08 +05:30
Himanshu Warekar
f5262c54ff
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-20 23:30:20 +05:30
Himanshu Warekar
9f19a82ec9
fix: scheduling bug if out of bussiness hours
2019-06-20 23:29:56 +05:30
Aditya Hase
9986155e8e
chore: Python 3 Tests on Travis ( #18012 )
...
chore: Python 3 Tests on Travis
2019-06-20 22:53:23 +05:30
rohitwaghchaure
8b7267eb60
Merge pull request #17921 from Mangesh-Khairnar/expense-claim
...
feat: Tax based expense claim
2019-06-20 22:02:52 +05:30
Aditya Hase
d4aea67517
Merge branch 'develop' into py3-2
2019-06-20 21:22:24 +05:30
Aditya Hase
c980143764
fix(test): Explicitly search for Material Request Item with Item Code
2019-06-20 21:15:55 +05:30
Aditya Hase
bb5ca5a01f
fix(py3): Convert filter to list
2019-06-20 20:10:53 +05:30
Deepesh Garg
d11e481888
Merge pull request #18011 from surajshetty3416/fix-accounting-dimension-permission
...
fix: Get Accounting Dimension only if user has read permission on it
2019-06-20 19:44:59 +05:30
rohitwaghchaure
d2061b44dd
fix: could not find company all ( #17978 )
2019-06-20 19:13:54 +05:30
Deepesh Garg
23deb6f79b
fix: Default cost center fix for delivery note item ( #17990 )
2019-06-20 19:11:58 +05:30
Suraj Shetty
01f56b867e
fix: Return empty array to avoid failure
2019-06-20 18:07:58 +05:30
Suraj Shetty
b663966c68
fix: Use can_read API
2019-06-20 18:00:19 +05:30
Rushabh Mehta
55c7b69afb
Merge pull request #17998 from netchampfaris/app-logo-url
...
fix: App logo URL
2019-06-20 17:53:40 +05:30
Deepesh Garg
ffa4ba06ec
Merge pull request #18010 from deepeshgarg007/gst_tax_rate_fixes
...
fix: GST report fixes
2019-06-20 17:22:59 +05:30
Suraj Shetty
da629810ad
fix: Get accounting dimensions only if user has access
2019-06-20 17:20:19 +05:30
deepeshgarg007
6ef38ebf34
fix: GSTR report fixes
2019-06-20 15:55:09 +05:30
deepeshgarg007
50f4fc48a5
fix: GSTR report fixes
2019-06-20 15:53:14 +05:30
deepeshgarg007
5ff830b6f4
fix: GSTR report fixes
2019-06-20 15:50:02 +05:30
deepeshgarg007
a8e49b8afd
Revert "fix: GSTR-2 Report fixes"
...
This reverts commit a55413cb0d3828c20ad53e54ad7abe3ca2492668.
2019-06-20 15:26:04 +05:30
deepeshgarg007
7483cb49fe
Revert "fix: GSTR-1 Report fixes"
...
This reverts commit 7592e0b588ad72d3e79cd101e94102ab1c1829f0.
2019-06-20 15:25:06 +05:30
Rushabh Mehta
5162b7457f
Merge pull request #17918 from Alchez/develop-item-code-gen
...
fix(stock): Remove hardcoded validation for Item
2019-06-20 14:21:57 +05:30
Mangesh-Khairnar
8619fc7413
fix: fetch rate only if field is empty
2019-06-20 12:02:47 +05:30
Himanshu
014dc1729d
Merge branch 'develop' into sla_fix
2019-06-20 11:36:29 +05:30
Faris Ansari
23f9b6156f
fix(Opportunity): Don't assign to Guest ( #17996 )
...
If Opportunity is created from Website, it breaks because
the assign_to user is Guest
2019-06-20 11:34:14 +05:30
Himanshu Warekar
a1c1f74d84
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-20 11:33:06 +05:30
Himanshu Warekar
a03aa0014e
feat: update sla using custom script
2019-06-20 11:32:49 +05:30
Aditya Hase
903d5201b4
fix(tests): Do not test order of features in Location ( #17983 )
...
fix(tests): Do not test order of features in Location
2019-06-20 11:29:59 +05:30
Himanshu
d82175da36
Merge branch 'develop' into sla_fix
2019-06-20 10:54:01 +05:30
Himanshu Warekar
bbe84ac0ef
feat: change apply_to to entity
2019-06-20 10:53:34 +05:30
Himanshu Warekar
ed50452800
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-20 10:01:05 +05:30
Himanshu Warekar
41bf0c6855
feat: filter sla based on customer in issue
2019-06-20 10:00:11 +05:30
Aditya Hase
b96956f35c
Merge branch 'develop' into fix-timesheet-tests
2019-06-20 09:40:23 +05:30
Deepesh Garg
12f2096846
Merge pull request #17995 from deepeshgarg007/hsn_summary_develop
...
fix: From date and to date filters in HSN wise summary of out ward supplies
2019-06-19 21:48:15 +05:30
Faris Ansari
357592f55e
fix: Remove logo replace logic
2019-06-19 19:17:50 +05:30
Faris Ansari
4a1c7ddb09
fix: App logo URL
2019-06-19 19:15:37 +05:30
Aditya Hase
6a40c491df
Merge branch 'develop' into fix-location-tests
2019-06-19 18:50:00 +05:30
deepeshgarg007
ecc670047e
fix: From date and to date filters in HSN wise summary of out ward supplies
2019-06-19 18:36:24 +05:30
Suraj Shetty
16baa3b13a
fix: Move back .pylintrc to root
2019-06-19 18:35:36 +05:30
Suraj Shetty
d4420afb72
chore: Remove unwanted files
2019-06-19 18:33:56 +05:30
Deepesh Garg
2b739b304e
Merge pull request #17970 from Mangesh-Khairnar/employee-benefit-application
...
fix(employee-benefit-application): remove query from setup
2019-06-19 18:18:47 +05:30
Mangesh-Khairnar
0ef1df72ad
refactor: fetch rate directly from the account head
2019-06-19 17:50:33 +05:30
Himanshu
3caf7b80e5
Merge branch 'develop' into sla_fix
2019-06-19 16:08:35 +05:30
rohitwaghchaure
d849ce7ce0
Merge pull request #17980 from adityahase/fix-buying-items-rate
...
fix: Consider discount_amount only when provided to calculate rate
2019-06-19 14:47:06 +05:30
Himanshu Warekar
24cef8e26e
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-19 14:43:59 +05:30
Himanshu Warekar
36d6e570c4
patch: try catch to handle TableMissingError
2019-06-19 14:43:21 +05:30
rohitwaghchaure
40c5fcc9cc
Merge pull request #17967 from Alchez/develop-delivery-email
...
fix(delivery): Add items to context for dispatch notification email
2019-06-19 14:37:23 +05:30
Himanshu
7bb1402a37
Merge branch 'develop' into sla_fix
2019-06-19 13:42:49 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter ( #17943 )
...
* fix: User MultiSelectList control for Party filter
The comma based filter wouldn't work for values that had comma in them
* fix: Replace with MultiSelectList in reports
* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Himanshu Warekar
f4f7e781c5
debug: travis
2019-06-19 12:01:59 +05:30
Aditya Hase
645afe16c3
fix(tests): Do not test order of features in Location
2019-06-18 23:01:20 +05:30
Aditya Hase
be8a46a92a
fix(tests): Timesheet tests
2019-06-18 21:50:05 +05:30
Rohit Waghchaure
5f9793e081
fix: finance book filters includes the gl data which don't have finance book
2019-06-18 21:09:52 +05:30
Himanshu Warekar
2724de9320
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-18 20:02:26 +05:30
Himanshu Warekar
e48ca44bf5
patch: fix typo
2019-06-18 20:02:00 +05:30
Himanshu Warekar
7881e838c6
patch: refactor patch for travis test
2019-06-18 19:35:50 +05:30
Aditya Hase
48585c94ff
fix: Consider discount_amount only when provided to calculate rate
...
After selecting item_code in items table and not entering rate,
Clicking elsewhere will set rate to NaN.
All DocTypes on buying side have this bug.
2019-06-18 19:11:17 +05:30
Himanshu Warekar
befd393dcb
fix: patch
2019-06-18 12:51:12 +05:30
rohitwaghchaure
226ff5a797
Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop
...
fix: bank guarantee, not able to select the purchase order
2019-06-18 11:31:01 +05:30
Suraj Shetty
5b52aba8df
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-06-18 11:28:20 +05:30
Suraj Shetty
a28b96493f
fix: Make field labels translatable
2019-06-18 11:28:14 +05:30
Suraj Shetty
a367a85a78
Merge branch 'develop' into call-summary-dialog
2019-06-18 11:09:29 +05:30
Suraj Shetty
9ba9a91631
fix: Strip leading zero from phone number
2019-06-18 10:56:47 +05:30
Deepesh Garg
c38e0bb75c
Merge pull request #17959 from deepeshgarg007/dimension-fixes
...
fix: Is group filter fixes in dimensions
2019-06-18 08:37:32 +05:30
Himanshu Warekar
7c18f69727
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-17 23:53:01 +05:30
Himanshu Warekar
0ad3887d51
patch: fixes
2019-06-17 23:52:53 +05:30
deepeshgarg007
946eefe039
fix: Codacy fixes
2019-06-17 23:10:36 +05:30
Mangesh-Khairnar
7293a98a10
fix: change formatting
2019-06-17 19:03:46 +05:30
Mangesh-Khairnar
9ee5c8a4c6
fix(employee-benefit-application): remove query from setup
2019-06-17 18:07:10 +05:30
Himanshu Warekar
bdf9737d73
patch: reload service level priority
2019-06-17 18:00:57 +05:30
Anurag Mishra
3d47a6dbb5
fix: Company filters in Total Stock Summary Report ( #17965 )
2019-06-17 17:49:04 +05:30
rohitwaghchaure
cfcf7ae7b6
Merge pull request #17960 from rohitwaghchaure/delayed_order_reports
...
feat: delayed order reports
2019-06-17 17:42:18 +05:30
Rohit Waghchaure
4803e817e9
fix: bank guarantee, not able to select the purchase order
2019-06-17 17:40:40 +05:30
Rushabh Mehta
803f784351
fix(minor): format date in user format for accounting dashboard
2019-06-17 17:33:24 +05:30
rohitwaghchaure
fdb79063a0
Merge pull request #17969 from rohitwaghchaure/enabled_disabled_buttons_on_change_of_pos_profile_develop
...
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 17:24:29 +05:30
Rohit Waghchaure
7efeffa66a
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 16:20:32 +05:30
Rohan Bansal
4babfdb987
fix(delivery): Add more context for dispatch notification email + formatting fixes
2019-06-17 16:16:51 +05:30
Mangesh-Khairnar
57f4e817f8
Merge branch 'develop' into company_ui/ux_fix
2019-06-17 15:36:45 +05:30
deepeshgarg007
dfe006be19
Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes
2019-06-17 15:26:05 +05:30
Suraj Shetty
04d623ab66
fix: Get employee login ids directly from child table
2019-06-17 15:20:28 +05:30
Suraj Shetty
db26191937
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-06-17 14:17:26 +05:30
Suraj Shetty
8b95b61aa0
fix: Remove unwanted code
2019-06-17 14:17:21 +05:30
Rohit Waghchaure
b5f94e5f71
fix: not able to save asset if depreciation method is manual
2019-06-17 13:34:44 +05:30
Faris Ansari
2e968ece1a
Delete test_call_log.py
2019-06-17 13:03:44 +05:30
Faris Ansari
520c403a05
Delete call_log.js
2019-06-17 13:02:49 +05:30
Suraj Shetty
ec6afbbe99
Merge pull request #17953 from netchampfaris/website-theme-import
...
fix: Add erpnext website theme import
2019-06-17 12:56:24 +05:30
Rohit Waghchaure
725f56faca
feat: delayed order reports
2019-06-17 12:50:44 +05:30
deepeshgarg007
d1e0f42fea
fix: Styling fix
2019-06-17 12:47:39 +05:30
deepeshgarg007
7e3a98ba33
fix: Is group filter fixes in dimensions
2019-06-17 12:44:49 +05:30
Suraj Shetty
93fc6004ad
Merge pull request #17942 from netchampfaris/product-page-cart-disabled
...
fix: Show product page even if cart is not enabled
2019-06-17 12:36:09 +05:30
Suraj Shetty
f821b18a82
Merge pull request #17951 from netchampfaris/product-page-specification
...
fix: Remove Specifications label
2019-06-17 12:32:58 +05:30
Himanshu Warekar
67f9b63793
patch: get priority before reload_doc
2019-06-17 11:49:02 +05:30
Suraj Shetty
340ccb6c96
fix: Remove unwanted code
2019-06-17 10:16:38 +05:30
Himanshu Warekar
199b43dbbb
fix: patch fixes for sla
2019-06-17 09:35:34 +05:30
Suraj Shetty
a86a07ef37
fix: Add additional check to ensure doc_before save exists
2019-06-17 09:29:46 +05:30
Suraj Shetty
eb0ca67ced
fix: Caller name in call popup
2019-06-17 08:59:12 +05:30
Suraj Shetty
5ea6a5e33a
fix: Decouple call popup from exotel
2019-06-17 08:46:38 +05:30
Himanshu Warekar
c58d0317a4
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-17 08:43:36 +05:30
Suraj Shetty
3fdeffff7a
feat: Add medium field in call log doctype
2019-06-17 08:27:00 +05:30
Suraj Shetty
be1dddd596
feat: Add call recording URL field to call log
2019-06-17 08:06:14 +05:30
Rohit Waghchaure
b821af44b6
fix: revert group by voucher general ledger changes
2019-06-17 07:42:53 +05:30
Deepesh Garg
7793df885b
Merge pull request #17947 from deepeshgarg007/gstr-3b-pos-fixes
...
fix: GSTR-3b Report fixes
2019-06-16 20:03:48 +05:30
Himanshu Warekar
b9ddcc4bfa
Merge develop into sla_fix
2019-06-15 13:09:57 +05:30
Faris Ansari
8e99aaf605
fix: Add erpnext website theme import
2019-06-14 20:06:54 +05:30
Faris Ansari
b2ab1031e3
fix: Show Clear filters when attribute filters are set
2019-06-14 18:16:14 +05:30
Faris Ansari
22642a5f45
fix: Homepage products styling ( #17912 )
2019-06-14 18:15:40 +05:30
rohitwaghchaure
7ae0f25f11
Merge pull request #17952 from rohitwaghchaure/added_promotional_scheme_in_selling_buying
...
fix: added promotional scheme in selling and buying module page
2019-06-14 17:31:43 +05:30
Rohit Waghchaure
1ecc78266c
fix: added promotional scheme in selling and buying module page
2019-06-14 17:31:15 +05:30
Faris Ansari
f472a49cf6
fix: Remove Specifications label
2019-06-14 16:32:21 +05:30
Anurag Mishra
a5527225b6
fix: requested changes
2019-06-14 15:26:19 +05:30
deepeshgarg007
37a717aa98
fix: Seperate queries for Taxable value and tax amounts
2019-06-14 14:30:36 +05:30
Anurag Mishra
e87ebcaf04
fix: upadated employee dashboard
2019-06-14 14:10:48 +05:30
Anurag Mishra
0ae6cbdd01
fix: requested Changes
2019-06-14 14:10:48 +05:30
Anurag Mishra
e6dd55d9f2
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
rohitwaghchaure
6f6a1c8908
Merge pull request #17946 from Anurag810/make_stock_entry_against_purchase_receipt_3
...
feat: Creating stock entry against purchase receipt and some minor fixes
2019-06-14 13:32:22 +05:30
deepeshgarg007
c62518c094
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr-3b-pos-fixes
2019-06-14 13:14:51 +05:30