Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,202 Commits 3 Branches 0 Tags 1 GiB
10562b67fc
Commit Graph

27202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aditya Hase
10562b67fc fix(sales-funnel): Use frappe.Chart() instead of Chart() 2019-06-25 17:07: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
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
Faris Ansari
b99f53f410
Merge pull request #17517 from karthikeyan5/develop-biometric-attendance 
feat(HR): Auto Attendance
 2019-06-24 17:28:28 +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
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
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
Aditya Hase
c980143764 fix(test): Explicitly search for Material Request Item with Item Code 2019-06-20 21:15:55 +05:30
Aditya Hase
51eecd0c42 chore: Enable Flake 821 rule 2019-06-20 20:10:53 +05:30
Aditya Hase
700711c28d fix: Run script with bash 2019-06-20 20:10:53 +05:30
Aditya Hase
44da737c1b fix: Minor 2019-06-20 20:10:53 +05:30
Aditya Hase
c052ce61f7 fix: Set file permissions 755 on travis/run-tests.sh 2019-06-20 20:10:53 +05:30
Aditya Hase
bb5ca5a01f fix(py3): Convert filter to list 2019-06-20 20:10:53 +05:30
Aditya Hase
63ddff867a chore: Temporarily disable flake rule F821 2019-06-20 20:10:53 +05:30
Aditya Hase
f397acc936 fix(travis): Refactor .travis.yml 2019-06-20 20:10:53 +05:30
Aditya Hase
3fa112d8a7 feat(travis): Python 3.6 tests 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
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
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
Aditya Hase
d5cd0a05d0
fix(tests): Timesheet tests (#17982) 
fix(tests): Timesheet tests
 2019-06-20 09:40:56 +05:30
Aditya Hase
b96956f35c
Merge branch 'develop' into fix-timesheet-tests 2019-06-20 09:40:23 +05:30