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
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
Faris Ansari
b99f53f410
Merge pull request #17517 from karthikeyan5/develop-biometric-attendance
...
feat(HR): Auto Attendance
2019-06-24 17:28:28 +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
rohitwaghchaure
b8df611160
Merge pull request #18035 from rohitwaghchaure/fixed_test_case_for_payment_terms_in_so
...
fix: test case for payment terms in quotation
2019-06-24 15:14:51 +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
8c0e65cccc
fix(test): Explicitly search for Material Request Item with Item Code ( #18013 )
...
fix(test): Explicitly search for Material Request Item with Item Code
2019-06-20 21:22:06 +05:30