Commit Graph

385 Commits

Author SHA1 Message Date
Nabin Hait
291e8c2545 removed landed cost master 2013-01-23 16:06:44 +05:30
Nabin Hait
a8454e2764 removed unwanted permission 2013-01-23 16:01:35 +05:30
Anand Doshi
468bb31d88 fixes in clear web cache patch 2013-01-22 12:48:22 +05:30
Anand Doshi
683cdc0db8 sync before running clear web cache patch 2013-01-22 12:43:49 +05:30
Nabin Hait
f0881a9e92 updated fraction for USD 2013-01-22 11:21:55 +05:30
Rushabh Mehta
6dd9d4583d updated payment receipt voucher format 2013-01-21 18:44:43 +05:30
Rushabh Mehta
1a6220a332 Merge branch 'master' into edge 2013-01-21 10:33:22 +05:30
Rushabh Mehta
d9cfee58a1 added patch 2013-01-21 10:32:49 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +05:30
Rushabh Mehta
f5b04cff8b added number format, sent country info in boot, link options not extracted from cache 2013-01-21 10:14:10 +05:30
Rushabh Mehta
3ab6c5fca9 appraisal, don't validate points for self-appraisal 2013-01-19 10:54:03 +05:30
Anand Doshi
8b940ee451 fixes after merge 2013-01-18 13:07:02 +05:30
Anand Doshi
2865571cb9 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	patches/patch_list.py
2013-01-18 12:32:00 +05:30
Nabin Hait
a642ae14eb updated gl mapper for tds entry 2013-01-18 10:49:39 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	accounts/doctype/gl_control/gl_control.py
2013-01-17 20:31:41 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Rushabh Mehta
f0b7972102 consolidated permission checking and added patch 2013-01-14 17:02:13 +05:30
Rushabh Mehta
3c5161113e merge 2013-01-14 16:11:03 +05:30
Rushabh Mehta
be9ef4ac89 added code to update timestamps in Task, Customer Issue and Support Ticket 2013-01-14 15:48:00 +05:30
Anand Doshi
39a3c03b62 if not a valid csv file, ignore it in stock reconciliation patch 2013-01-14 15:26:51 +05:30
Anand Doshi
b1cf2119e9 fixes in reconciliation patch 2013-01-14 15:12:44 +05:30
Anand Doshi
1649c60b0b fix in reconciliation patch 2013-01-14 14:58:55 +05:30
Anand Doshi
34ad33bfcb fix in reconciliation patch 2013-01-14 14:57:16 +05:30
Anand Doshi
6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
2013-01-14 13:28:31 +05:30
Anand Doshi
279e08e523 Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco 2013-01-14 11:17:54 +05:30
Anand Doshi
2ab31ab2d3 updated stock reconciliation patch 2013-01-14 11:17:34 +05:30
Rushabh Mehta
7d033d09dc set default report permission based on read 2013-01-13 14:34:38 +05:30
Nabin Hait
ac53b11969 stock reco fixes with testcases 2013-01-11 19:25:46 +05:30
Rushabh Mehta
b116b3243d report permission merge 2013-01-11 15:05:03 +05:30
Anand Doshi
1b531866e0 fixes in stock reco, test case for serial no stock entry 2013-01-10 19:29:51 +05:30
Rushabh Mehta
1d2710d54d added 'report' permission 2013-01-10 17:11:48 +05:30
Nabin Hait
3e28f8f54b Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco 2013-01-09 15:23:43 +05:30
Nabin Hait
26d46556a4 first cut error fixes 2013-01-09 15:23:05 +05:30
Anand Doshi
435fd1426b Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-09 11:25:34 +05:30
Anand Doshi
6f88c6680e patch to fix existing holiday lists 2013-01-08 19:36:33 +05:30
Nabin Hait
902e8609e5 stock reco and utility function of stocks 2013-01-08 18:29:24 +05:30
Nabin Hait
9d0f636c46 stock reconciliation - rewrite in progress 2013-01-07 18:51:11 +05:30
Nabin Hait
0b65700ef8 serial No Status report 2013-01-04 12:06:54 +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
Rushabh Mehta
9b1ddfd9ef merge 2013-01-02 15:32:29 +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
Rushabh Mehta
78a0c20305 new permission manager 2013-01-01 19:51:35 +05:30
Rushabh Mehta
b4c54e55a3 update print width 2012-12-28 10:35:44 +05:30
Anand Doshi
d9f44e2955 reload product settings in address title patch 2012-12-27 19:11:04 +05:30