Commit Graph

5017 Commits

Author SHA1 Message Date
Rushabh Mehta
1dd330177d added writers page 2013-03-08 11:00:18 +05:30
Rushabh Mehta
a2deb68776 added blog category and other updates to website module 2013-03-08 10:44:25 +05:30
Rushabh Mehta
e73b5e23b9 added patch to update custom css 2013-03-07 18:54:37 +05:30
Rushabh Mehta
6a0ced9519 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 18:51:43 +05:30
Rushabh Mehta
676a568f5a added blogger, updated style and blogs 2013-03-07 18:51:10 +05:30
Nabin Hait
0e6ce9af17 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 18:50:23 +05:30
Nabin Hait
4f12923903 fixes in sales team percentage validation 2013-03-07 18:49:50 +05:30
Anand Doshi
f1e274c8b4 when cancelling stock ledger entry, change modified and modified by 2013-03-07 16:34:59 +05:30
Anand Doshi
b96fef9802 remove cancelled entries from grid report when fetching data based on modified 2013-03-07 15:35:36 +05:30
Rushabh Mehta
18c11214fa Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 14:48:22 +05:30
Rushabh Mehta
9f3c727753 website navbar color change 2013-03-07 14:47:41 +05:30
Anand Doshi
77a6ddaf03 reload report doctype 2013-03-07 13:49:34 +05:30
Rushabh Mehta
481d0deaca fix in schedule handler 2013-03-07 12:48:47 +05:30
Rushabh Mehta
b6eed77526 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 12:26:15 +05:30
Rushabh Mehta
202508410c completed dropbox backup in backup manager 2013-03-07 12:25:21 +05:30
Anand Doshi
b7af3d033e changed field contact_no to phone in lead details of transaction base 2013-03-07 12:17:52 +05:30
Nabin Hait
ad7266e48d Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 11:42:47 +05:30
Nabin Hait
58b2a101ae aii: testcases for sales invoice gl entries 2013-03-07 11:42:14 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Nabin Hait
0c67f99961 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-06 18:51:18 +05:30
Nabin Hait
a72c5127a6 aii: gl entries for delivery note 2013-03-06 18:50:53 +05:30
Anand Doshi
4244b3b267 fix in monthly salary register 2013-03-06 16:49:13 +05:30
Nabin Hait
e1f99586fd fixes in price list for purchase 2013-03-06 14:24:03 +05:30
Nabin Hait
6b58a042c8 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-06 14:08:01 +05:30
Rushabh Mehta
6985539c4d brought back master.sql.gz 2013-03-06 13:28:15 +05:30
Nabin Hait
87b9cd5ba1 use get_global_default instead of control panel 2013-03-06 13:15:08 +05:30
Rushabh Mehta
ce1fde4071 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-06 12:07:03 +05:30
Rushabh Mehta
685be2fbea added validation for save conflict in single types too 2013-03-06 12:06:34 +05:30
Nabin Hait
7804401d03 attendance code cleanup 2013-03-06 11:32:33 +05:30
Nabin Hait
5cf1ef33d6 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-06 11:32:17 +05:30
Rushabh Mehta
c9e32e6c8d fixed patches for new sync 2013-03-06 11:30:09 +05:30
Rushabh Mehta
0d7c162d2e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-06 11:21:29 +05:30
Rushabh Mehta
8ff938a377 backup manager (wip) 2013-03-06 11:20:56 +05:30
Nabin Hait
acd52a021b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 18:23:50 +05:30
Nabin Hait
46043f2d94 messages updated in voucher import tool 2013-03-05 18:23:34 +05:30
Anand Doshi
b343a4895c fix in empty col check in voucher import tool 2013-03-05 17:24:15 +05:30
Anand Doshi
ffd190ff3c fix in patch list 2013-03-05 17:10:33 +05:30
Nabin Hait
a0accd9f67 fixed conflict 2013-03-05 15:58:04 +05:30
Nabin Hait
dae20d87dc refactored upload attendace tool 2013-03-05 15:52:07 +05:30
Rushabh Mehta
c4529ebb0d Merge pull request #300 from mayur-patel/master
Allow user to add leave application which may results in negative balance.
2013-03-05 01:27:26 -08:00
Anand Doshi
bec17f078c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 14:44:28 +05:30
mayur-patel
c7e28c7e5d changed the logic to be more elegant. 2013-03-05 20:14:05 +11:00
Anand Doshi
18c1980e38 voucher import tool - throw message if empty columns are found 2013-03-05 14:44:05 +05:30
Rushabh Mehta
ba7ed4c27c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 14:20:24 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Rushabh Mehta
5640a69e78 updated sync 2013-03-05 14:12:34 +05:30
mayur-patel
547604cf5a Added a new field called allow_negative. This field was added for allowing a negative balance for a particular leave type. 2013-03-05 19:11:53 +11:00
Anand Doshi
94f44b4073 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 13:40:07 +05:30
Anand Doshi
9e69dc5ad8 fix in material request test case 2013-03-05 13:39:28 +05:30
mayur-patel
f10f2513fa Added checks to see if the selected leave type allows negative balance. If it does then warn the user and continue with saving the form else just warn the user and don't save the form data. 2013-03-05 18:20:57 +11:00