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 |
|
Anand Doshi
|
69aa8ffac4
|
Fixed as_dict of employee.py
|
2014-04-28 16:51:34 +05:30 |
|
Anand Doshi
|
1872312cc6
|
Deprecated client side mapper: frappe.model.map. Fixes #1530
|
2014-04-25 18:38:08 +05:30 |
|
Anand Doshi
|
8bde7f9b3a
|
Conditionally toggle Naming Series. Fixes #1526
|
2014-04-24 18:11:49 +05:30 |
|
Anand Doshi
|
3e41fd1fd3
|
List route for tree browser based doctypes; Fixes to add child in tree browsers
|
2014-04-22 18:55:21 +05:30 |
|
Anand Doshi
|
07339fc69e
|
Fixes in Setup Wizard and Attachments
|
2014-04-22 15:30:24 +05:30 |
|
Anand Doshi
|
424c033395
|
Removed controller.py
|
2014-04-21 15:06:56 +05:30 |
|
Anand Doshi
|
cbbf451974
|
Fixes throw
|
2014-04-21 11:33:49 +05:30 |
|
Rushabh Mehta
|
c38fc713c6
|
updated translations
|
2014-04-16 17:46:30 +05:30 |
|
Nabin Hait
|
450d9d72d7
|
Minor fix in monthly attendance report
Cherry-picked and modified by @anandpdoshi
Conflicts:
hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
|
2014-04-16 15:23:09 +05:30 |
|
Rushabh Mehta
|
ff93802d58
|
more message fixes
|
2014-04-15 18:40:31 +05:30 |
|
Rushabh Mehta
|
8a40c136ce
|
more message fixing
|
2014-04-15 16:31:20 +05:30 |
|
Pratik Vyas
|
f37d6fe32b
|
Merge pull request #1514 from frappe/js-translate-refactor
JS translation refactor
|
2014-04-15 11:44:16 +05:30 |
|
Rushabh Mehta
|
354b32177d
|
fix for leave application test
|
2014-04-14 22:23:41 +05:30 |
|
Rushabh Mehta
|
9f0d625300
|
update translation strings #1403
|
2014-04-14 19:20:45 +05:30 |
|
Pratik Vyas
|
b0f279a34e
|
js translations refactor
|
2014-04-14 17:14:23 +05:30 |
|
Pratik Vyas
|
b52618c142
|
frappe._ to __
|
2014-04-14 16:25:30 +05:30 |
|
Rushabh Mehta
|
558a9aabfb
|
removed control panel
|
2014-04-04 12:00:36 +05:30 |
|
Rushabh Mehta
|
0cf531c8a6
|
frappe/frappe#478 fixes
|
2014-04-03 17:43:06 +05:30 |
|
Rushabh Mehta
|
f14b809ab5
|
frappe/frappe#478, more changes, removed bean
|
2014-04-03 14:30:42 +05:30 |
|
Rushabh Mehta
|
f191f854cd
|
frappe/frappe#478 erpnext install works
|
2014-04-02 18:09:34 +05:30 |
|
Rushabh Mehta
|
f2227d033c
|
frappe/frappe#478, removed instances of .fields
|
2014-03-31 23:37:40 +05:30 |
|
Rushabh Mehta
|
231f6a5b58
|
frappe/frappe#478 added test_records.json
|
2014-03-31 23:05:12 +05:30 |
|
Rushabh Mehta
|
0a0f2495a2
|
frappe/frappe#478, frappe tests pass, .txt renamed to .json
|
2014-03-31 17:27:06 +05:30 |
|
Nabin Hait
|
0e13cd5ac9
|
frappe/frappe#478
|
2014-03-28 17:01:32 +05:30 |
|
Nabin Hait
|
0d8d30e1cc
|
frappe/frappe#478
|
2014-03-28 16:57:21 +05:30 |
|
Rushabh Mehta
|
b385ecf65e
|
frappe/frappe#478
|
2014-03-28 16:54:45 +05:30 |
|
Anand Doshi
|
43405203b2
|
frappe/frappe#478
|
2014-03-28 16:43:50 +05:30 |
|
Anand Doshi
|
81ba0b29da
|
frappe/frappe#478
|
2014-03-28 15:23:26 +05:30 |
|
Anand Doshi
|
f78d1aee28
|
Replaced doc, doc.fields frappe/frappe#478
|
2014-03-28 13:55:00 +05:30 |
|
Anand Doshi
|
40534f076b
|
Changed creation, modified format frappe/frappe#478
|
2014-03-28 12:46:53 +05:30 |
|
Rushabh Mehta
|
daae743608
|
frappe/frappe#478
|
2014-03-27 17:54:18 +05:30 |
|
Rushabh Mehta
|
e88bc8b12a
|
frappe/frappe#478
|
2014-03-27 17:51:41 +05:30 |
|
Rushabh Mehta
|
d2b34dc30c
|
frappe/frappe#478
|
2014-03-27 16:12:56 +05:30 |
|
Rushabh Mehta
|
66d52b55c0
|
#478
|
2014-03-27 14:17:33 +05:30 |
|
Rushabh Mehta
|
aa355af2cf
|
refactored client side Model and Meta - frappe/frappe#478
|
2014-03-26 18:24:30 +05:30 |
|
Anand Doshi
|
754cbd4036
|
Fixed Permissions and Time Log
|
2014-03-25 20:09:12 +05:30 |
|
Nabin Hait
|
102842ba79
|
Leave allocation fix
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
73083dc960
|
Fix related to user_default
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
4d713ac5ba
|
sql injection fixes
|
2014-03-21 11:22:37 +05:30 |
|
Pratik Vyas
|
65e8676f8b
|
Profile -> User
|
2014-03-13 03:09:15 +05:30 |
|
Pratik Vyas
|
5c81f9c44e
|
check docstatus before updating employee
|
2014-03-13 02:35:23 +05:30 |
|
Rushabh Mehta
|
7c932003ed
|
rename Profile to User frappe/frappe#470
|
2014-03-11 16:15:59 +05:30 |
|
Anand Doshi
|
09a9f4c0c9
|
Added module to Report doctype
|
2014-03-07 17:20:22 +05:30 |
|
Rushabh Mehta
|
c12ccdb6ea
|
bugfix erpnext/frappe#1446
|
2014-03-06 15:45:45 +05:30 |
|
Anand Doshi
|
2d5727b17b
|
Ignore mandatory during email pulling
|
2014-03-05 19:24:07 +05:30 |
|
Anand Doshi
|
f5794f1c07
|
Module Home Pages using Module View
|
2014-03-03 15:06:34 +05:30 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Nabin Hait
|
9d1f077922
|
get lead details in quotation
|
2014-02-19 17:43:24 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Anand Doshi
|
1d7e933590
|
Fix in Get Job Applications
|
2014-02-07 20:26:56 +05:30 |
|
Akhilesh Darjee
|
f1c3537924
|
webnotes/erpnext#869 newsletter to send to employees
|
2014-02-03 19:28:36 +05:30 |
|
Nabin Hait
|
45f0c25a6d
|
Merge pull request #1365 from akhileshdarjee/4.0-hotfix
Stay Updated button in website fixed
|
2014-01-31 02:44:35 -08:00 |
|
Akhilesh Darjee
|
dc45153430
|
webnotes/erpnext#1221 dont allow duplicate user id in employee
|
2014-01-31 12:23:13 +05:30 |
|
Akhilesh Darjee
|
4f7215662d
|
webnotes/erpnext#1090 set default tax type in customer and supplier
|
2014-01-29 16:31:38 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +05:30 |
|
Rushabh Mehta
|
1cd96a136f
|
updates for restriction
|
2014-01-24 11:10:24 +05:30 |
|
Rushabh Mehta
|
f96bcf943b
|
added explicit delete perimssions
|
2014-01-20 17:52:13 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
5c96b75a68
|
fixed maintenance schedule
|
2014-01-02 17:54:12 +05:30 |
|
Nabin Hait
|
a2e0a9b05f
|
Fliend rearrangemet in tables
|
2014-01-01 10:45:42 +05:30 |
|
Anand Doshi
|
8e332ffd16
|
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
|
2013-12-26 19:12:51 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
2b08985e16
|
Translations redesigned webnotes/wnframework#351
|
2013-12-19 18:27:48 +05:30 |
|
Rushabh Mehta
|
c652a6254f
|
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
|
2013-12-16 12:48:38 +05:30 |
|
Rushabh Mehta
|
6de403f2be
|
added manifest, hooks and fixed requires webnotes/wnframework#351
|
2013-12-13 14:10:14 +05:30 |
|
Rushabh Mehta
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +05:30 |
|
Rushabh Mehta
|
39bb8e2ed4
|
step 0: install
|
2013-12-11 15:32:14 +05:30 |
|
Rushabh Mehta
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Anand Doshi
|
d14dc83b88
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-12 14:55:20 +05:30 |
|
Anand Doshi
|
94dd7ef879
|
show employee name in employee link field in attendance form
|
2012-09-12 14:53:44 +05:30 |
|
Anand Doshi
|
0851b4b397
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-14 14:56:09 +05:30 |
|
Anand Doshi
|
46f8b50c8c
|
added Expense Claim Type link in HR Home page
|
2012-08-14 14:53:38 +05:30 |
|
Anand Doshi
|
59d37c4bcb
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/hr/doctype/expense_claim/expense_claim.js
erpnext/patches/patch_list.py
|
2012-07-31 17:30:49 +05:30 |
|
Anand Doshi
|
0029ac9f3c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 11:46:57 +05:30 |
|
Anand Doshi
|
054cf3907f
|
removed validate approver code
|
2012-07-31 11:46:41 +05:30 |
|
Nabin Hait
|
87b6d656df
|
sanctioned amt auto set equals to claimed amt
|
2012-07-31 11:23:44 +05:30 |
|
Anand Doshi
|
76ec66dd65
|
fixes for unicode
|
2012-07-20 18:11:30 +05:30 |
|
Anand Doshi
|
486f9dfcec
|
added unicode_literals import at start of each file
|
2012-07-19 13:40:31 +05:30 |
|
Anand Doshi
|
5756630efb
|
Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
|
2012-07-18 20:31:37 +05:30 |
|
Anand Doshi
|
249659d673
|
Changed file names from listview.js to doctype_name_list.js
|
2012-07-18 20:25:58 +05:30 |
|
Rushabh Mehta
|
2eef40bf1e
|
get_field > wn.meta.get_docfield
|
2012-07-16 14:16:57 +05:30 |
|
Nabin Hait
|
51f8a6d0d5
|
select employee based on joining and relieving date in salary maanger
|
2012-07-12 16:25:13 +05:30 |
|
Nabin Hait
|
e9c19369a9
|
salary slip will not submitted through salary manager if Send email checked and invalid email id
|
2012-07-12 10:33:45 +05:30 |
|
Nabin Hait
|
42e1273c4c
|
listview for salary structure
|
2012-07-11 16:38:00 +05:30 |
|
Anand Doshi
|
e301e8a6c1
|
Merge branch 'master' into dev
Conflicts:
erpnext/buying/doctype/quality_inspection/quality_inspection.py
|
2012-06-28 18:40:57 +05:30 |
|
Anand Doshi
|
cbf181c390
|
employee list -- show status
|
2012-06-28 18:38:38 +05:30 |
|
Anand Doshi
|
8ae5ba9abf
|
fixes related to --> clear locals and then sync locals when whole doclist is passed
|
2012-06-25 20:05:35 +05:30 |
|
Rushabh Mehta
|
4c56275d26
|
appframe is now heading
|
2012-06-14 11:05:09 +05:30 |
|
Nabin Hait
|
e4f2c7b213
|
series issue in attendance template
|
2012-06-04 11:48:50 +05:30 |
|
Nabin Hait
|
86375f089a
|
Merge branch 'shf_rename'
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-21 15:48:21 +05:30 |
|
Nabin Hait
|
fec3f783af
|
custom field included in docfield query
|
2012-05-21 14:40:25 +05:30 |
|
Anand Doshi
|
1aae261490
|
delete button in doclistview
|
2012-05-21 14:31:03 +05:30 |
|
Anand Doshi
|
00175612ac
|
Merge branch 'shf_rename'
Conflicts:
erpnext/stock/doctype/item/listview.js
|
2012-05-18 16:50:35 +05:30 |
|
Anand Doshi
|
d49da9bff1
|
new listviews
|
2012-05-18 16:49:36 +05:30 |
|
Anand Doshi
|
d643d367ca
|
Merge branch 'shf_rename'
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-05-18 11:52:31 +05:30 |
|
Nabin Hait
|
7638833b75
|
salary register issue fixed
|
2012-05-17 17:47:26 +05:30 |
|
Nabin Hait
|
76d69b1000
|
salary register issue fixed
|
2012-05-17 17:10:15 +05:30 |
|
Rushabh Mehta
|
deeae62b18
|
merge js/css
|
2012-05-14 15:03:17 +05:30 |
|
Rushabh Mehta
|
0eb790a0ae
|
cleaned up imports, doc
|
2012-05-11 15:53:37 +05:30 |
|
Nabin Hait
|
bd3d3ca1eb
|
error fixed in sending mail on submitting of sal slip
|
2012-05-11 13:36:17 +05:30 |
|
Nabin Hait
|
926f46f04a
|
Fixed conflict while merging with master
|
2012-05-01 11:51:08 +05:30 |
|
Nabin Hait
|
d58da50f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-01 11:37:45 +05:30 |
|
Nabin Hait
|
41cc32790f
|
Fixed issie in auto notification
|
2012-04-30 14:36:18 +05:30 |
|
Anand Doshi
|
f642168a26
|
hr home: changed Allocate Leaves --> Leave Allocation Tool
|
2012-04-18 18:35:30 +05:30 |
|
Anand Doshi
|
24e18569d9
|
fixes in install docs for roles
|
2012-04-17 11:45:35 +05:30 |
|
Anand Doshi
|
45a4edc9c9
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
css/all-app.css
version.num
|
2012-04-17 11:19:15 +05:30 |
|
Nabin Hait
|
eaf8b91402
|
hr reports cleanup
|
2012-04-16 12:31:36 +05:30 |
|
Nabin Hait
|
dbffc2d8d0
|
fixed hr issues
|
2012-04-16 12:22:47 +05:30 |
|
Rushabh Mehta
|
f1264a7f76
|
listing, module pages in appframe
|
2012-04-13 11:41:43 +05:30 |
|
Anand Doshi
|
09e8c4cd2d
|
further fixes
|
2012-04-12 17:51:53 +05:30 |
|
Anand Doshi
|
25bc68c7b2
|
fix in field names
|
2012-04-12 14:08:43 +05:30 |
|
Anand Doshi
|
2424387651
|
fixes after sync testing
|
2012-04-10 19:14:37 +05:30 |
|
Anand Doshi
|
7e0479bc4c
|
cleanup of search criteria
|
2012-04-05 18:27:56 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +05:30 |
|
Anand Doshi
|
5112b5b6b8
|
rerun of rename_dt
|
2012-04-02 19:12:29 +05:30 |
|
Anand Doshi
|
c88ae2be4d
|
rename dt second cut
|
2012-03-30 18:18:36 +05:30 |
|
Anand Doshi
|
fedfd89e4a
|
rename dt first cut
|
2012-03-30 12:29:06 +05:30 |
|
Anand Doshi
|
a30fbd004e
|
merge of sync handler and sync_file_db - first cut
|
2012-03-27 19:31:38 +05:30 |
|
Anand Doshi
|
5f9501d4d8
|
Merge branch 'sync_file_db' into shf_merge
Conflicts:
erpnext/projects/doctype/project/project.txt
|
2012-03-23 14:51:35 +05:30 |
|
Nabin Hait
|
0ad2ef2111
|
sync with respect to file
|
2012-03-21 15:02:39 +05:30 |
|
Nabin Hait
|
e8da15cb5b
|
sync ref file
|
2012-03-21 12:45:14 +05:30 |
|
Rushabh Mehta
|
15da133de9
|
removed
|
2012-03-06 18:41:11 +05:30 |
|
Anand Doshi
|
6b69b4f6a4
|
Merge branch 'master' into navupdate
|
2012-02-28 13:51:29 +05:30 |
|
Anand Doshi
|
fc60335620
|
fix in leave application query
|
2012-02-28 13:51:04 +05:30 |
|
Rushabh Mehta
|
3966f1dc5d
|
added license files
|
2012-02-23 12:35:32 +05:30 |
|
Rushabh Mehta
|
35fabf76a6
|
updated module pages
|
2012-02-21 19:03:50 +05:30 |
|
Rushabh Mehta
|
d025133b39
|
added module pages and other css updates
|
2012-02-21 17:26:50 +05:30 |
|
Anand Doshi
|
e00e70841c
|
Merge branch 'stable' into latest
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
|
2012-02-07 10:58:45 +05:30 |
|
Anand Doshi
|
d008964fd6
|
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
|
2012-02-07 10:48:11 +05:30 |
|
Rushabh Mehta
|
c5bf642c7d
|
version
|
2012-01-23 16:18:34 +05:30 |
|
Anand Doshi
|
5e57a39bb1
|
Merge branch 'master' into stable
|
2012-01-04 19:32:01 +05:30 |
|
Anand Doshi
|
f80f20f480
|
Changes in Notifications
|
2012-01-04 19:31:32 +05:30 |
|
Anand Doshi
|
6ac1d4bb44
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
|
2012-01-03 11:45:11 +05:30 |
|
Nabin Hait
|
a57732f71d
|
Removed custom field from doctype
|
2011-12-20 18:48:19 +05:30 |
|
Nabin Hait
|
c67e0d85d3
|
Employemnt Type filter removed from salary manager
|
2011-11-07 10:48:51 +05:30 |
|
Rushabh Mehta
|
ae00547592
|
appriasal copy fix
|
2011-11-04 10:43:11 +05:30 |
|
Rushabh Mehta
|
36fc1d06fb
|
appriasal copy fix
|
2011-11-04 10:41:12 +05:30 |
|
Anand Doshi
|
25190a903c
|
Report to get Employeewise Balance Leave
|
2011-10-31 16:47:48 +05:30 |
|
Nabin Hait
|
db3728955b
|
error fixed in leave calculation
|
2011-10-11 17:11:24 +05:30 |
|
Nabin Hait
|
685564f71d
|
Resolved conflict after merging with master
|
2011-10-11 14:42:34 +05:30 |
|
Nabin Hait
|
e8475f9b85
|
Appraisal score allowed to be fraction
|
2011-09-22 11:00:53 +05:30 |
|
Nabin Hait
|
d984872be9
|
checked sal struc docstatus in validation
|
2011-09-16 14:47:19 +05:30 |
|
Nabin Hait
|
73c4a4a154
|
removed make_feed() function
|
2011-09-16 11:24:54 +05:30 |
|
Rushabh Mehta
|
53ba83158c
|
fixes to startup
|
2011-09-15 15:06:23 +05:30 |
|
Rushabh Mehta
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|