Nabin Hait
|
ca8ad210d2
|
Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n
|
2013-10-24 11:40:32 +05:30 |
|
Rushabh Mehta
|
70d7c481e9
|
[naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854
|
2013-10-18 17:27:45 +05:30 |
|
Bárbara Perretti
|
4b41e5f7f7
|
Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n
Conflicts:
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
public/js/complete_setup.js
selling/doctype/opportunity/opportunity.js
selling/doctype/quotation/quotation.js
|
2013-10-16 15:09:18 -03:00 |
|
Bárbara Perretti
|
17a37bd329
|
Fix translate hr/doctype/job_applicant/job_applicant.js
|
2013-10-15 16:50:53 -03:00 |
|
Bárbara Perretti
|
eb65e210fd
|
Fix translate hr/doctype/upload_attendance/upload_attendance.js
|
2013-10-15 16:31:58 -03:00 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
Rushabh Mehta
|
915eda9c4a
|
[minor] Added allow_rename in Employee webnotes/erpnetx#962
|
2013-10-11 10:57:13 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Rushabh Mehta
|
ddca90ef7b
|
[communication] [setup wizard] [minor] [fixes]
|
2013-10-09 16:08:54 +05:30 |
|
Bárbara Perretti
|
a82d51b566
|
Fix translate monthly_salary_register.js
|
2013-10-07 16:39:41 -03:00 |
|
Bárbara Perretti
|
3b956d98b8
|
Fix translate monthly_attendance_sheet.js
|
2013-10-07 16:38:35 -03:00 |
|
Bárbara Perretti
|
54e8fbc070
|
Fix translate employee_leave_balance.js
|
2013-10-07 16:37:21 -03:00 |
|
Bárbara Perretti
|
d851a04261
|
Fix translate employee_birthday.js
|
2013-10-07 16:36:29 -03:00 |
|
Bárbara Perretti
|
6287e8e906
|
Fix translate upload_attendance.js
|
2013-10-07 16:34:30 -03:00 |
|
Bárbara Perretti
|
5fa2fca9bd
|
fix translate salary_structure.js
|
2013-10-07 16:31:36 -03:00 |
|
Bárbara Perretti
|
e9548a55e9
|
Fix translate salary_manager.js
|
2013-10-07 16:27:46 -03:00 |
|
Bárbara Perretti
|
2521910d56
|
Fix translate leave_control_panel.js
|
2013-10-07 16:24:17 -03:00 |
|
Bárbara Perretti
|
f70e3aabcb
|
Fix translate hr/doctype/leave_application/leave_application.js
|
2013-10-07 16:22:21 -03:00 |
|
Bárbara Perretti
|
28181d3384
|
Fix translate expense_claim.js
|
2013-10-07 15:39:20 -03:00 |
|
Bárbara Perretti
|
63439ef7c7
|
fix translate hr/doctype/employee/employee.js
|
2013-10-07 15:33:56 -03:00 |
|
Bárbara Perretti
|
c5f2113325
|
Fix translate appraisal.js
|
2013-10-07 15:13:29 -03:00 |
|
Rushabh Mehta
|
800b3aa437
|
[crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order
|
2013-10-03 17:26:33 +05:30 |
|
Anand Doshi
|
fa228e9c9b
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
accounts/doctype/sales_invoice/sales_invoice.txt
selling/doctype/lead/lead.txt
selling/doctype/opportunity/opportunity.txt
stock/doctype/warehouse/warehouse.py
|
2013-10-02 16:52:52 +05:30 |
|
Rushabh Mehta
|
ea9f845814
|
feature to set / unset birthday reminders webnotes/erpnext#851
|
2013-10-02 16:02:02 +05:30 |
|
Rushabh Mehta
|
8c2e4e1e1f
|
[wsgi] [minor] fixed webnotes.local.form_dict
|
2013-10-02 14:34:25 +05:30 |
|
Nabin Hait
|
250059097c
|
[fix] [minor] set employee name blank while creating new employee
|
2013-09-26 18:36:35 +05:30 |
|
Nabin Hait
|
9f28996165
|
[fix] [minor] retain leave approver after setting options
|
2013-09-26 12:18:40 +05:30 |
|
Nabin Hait
|
38567e02e1
|
[fix] [minor] toggle fields based on permission in expense claim
|
2013-09-26 12:09:17 +05:30 |
|
Anand Doshi
|
5b004ff8a7
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/account/account.py
accounts/doctype/gl_entry/gl_entry.py
accounts/doctype/period_closing_voucher/period_closing_voucher.py
stock/doctype/delivery_note/delivery_note.py
stock/doctype/landed_cost_wizard/landed_cost_wizard.py
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/stock_ledger/stock_ledger.py
stock/doctype/warehouse/warehouse.py
stock/stock_ledger.py
|
2013-09-25 19:55:41 +05:30 |
|
Anand Doshi
|
2ad07e1cc1
|
[minor] [fix] approval status of expense claim to be editable only after first save
|
2013-09-25 11:42:46 +05:30 |
|
Pratik Vyas
|
7782e83d33
|
refactor upload attendance for doclist global
|
2013-09-18 18:52:10 +05:30 |
|
Pratik Vyas
|
5e16a69b35
|
mass replace sql with webnotes.conn.sql
|
2013-09-18 12:20:53 +05:30 |
|
Pratik Vyas
|
e55fbfc090
|
remove sql =
|
2013-09-18 11:10:59 +05:30 |
|
Anand Doshi
|
e0038e95db
|
[fix] [minor] get_url and fixes due to addition of create permission check
|
2013-09-17 16:51:41 +05:30 |
|
Anand Doshi
|
3a6f4f882a
|
[fix] [minor] communication related cleanup
|
2013-09-12 19:10:05 +05:30 |
|
Anand Doshi
|
9686b937bb
|
[fix] [minor] print hide communication table
|
2013-09-10 10:54:34 +05:30 |
|
Anand Doshi
|
7b044da0e3
|
[fix] [minor] on_communication, when checking if system user, extract email id and then check
|
2013-09-04 18:14:20 +05:30 |
|
Anand Doshi
|
53ecddd612
|
[fix] [communication] on communication send, update status
|
2013-09-04 17:52:27 +05:30 |
|
Anand Doshi
|
d01f0cb46e
|
[fix] [communication] on communication send, update status
|
2013-09-04 17:38:29 +05:30 |
|
Nabin Hait
|
dd71a02ec7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-03 23:20:20 +05:30 |
|
Nabin Hait
|
3b152ba6c7
|
[fix] [minor] make bank voucher from expense claim and serial no status
|
2013-09-03 23:19:08 +05:30 |
|
Anand Doshi
|
36b63a44b9
|
[fix] [minor] profile query
|
2013-09-03 15:33:56 +05:30 |
|
Rushabh Mehta
|
a2d0da8840
|
[communication] [minor]
|
2013-09-02 18:27:29 +05:30 |
|
Rushabh Mehta
|
96690ebd0f
|
[communication] [minor] cleaed model
|
2013-09-02 17:04:27 +05:30 |
|
Anand Doshi
|
2e31e097fa
|
[fix] [minor] _round function - implement round halfs to nearest even number
|
2013-08-19 19:58:23 +05:30 |
|
Anand Doshi
|
0b6fa018d6
|
[fix] [minor] create birthday event only for active employees, else delete it
|
2013-08-14 10:54:16 +05:30 |
|
Anand Doshi
|
05a340e764
|
[fix] [minor] fixes after merging akhilesh's changes
|
2013-08-12 20:01:55 +05:30 |
|
Anand Doshi
|
9e59aff54e
|
Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master
Conflicts:
accounts/doctype/pos_setting/pos_setting.txt
patches/patch_list.py
|
2013-08-12 20:00:33 +05:30 |
|
Nabin Hait
|
37fe72e4e9
|
[fix] [minor] Do not validate leave balance if status is Rejected
|
2013-08-12 15:29:50 +05:30 |
|
Akhilesh Darjee
|
de7d944f5e
|
[issue] webnotes/erpnext#647 - recurring event for employee birthdays
|
2013-08-09 12:28:50 +05:30 |
|