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 |
|
Rushabh Mehta
|
75c3171c04
|
[rename] Naming Series is now Document Numbering Series and updated translations
|
2013-08-08 16:00:40 +05:30 |
|
Nabin Hait
|
5230318445
|
[minor] [fix] make bank voucher form expense claim
|
2013-08-08 11:28:37 +05:30 |
|
Rushabh Mehta
|
4d0f37e97c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-06 17:54:11 +05:30 |
|
Rushabh Mehta
|
0b50b48104
|
[salary structure] Cleanup, Fixed Monthly Register Report and other minor changes
|
2013-08-06 17:53:41 +05:30 |
|
Anand Doshi
|
d5b06f78a5
|
[fix] leave approver selection
|
2013-08-06 15:21:43 +05:30 |
|
Rushabh Mehta
|
9a921f479b
|
[employee] [fix] Employee naming fix
|
2013-08-06 12:53:09 +05:30 |
|
Anand Doshi
|
cc186da938
|
[fix] [minor] [test cases]
|
2013-08-05 18:43:01 +05:30 |
|
Anand Doshi
|
af4888f11a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-05 18:08:59 +05:30 |
|
Anand Doshi
|
15253cb36a
|
[fix] [minor] in_list_view for employee leave approver
|
2013-08-05 18:08:04 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Anand Doshi
|
e79d57ca19
|
[salary slip] total no. of working days calculation [issue] webnotes/erpnext#285
|
2013-08-02 19:31:41 +05:30 |
|
Anand Doshi
|
a648f46d4e
|
[fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228
|
2013-07-30 14:43:29 +05:30 |
|
Anand Doshi
|
1fac2a98cf
|
[fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions
|
2013-07-29 19:30:39 +05:30 |
|
Anand Doshi
|
985af32553
|
[cleanup] [minor] removed trash reason from grade
|
2013-07-26 16:08:11 +05:30 |
|
Anand Doshi
|
5491332772
|
[fix] [minor] use wn.defaults.get_default instead of sys_defaults
|
2013-07-26 13:02:18 +05:30 |
|
Nabin Hait
|
af679d2ff7
|
[feature] Make bank voucher option in Expense Claim
|
2013-07-25 17:48:00 +05:30 |
|
Rushabh Mehta
|
dd05d5eca0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-25 16:05:22 +05:30 |
|
Rushabh Mehta
|
1875fd177a
|
[minor] [fix] missing icons in reports #589
|
2013-07-25 16:05:02 +05:30 |
|
Anand Doshi
|
85fa3d2bb9
|
[fix] [minor] upload callback arguments changed
|
2013-07-25 16:02:15 +05:30 |
|
Rushabh Mehta
|
c9bcfd1070
|
[cleanup] [minor] removed 'System Manager' permission for new setups
|
2013-07-22 15:33:10 +05:30 |
|
Nabin Hait
|
a9ec49e0bf
|
[fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice
|
2013-07-15 16:33:24 +05:30 |
|