Commit Graph

4555 Commits

Author SHA1 Message Date
Nabin Hait
902e8609e5 stock reco and utility function of stocks 2013-01-08 18:29:24 +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
Nabin Hait
418d580a8b fifo part of stock reconciliation 2013-01-07 19:35:20 +05:30
Nabin Hait
9d0f636c46 stock reconciliation - rewrite in progress 2013-01-07 18:51:11 +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
Rushabh Mehta
1a76f67116 fixes to valid elements 2013-01-02 16:36:30 +05:30
Anand Doshi
55bf3a3357 Merge branch 'master' into edge 2013-01-02 16:24:41 +05:30
Anand Doshi
5ee3ec18f6 deprecated stock search criteria patches 2013-01-02 16:08:27 +05:30
Anand Doshi
e8d91ad7ce Merge branch 'master' of github.com:webnotes/erpnext 2013-01-02 16:01:42 +05:30
Anand Doshi
cec918f9ce fix in stock level report 2013-01-02 16:00:25 +05:30
Rushabh Mehta
aea7370a67 updated latest_updates.js 2013-01-02 15:35:19 +05:30
Rushabh Mehta
9b1ddfd9ef merge 2013-01-02 15:32:29 +05:30
Rushabh Mehta
d4872483e4 fixes to permission manager / user property setter 2013-01-02 15:29:37 +05:30
Nabin Hait
e8b7ac1469 opening and closing balance fix in general ledger 2013-01-02 15:11:29 +05:30
Anand Doshi
93a02a3995 Merge branch 'master' into edge 2013-01-02 14:47:37 +05:30
Anand Doshi
554c2d8b4a fix in newsletter 2013-01-02 14:47:06 +05:30
Anand Doshi
5eaff20dd1 added comma in latest updates 2013-01-02 14:19:52 +05:30
Anand Doshi
22c9497833 Merge branch 'edge' of github.com:webnotes/erpnext into edge
Conflicts:
	patches/patch_list.py
2013-01-02 14:02:36 +05:30
Anand Doshi
946442d7a5 added new item-wise pricelist report and deprecated search criteria of Stock module 2013-01-02 13:51:29 +05:30
Anand Doshi
8ab7580d88 newsletter: allow sending only if write permission 2013-01-02 13:48:40 +05:30
Anand Doshi
325caf33f7 added Send From field in newsletter 2013-01-02 13:42:21 +05:30
Nabin Hait
488d0ab6cd removed rename master link from setup 2013-01-02 11:37:30 +05:30
Nabin Hait
d52e702c84 updated latest updates page 2013-01-02 11:20:32 +05:30
Rushabh Mehta
3ee4f9a90e Merge branch 'master' of github.com:webnotes/erpnext 2013-01-01 19:59:16 +05:30