Commit Graph

5739 Commits

Author SHA1 Message Date
Anand Doshi
890265928b [backup manager] [error handling] on error, send complete traceback as email 2013-04-23 12:30:38 +05:30
Anand Doshi
6f83e77010 [leave application] [employee query] fixes 2013-04-23 12:24:31 +05:30
Nabin Hait
81c6a3beef stock uom mandatory for item 2013-04-23 11:39:54 +05:30
Anand Doshi
f2785c9e61 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-22 18:59:48 +05:30
Anand Doshi
a7b8f35539 [leave application] [employee query] allow employee lookup for which the current user is leave approver or thhe employee has no leave approvers mentioned or the user is the employee 2013-04-22 18:59:04 +05:30
Nabin Hait
b59a15e65f Merge branch 'master' of github.com:webnotes/erpnext 2013-04-22 15:16:04 +05:30
Nabin Hait
d16cae113a [salary structure] added a validation 2013-04-22 15:15:47 +05:30
Nabin Hait
a305406267 [salary structure] added a validation 2013-04-22 14:30:30 +05:30
Anand Doshi
b41bb5de2a Merge branch 'master' of github.com:webnotes/erpnext 2013-04-22 14:25:47 +05:30
Anand Doshi
978dc8b74d [patches] [fix] fix in update_account_property_patch 2013-04-22 14:25:06 +05:30
Nabin Hait
2f829ecbdf field label changed in salary structure 2013-04-22 14:10:36 +05:30
Rushabh Mehta
e2fe4cd317 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-04-22 14:04:07 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +05:30
Anand Doshi
6b66811aec Merge branch 'master' into edge 2013-04-22 13:59:59 +05:30
Nabin Hait
79269e9382 fixed conflict 2013-04-22 13:17:24 +05:30
Nabin Hait
e7366f763b [report] accounts receivable migrated into new style 2013-04-22 13:14:52 +05:30
Anand Doshi
faab3c4cf2 [listview] [label] show appropriate tooltip for bar graph 2013-04-22 12:20:09 +05:30
Nabin Hait
f19822b041 fixes in sales/purchase invoice list view 2013-04-22 12:01:01 +05:30
Anand Doshi
84af2329c2 Merge branch 'master' into edge 2013-04-22 11:39:00 +05:30
Anand Doshi
c54bbc039f [patch] [fix] reload Delivery Note Item before default cost center patch 2013-04-19 16:41:57 +05:30
Anand Doshi
90dad5c5b5 Merge branch 'master' into edge 2013-04-19 11:43:16 +05:30
Nabin Hait
bbd8dddd56 allowed rename for mode of payment 2013-04-19 11:01:03 +05:30
Anand Doshi
9beae1e5c7 [attributions] [updates] added GeoLite attribution 2013-04-18 19:41:28 +05:30
Anand Doshi
4d705590b7 [patch] [default cost center] defaults starting with colon like :Company should not be a part of database default spec 2013-04-18 16:21:42 +05:30
Anand Doshi
8f92607dc4 [gl entry] [validation] validate if cost center belongs to given company 2013-04-18 16:21:01 +05:30
Anand Doshi
a1924eda90 [employee] [fix] removed erroneous break statement 2013-04-17 18:40:40 +05:30
Anand Doshi
90c9ae713c Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	stock/doctype/delivery_note_item/delivery_note_item.txt
2013-04-17 18:04:08 +05:30
Anand Doshi
5717fe3aba [cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation 2013-04-17 18:02:52 +05:30
Nabin Hait
47ef15b04b removed errprint 2013-04-17 17:35:14 +05:30
Nabin Hait
bd7c8d89f2 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-17 17:22:23 +05:30
Nabin Hait
9a2dff6675 packing slip refactored 2013-04-17 17:21:31 +05:30
Anand Doshi
311a243bdc Merge branch 'master' into edge
Conflicts:
	website/doctype/website_settings/website_settings.txt
2013-04-17 15:50:20 +05:30
Anand Doshi
58b8d6fdf3 [website settings] [cleanup] removed mandatory check on Home Page 2013-04-17 15:22:06 +05:30
Anand Doshi
2b349d38d9 Merge branch 'master' into edge 2013-04-17 15:10:47 +05:30
Anand Doshi
d484b380ad [email digest] [sender] sender should be the automail id specified in Email Settings 2013-04-17 15:10:08 +05:30
Anand Doshi
96dae29144 [item] [fixes] don't validate for active boms for new items 2013-04-17 13:39:55 +05:30
Anand Doshi
e776742f5d [company] [cleanup] on_rename method 2013-04-17 13:19:35 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
2013-04-16 21:32:06 +05:30
Anand Doshi
aa7a386db9 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-16 20:58:41 +05:30
Anand Doshi
09480e2241 [sitemap] [fixes] 2013-04-16 20:57:09 +05:30
Nabin Hait
8f148249ac reload doctype mapper patch 2013-04-16 12:36:59 +05:30
Nabin Hait
1ef27296f4 fixes in packing slip 2013-04-16 12:29:27 +05:30
Nabin Hait
69b410a2ed fixes in sales personwise transaction summary report 2013-04-15 12:34:42 +05:30
Rushabh Mehta
edfeade5a6 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-04-15 10:54:29 +05:30
Rushabh Mehta
5ed6676193 [editor] [stylefix] 2013-04-15 10:49:17 +05:30
Anand Doshi
3b2fd6e334 [sql] [fix] fixed item.py injections 2013-04-13 15:54:38 +05:30
Anand Doshi
0c85975839 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-12 22:01:01 +05:30
Anand Doshi
13760a1d74 [employee leave approvers] updated latest_updates.js 2013-04-12 21:59:22 +05:30
Anand Doshi
60666a278f [Leave Application] [fixes] Validate Leave Approver based on a list specified in Employee 2013-04-12 20:19:53 +05:30
Anand Doshi
b094ae7f23 [general ledger] [fix] renamed function 2013-04-12 20:19:10 +05:30