Commit Graph

4324 Commits

Author SHA1 Message Date
Rushabh Mehta
b116b3243d report permission merge 2013-01-11 15:05:03 +05:30
Rushabh Mehta
f3bb70155b Merge branch 'master' into edge 2013-01-11 15:01:45 +05:30
Rushabh Mehta
5e7ec20588 datepicker fixes 2013-01-11 11:15:27 +05:30
Rushabh Mehta
1233c4a800 financial statements: show only companies where permission is given 2013-01-11 11:00:20 +05:30
Rushabh Mehta
4f5b89934b stock uom replace bugfix 2013-01-11 10:50:54 +05:30
Rushabh Mehta
b416166959 added 'report' permission 2013-01-10 17:14:09 +05:30
Rushabh Mehta
1d2710d54d added 'report' permission 2013-01-10 17:11:48 +05:30
Rushabh Mehta
9dbb761f19 latest_upates 2013-01-10 12:37:28 +05:30
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Rushabh Mehta
249b0b4942 Merge branch 'master' into edge 2013-01-10 11:12:35 +05:30
Rushabh Mehta
aecae587ce workflow updates: update_field not editable & bug fix 2013-01-09 19:03:20 +05:30
Rushabh Mehta
978d4e87c9 updated setup 2013-01-09 17:23:45 +05:30
Rushabh Mehta
be0b7df27e Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-01-09 16:41:01 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Anand Doshi
b00ecc72c7 fixed latest updates page 2013-01-09 15:18:18 +05:30
Nabin Hait
55963a4164 added field description in employee 2013-01-09 14:50:01 +05:30
Nabin Hait
f8c6531c3d set as default button in fiscal year 2013-01-09 14:44:24 +05:30
Nabin Hait
0f61b476a2 toggle display of contact info based on customer 2013-01-09 12:50:43 +05:30
Nabin Hait
dc8913e132 toggle display of contact info based on customer and conatct, address query based on customer 2013-01-09 12:35:24 +05:30
Anand Doshi
f8e248d051 Merge branch 'edge' of github.com:webnotes/erpnext into edge
Conflicts:
	patches/january_2013/holiday_list_patch.py
2013-01-08 19:38:23 +05:30
Anand Doshi
6f88c6680e patch to fix existing holiday lists 2013-01-08 19:36:33 +05:30
Anand Doshi
a2945e8e4b patch to fix existing holiday lists 2013-01-08 19:28:51 +05:30
Anand Doshi
89230cbc4b fix in holiday list 2013-01-08 18:14:39 +05:30
Anand Doshi
cfd185e5ac fix in leave application holiday calculation 2013-01-08 17:44:31 +05:30
Anand Doshi
c2e3f347ea fix in stock entry.py -- dictionary size should not change when looping 2013-01-08 17:07:00 +05:30
Anand Doshi
e9418f3be1 fix in syntax when using erpnext.queries.item 2013-01-08 17:00:02 +05:30
Anand Doshi
6411b930d7 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-08 15:42:40 +05:30
Nabin Hait
4fb4659a03 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-08 15:42:04 +05:30
Rushabh Mehta
996c30a575 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-01-07 17:43:52 +05:30
Rushabh Mehta
b8f39f00d8 appraisal template, total must be 100 2013-01-07 17:43:12 +05:30
Rushabh Mehta
143ea718c3 commified item_code query 2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Nabin Hait
ea09dbcfbb Merge branch 'master' of github.com:webnotes/erpnext 2013-01-07 15:00:08 +05:30
Nabin Hait
8bacc3443e added columns and moved serial no related reports to stock module 2013-01-07 14:59:07 +05:30
Anand Doshi
e80b9c6ee9 closing = opening + diff for stock balance report 2013-01-07 13:28:40 +05:30
Anand Doshi
276da2c7db Merge branch 'master' of github.com:webnotes/erpnext 2013-01-07 12:58:25 +05:30
Anand Doshi
1d55c72d8b added .py~ to gitignore 2013-01-07 12:54:10 +05:30
Rushabh Mehta
947a025bde added 'getdoc' in webnotes.utils.client 2013-01-07 10:32:57 +05:30
Rushabh Mehta
607a221f41 added support analytics and some other minor updates 2013-01-04 16:42:33 +05:30
Rushabh Mehta
363e177e0a Merge branch 'master' of github.com:webnotes/erpnext 2013-01-04 14:04:06 +05:30
Rushabh Mehta
cd7a02c489 added workflow help, fixed button primary action in form and refactored permissions 2013-01-04 14:03:36 +05:30
Anand Doshi
68d1023624 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-04 13:17:03 +05:30
Anand Doshi
62299260dc shifted UOM field to after qty field in purchase cycle 2013-01-04 13:16:34 +05:30
Nabin Hait
0b65700ef8 serial No Status report 2013-01-04 12:06:54 +05:30
Nabin Hait
92641dc398 serial no service contract expiry 2013-01-03 18:23:22 +05:30
Nabin Hait
8158321141 serial no warranty expiry report 2013-01-03 18:22:51 +05:30
Anand Doshi
a40a381d08 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-01-02 16:47:00 +05:30
Anand Doshi
e142d9cbbe in feed show records of doctypes for which user has read permission at level 0 2013-01-02 16:46:35 +05:30
Rushabh Mehta
7590650a73 patch_list merge 2013-01-02 16:46:01 +05:30
Rushabh Mehta
3a509befdb Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-01-02 16:43:18 +05:30