Shivam Mishra
|
9e07b7d2b8
|
Merge branch 'develop' into twelve-fixes
|
2019-06-27 09:44:41 +05:30 |
|
Himanshu
|
0b39c4ecff
|
Merge pull request #17492 from hrwX/sla_fix
feat(Service Level Agreement): Service Level Agreement based on Customer, Group and Territory
|
2019-06-27 01:32:21 +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 |
|
rohitwaghchaure
|
5e299686be
|
Merge pull request #18085 from rohitwaghchaure/fix_test_cases_for_sales_invoice_for_dn_develop
fix: dn test cases
|
2019-06-26 23:04:35 +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 |
|
Karthikeyan S
|
51c600696e
|
fix(README): broken link to 'Report Security Vulnerabilities' (#18063)
|
2019-06-26 13:41:00 +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 |
|
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 |
|
rohitwaghchaure
|
99ef523c9c
|
Merge pull request #18017 from sahil28297/fix_bom_exploded_item
fix(BOM): set default value of include_exploded_item to "0"
|
2019-06-25 14:18:33 +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 |
|
rohitwaghchaure
|
07f9dbbf80
|
Merge pull request #18050 from rohitwaghchaure/revert_bom_recurrsion_changes
fix: revert changes of bom recursion
|
2019-06-25 07:12:51 +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 |
|
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 |
|
Faris Ansari
|
b99f53f410
|
Merge pull request #17517 from karthikeyan5/develop-biometric-attendance
feat(HR): Auto Attendance
|
2019-06-24 17:28:28 +05:30 |
|
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 |
|