Rushabh Mehta
2dea40f7be
[leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042
2015-04-15 15:08:48 +05:30
Anand Doshi
00a07de426
fixed test earning type
2015-04-08 21:49:11 +05:30
Anand Doshi
2f87fb41fa
Merge pull request #3069 from neilLasrado/dob
...
validation added - dob cannot accept a future date
2015-04-08 13:25:01 +05:30
Anand Doshi
a1a3468704
Merge pull request #3068 from neilLasrado/leaves
...
Bug Fixes
2015-04-08 13:20:18 +05:30
Neil Trini Lasrado
4b29ccc2b0
Salary Structure - Earnings made mandatory
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef
fix - update button didnt work in leave allocation after submit
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515
validation added - dob cannot accept a future date
2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b
fixes in offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a
print format added
2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513
[fixes] offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2
terms view added
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168
Offer Letter - New Doctype added and job_applicant naming changed
2015-04-08 12:28:20 +05:30
Rushabh Mehta
ffc190d34d
Merge pull request #3013 from neilLasrado/expense
...
Expense Claim - 'Total Amount Reimbursed' feild added
2015-04-02 14:29:29 +05:30
Anand Doshi
7b6daafbb9
[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person
2015-04-01 16:26:59 +05:30
Anand Doshi
ee57a8d2a4
[hotfix] unique job applicant
2015-04-01 12:29:30 +05:30
Anand Doshi
d6a360b51b
[fix] check job application unique email id
2015-03-30 21:11:34 +05:30
Neil Trini Lasrado
a6b3415cdd
Expense Claim - 'Total Amount Reimbursed' feild added
2015-03-26 14:13:44 +05:30
Rushabh Mehta
04f907efcf
[fix] job applicant (test via import)
2015-03-23 15:44:54 +05:30
Rushabh Mehta
c2eae25d0e
[cleanup] validate_email_add
2015-03-23 14:10:51 +05:30
Anand Doshi
9d8154dd40
fixed test cases
2015-03-18 16:22:13 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
Nabin Hait
56c6a65a22
argument name fix in sendmail
2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
786472279a
salary slip calculation: trigger on
2015-03-03 14:07:21 +05:30
Rushabh Mehta
c37281e59c
Merge pull request #2897 from neilLasrado/job-application
...
job application fixed
2015-03-02 19:01:16 +05:30
Neil Trini Lasrado
96bc31db27
job application fixed
2015-03-02 18:54:45 +05:30
Rushabh Mehta
910ba02f49
Merge pull request #2896 from neilLasrado/employee-report
...
employee information report fix
2015-03-02 18:31:47 +05:30
Neil Trini Lasrado
71a651ec21
employee information report fix
2015-03-02 18:13:25 +05:30
Neil Trini Lasrado
fd0920fe83
Fixes in Appraisal doc
2015-03-02 17:33:48 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Do Le Bao Nguyen
f9b63dd36a
Look like a minor bug
...
- There is no frappe.get_default but only frappe.db.get_default ?
- Error return if selecting Employee in Salary Slip without specifying the Fiscal Year first
2015-02-03 11:10:09 +08:00
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Nabin Hait
024b537b7f
Merge pull request #2557 from neilLasrado/spelling-of-approver
...
Spelling Correction - Leave application #2552
2015-01-12 17:02:10 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
1b7d66fab6
Update leave_application.js
2015-01-07 11:16:41 +05:30
Nabin Hait
56ac3fb29d
some fixes for renaming patch
2015-01-01 13:40:54 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
0741ed3a82
Merge pull request #2472 from neilLasrado/expense-claim
...
New feature for issue #2419
2014-12-23 18:07:38 +05:30
Neil Trini Lasrado
41781ce686
test case fix - holiday list
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
...
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519
Holiday List name changed and workstation filter added to time log
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd
Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log
2014-12-23 17:38:59 +05:30
Anand Doshi
f87a622ef0
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-15 23:14:35 +05:30
Nabin Hait
606af96c9f
minor fix
2014-12-15 11:57:19 +05:30
Neil Trini Lasrado
e1f21682fb
changes made
2014-12-12 13:09:42 +05:30
Neil Trini Lasrado
f13c4f0145
New feature for issue #2419
2014-12-12 12:33:55 +05:30
Nabin Hait
5cafcf66b0
Leave application fix
2014-12-10 23:59:04 +05:30
Nabin Hait
690bcd7b66
Added leave approver name field in leave application
2014-12-09 16:36:33 +05:30
Rushabh Mehta
3d65d9602e
[error-reports]
2014-11-28 14:58:43 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Nabin Hait
eba88919c1
Merge pull request #2431 from mayur-patel/patch-2
...
Update leave_application.py : Modified get_holidays function
2014-11-25 10:55:11 +05:30
Nabin Hait
ea91d2aaf1
Merge pull request #2429 from ankitjavalkarwork/expclaimname
...
Add configurable naming series to Expense claim
2014-11-25 10:51:03 +05:30
Mayur Patel
5d8635a8dc
Update leave_application.py
...
See issue #2422 for more detail.
2014-11-24 16:57:53 +00:00
ankitjavalkarwork
7e911bae95
Add configurable naming series to Expense claim
2014-11-24 18:26:17 +05:30
Nabin Hait
0ad7db3bbd
Minor fix in salary slip net total calculation
2014-11-24 15:25:13 +05:30
ankitjavalkarwork
16e2c18c64
Delete events linked with employee on deletion of Employee
2014-11-10 18:08:23 +05:30
Nathan Do
8a55d9a795
Remove get_server_field from leave_application
...
- Make get_holidays and get_total_leave_days global to module
- Replace get_server_field with using whitelisted function
get_total_leave_days
2014-11-05 12:32:57 +08:00
Nabin Hait
a5082d6233
Merge pull request #2283 from neilLasrado/employee-reports-to
...
employee cannot report to himself validation added to employee doctype
2014-10-10 15:20:13 +05:30
Neil Trini Lasrado
9b08062bed
employee cannot report to himself validation added to employee doctype
2014-10-09 17:26:17 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Rushabh Mehta
bf8715dba4
[refactor] used frappe.sendmail
2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0
[cleanup] removed communication js, fields
2014-09-16 15:11:42 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
Anand Doshi
30c5b41398
[minor] removed Suggest
2014-09-15 16:43:34 +05:30
81552433qqcom
1c440b3b31
month options doesn't get translated.
2014-09-12 16:07:12 +05:30
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Anand Doshi
0b74b6d98c
[fix] Validate Expense Approver
2014-09-05 14:41:53 +05:30
Anand Doshi
bb370f3b6a
HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions
2014-08-29 11:19:10 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Anand Doshi
e4c434ab6f
[fix] Leave Application Calendar
2014-08-18 17:04:04 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Anand Doshi
26201a5828
[fix] Show Employee Name in Employee Birthday report
2014-08-08 12:49:11 +05:30
Anand Doshi
4cc94df752
[tests] Fixed Test Records
2014-08-08 11:56:32 +05:30
Rushabh Mehta
7a4e739d6c
templating for hr
2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19
added more listview templates
2014-08-08 11:56:32 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Nabin Hait
7881df2138
minor fix
2014-08-06 17:29:07 +05:30
Nabin Hait
9f7e00bb3a
Send salary slip mail after submit via Salary Manager
2014-08-06 17:25:23 +05:30
Nabin Hait
45b7d17ee8
Employee can be reselected but not changed in salary structure
2014-08-06 17:25:23 +05:30
Anand Doshi
35cc320e21
[fixes] Leave Application and Toggle Rounded Totals
2014-07-30 17:00:26 +05:30
nabinhait
16317748dd
Issue fixes related to length of the report result
2014-07-28 16:41:34 +05:30
Anand Doshi
62b1cbf003
[impact] Limit available functions in jinja environment
2014-07-25 13:02:29 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Anand Doshi
df7f1c17ac
Fixed Employee Birthday Report
2014-07-02 17:35:00 +05:30
Anand Doshi
4aa2380de2
Fixed get_sender for Sales and Jobs
2014-06-30 12:19:22 +05:30
Anand Doshi
83da92fdcc
Naming Series Property Setter Patch
2014-06-23 18:04:07 +05:30
Anand Doshi
31c977b906
Fixed Employee Leave Balance Report
2014-06-18 16:26:45 +05:30
Nabin Hait
589a298096
Minor fixes in salary manager. Fixes #1754
2014-06-11 13:00:31 +05:30
Anand Doshi
04badf7e6e
Hotfix: module name case for HR
2014-06-06 15:29:55 +05:30
Anand Doshi
171c00cfd6
Reload permissions for master and setting documents
2014-06-06 15:13:20 +05:30
Anand Doshi
ede8ea52b0
Fixes
2014-06-05 18:06:20 +05:30
Rushabh Mehta
41471c3b44
fixed description in salary manager
2014-06-05 16:01:55 +05:30
Anand Doshi
85479bcbc0
Fixes for apply user permissions and momentjs
2014-06-04 18:15:43 +05:30
Anand Doshi
ec8240e890
Apply User Permissions optional in Script and Query Reports
2014-06-04 17:48:58 +05:30
Anand Doshi
38dedf402b
Fixes in patches for migration
2014-06-04 17:48:56 +05:30
Anand Doshi
c280d0655c
Set Employee Name if missing
2014-06-04 17:48:56 +05:30
Anand Doshi
cdc1b640d9
Fixes in user permissions patches
2014-06-04 17:48:56 +05:30
Anand Doshi
4985691617
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
69eec9e344
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Nabin Hait
fb988ba834
Salary Slip: pull details from salary struture. fixes #1719
2014-05-30 15:53:20 +05:30
Nabin Hait
1897e75894
Remove blank lines from uploaded file of attendance #1714
2014-05-30 14:31:10 +05:30
Rushabh Mehta
a39cae9c2e
added title field to support ticket, lead and employee
2014-05-21 17:34:22 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +05:30
Nabin Hait
ad68d64d93
Leave approver select options in leave application and employee
2014-05-16 19:56:43 +05:30
Nabin Hait
bc7659ab90
Employee leave balance report fixes #1647
2014-05-15 11:37:12 +05:30
Anand Doshi
54b7962eb9
Pass frm to open_mapped_doc
2014-05-14 17:38:45 +05:30
Nabin Hait
aade34b0c9
Reports and print formats modified for renamed fields
2014-05-13 16:12:37 +05:30
Rushabh Mehta
409c8e9732
removed confirmation date validations (wtf)
2014-05-11 10:01:16 +05:30
Rushabh Mehta
75e11a7270
Merge pull request #1616 from pdvyas/migrate-3to4
...
3 to 4 migration fixes
2014-05-10 22:19:07 +05:30
Pratik Vyas
95f558e7bc
fix update user properties patch
2014-05-10 22:16:39 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Anand Doshi
f410bd9bf9
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
...
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Anand Doshi
8c2dbab878
Changed default naming series options
...
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Anand Doshi
37909b292f
Remove India specific fields
2014-05-06 16:15:56 +05:30
Nabin Hait
02d37bbb5a
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:18:50 +05:30
Anand Doshi
648062d071
Fixes in test cases
2014-05-05 16:46:38 +05:30
Anand Doshi
b71a18cd1e
Leave Allocation Tool and Employee. Fixes #1555
2014-05-02 16:23:51 +05:30
Anand Doshi
f29bcaf436
Added new fixtures ( Fixes #1540 ). Removed Employee Grade from HR.
2014-05-02 13:55:07 +05:30
Anand Doshi
51e6d2228d
Salary Slip - read permission for Employee. Fixes #1553
2014-05-01 16:28:13 +05:30
Anand Doshi
d9f0f27cd4
Fixes in test cases
2014-04-30 22:16:25 +05:30
Rushabh Mehta
a15164750d
started client side testing using selenium and other related and unrelated fixes
2014-04-30 19:39:13 +05:30
