Commit Graph

29105 Commits

Author SHA1 Message Date
Frappe PR Bot
75c5c89909 feat: Updated translation (#19329) 2019-10-21 13:34:14 +05:30
Mangesh-Khairnar
cdf15222e1 fix: half day leave (#19323) 2019-10-21 13:33:46 +05:30
Deepesh Garg
6208755d54 fix: Unable to add details in quotation and opportunity (#19354) 2019-10-21 13:29:44 +05:30
Deepesh Garg
4821f38d25 fix: Item Price changes are not persistent after updating cost on submitted BOM (#19356) 2019-10-21 13:27:40 +05:30
rohitwaghchaure
717ad388be
Merge pull request #19319 from deepeshgarg007/asset-fixes-1
fix: Value after depreciation fixes in asset
2019-10-21 12:16:16 +05:30
Deepesh Garg
dc694597f0
Merge branch 'develop' into develop 2019-10-20 22:04:30 +05:30
Deepesh Garg
9474b90fda
Merge pull request #19360 from mudux/develop
fix: vitals chart legibility and BMI annotation
2019-10-20 21:56:38 +05:30
Deepesh Garg
721c381df3
Merge branch 'develop' into develop 2019-10-20 18:15:58 +05:30
Deepesh Garg
305ec78c93
Merge pull request #19362 from deepeshgarg007/travis-fix-revert
fix: Travis
2019-10-20 18:15:45 +05:30
deepeshgarg007
737ec6b26e fix: Travis 2019-10-20 17:36:36 +05:30
Mohamud Amin Ali
871193eb62 fix: removed annotations altogether for bmi 2019-10-20 11:50:15 +03:00
Mohamud Amin Ali
02279dff31 fix: appropriate annotations in BMI 2019-10-20 10:46:45 +03:00
Mohamud Amin Ali
43b22b4473 fix: a more legible chart for vitals 2019-10-20 10:34:39 +03:00
Deepesh Garg
c8d9a5305b
Merge branch 'develop' into revert-19265-issue_fix 2019-10-20 12:18:34 +05:30
Deepesh Garg
06ace23a32
Merge pull request #18200 from alyf-de/datev_report_headers
feat(regional): enable automatic processing of DATEV reports
2019-10-19 22:56:59 +05:30
Deepesh Garg
979b042675
Merge pull request #19351 from mudux/develop
fix: Vitals chart in Patient History not showing
2019-10-19 17:24:41 +05:30
mudux
0d7359a826 fix: Vitals chart not diplaying 2019-10-19 11:10:42 +03:00
deepeshgarg007
55eff16760 fix: Value after depreciation fixes in asset,
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2019-10-19 12:16:25 +05:30
Deepesh Garg
dcb9c2031b
Merge branch 'develop' into datev_report_headers 2019-10-19 11:34:57 +05:30
Khushal Trivedi
d02b026a4d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-10-18 17:04:26 +05:30
Khushal Trivedi
8750caa8e3 [Fix] - if its not multi company set it by default on BO 2019-10-18 17:01:16 +05:30
Rohan Bansal
83740de636 fix(selling): Add missing label to company address field 2019-10-16 15:16:00 +05:30
Rohan
d389ee457c
Merge branch 'develop' into dev-work-order-bugs 2019-10-16 15:08:58 +05:30
Rohan
a77f534f7c
Merge branch 'develop' into dev-serial-no-statuses 2019-10-16 15:08:57 +05:30
Khushal Trivedi
5f4b6d267c [Fix] - making customer/supplier field manadatory on order type condition on BO 2019-10-16 13:40:58 +05:30
Khushal Trivedi
7084f07dab [Fix] - making customer/supplier field manadatory on order type condition on BO 2019-10-16 13:40:33 +05:30
Khushal Trivedi
1675181e49 [Fix] - making customer/supplier field manadatory on order type condition on BO 2019-10-16 12:02:56 +05:30
Khushal Trivedi
01f8a4966a [Fix] - making customer/supplier field manadatory on order type condition 2019-10-16 11:40:27 +05:30
ashish-greycube
c41e44d964 fix: relative link in href 2019-10-16 10:38:31 +05:30
ashish-greycube
a32618dff4 add coupon code on selling card of desk 2019-10-16 10:26:25 +05:30
Shivam Mishra
8aa0a280b2 Revert "fix: Allow disabled links in issue doctype (#19265)"
This reverts commit 29a5756f87.
2019-10-15 19:17:20 +05:30
deepeshgarg007
3db65ef7e8 fix: Demo Script 2019-10-15 19:16:45 +05:30
joelios
441720df75
fix: linking of time_log to timesheet from project (frappe/erpnext #19315 ) 2019-10-15 15:42:51 +02:00
Kenneth Sequeira
c269c68727 fix: allow read-only on new address form (#19304) 2019-10-15 16:34:55 +05:30
rohitwaghchaure
3af9ea8d7d
Merge pull request #17117 from ashish-greycube/affiliate_and_coupon
feat: affiliate sales partner referral code and coupon code
2019-10-15 15:44:16 +05:30
Khushal Trivedi
e2bb950012 [fix] - from date cannot be greater than to date on blanket order 2019-10-15 15:03:13 +05:30
Rohit Waghchaure
a20fb650fe code cleanup 2019-10-15 14:42:09 +05:30
Sagar Gharge
f935e37925 [Fix] restricted duplicate guardians on student doctype (#19194) 2019-10-15 14:38:04 +05:30
Rohit Waghchaure
66072fec5a fixed conflicts 2019-10-15 14:18:59 +05:30
Nabin Hait
19070621af tests: added tests for PO scheduled date 2019-10-15 14:11:40 +05:30
Nabin Hait
a113861b0c fix: Always set required date based on min date on item table 2019-10-15 12:43:27 +05:30
ashish-greycube
cf24191fe5 feat: affiliate sales partner referral code and coupon code 2019-10-15 11:44:45 +05:30
ashish-greycube
74dc3c99de feat: coupon_code and referral_sales_partner functionality 2019-10-15 11:44:45 +05:30
rohitwaghchaure
0bb99c15e5 fix: while submitting landed cost voucher user getting negative stock error (#19269) 2019-10-14 15:18:36 +05:30
Vijaya Raghavan
adc1529567
fixed typo
fixes type in filter parameter
2019-10-13 21:41:02 +05:30
Deepesh Garg
3f2c5c2319
Merge pull request #19288 from deepeshgarg007/analytics_chart_fix
fix: Chart fix in Analytics report when based on item
2019-10-13 09:33:31 +05:30
deepeshgarg007
683a89a415 fix: Chart fix in Analytics report 2019-10-12 23:02:53 +05:30
Mangesh-Khairnar
4ed9b45fb8 feat(Sales Order): Allow to skip delivery note creation (#19222)
* feat(sales-order): add option to skip delivery note creation for order type maintenance

* fix(sales-order): hide delivery date on setting skip delivery note creation

* fix: allow skipping delivery note for all order types

* fix: bypass delivery note creation on setting skip delivery note creation

* fix: show skip delivery note in list view

* fix: check for duplicate project name after submitting prompt

* fix:  toggle delivery note reqd for skip delivery note

* fix: update status based on skip delivery note
2019-10-12 19:33:11 +05:30
rohitwaghchaure
86870b0aa6 fix: production plan not showing grand total against sales order (#19283) 2019-10-12 16:49:38 +05:30
rohitwaghchaure
a0c162c2d6 fix: project has not set in the sub assembly work order from production plan (#19284) 2019-10-12 16:48:57 +05:30