Commit Graph

4575 Commits

Author SHA1 Message Date
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
Rushabh Mehta
74d3363a7e new permission manager 2013-01-01 19:56:51 +05:30
Rushabh Mehta
024c60741a Merge branch 'master' of github.com:webnotes/erpnext 2013-01-01 19:53:35 +05:30
Nabin Hait
2f1d1a05b8 general ledger report group by ledgers 2013-01-01 19:52:52 +05:30
Rushabh Mehta
7d19e5c4dd new permission manager 2013-01-01 19:52:36 +05:30
Rushabh Mehta
78a0c20305 new permission manager 2013-01-01 19:51:35 +05:30
Anand Doshi
6f6fadd360 group gl entries by ledger 2013-01-01 18:32:49 +05:30
Nabin Hait
3882db03e2 Trial Balance : with/without closing entry 2013-01-01 13:48:40 +05:30
Nabin Hait
d68fa3b953 fixes in website utils 2013-01-01 12:05:13 +05:30
Rushabh Mehta
5f183982cd update webpage name to be much longer, remove .html from links and refactor newsletter layout 2013-01-01 10:55:58 +05:30
Nabin Hait
6072a682bc added description in stock level and balance report 2012-12-31 17:16:23 +05:30
Nabin Hait
056bdabc6b Merge branch 'master' of github.com:webnotes/erpnext 2012-12-31 16:28:49 +05:30
Nabin Hait
1c08aeee5b show cancelled items in grid reports 2012-12-31 13:30:18 +05:30
Rushabh Mehta
0727169a5e expense_claim: approval status fix 2012-12-31 13:24:24 +05:30
Rushabh Mehta
a9ff53c5a4 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-31 13:02:14 +05:30
Anand Doshi
025d741ecf fix in stock balance report 2012-12-31 12:43:36 +05:30
Anand Doshi
a6405da823 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-31 12:05:38 +05:30
Anand Doshi
e9c6ecc0d8 fix in permission engine: allow restrictions based on custom field 2012-12-31 12:04:36 +05:30
Rushabh Mehta
8bf41ea461 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-31 10:52:10 +05:30
Rushabh Mehta
e2c7e583f5 updated usability of payment_to_invoice_matching tool and fixed hide_toolbar 2012-12-31 10:51:31 +05:30
Anand Doshi
a5e4fec00d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-30 19:59:01 +05:30
Anand Doshi
65cef74168 before delete page cache, check if page name exists 2012-12-30 19:58:24 +05:30
Nabin Hait
833d7a65d5 small fixes in product caching 2012-12-30 19:56:57 +05:30
Anand Doshi
751af41a94 temporarily removed status validation for serial no 2012-12-30 16:43:04 +05:30
Anand Doshi
f9a3c8fcdc added status validation 2012-12-28 19:42:49 +05:30
Nabin Hait
b72d8204e8 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-28 16:52:22 +05:30
Nabin Hait
e606e7850a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-28 16:51:55 +05:30
Nabin Hait
0abca07917 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-28 16:46:48 +05:30
Nabin Hait
6850b4c572 added footnote to stock level report explaining the various columns 2012-12-28 16:44:52 +05:30
Rushabh Mehta
e30057b97b Merge branch 'master' of github.com:webnotes/erpnext 2012-12-28 16:10:18 +05:30
Rushabh Mehta
f033a1e151 integrated workflow, disable Submit, Cancel if workflow is defined 2012-12-28 16:09:38 +05:30