Commit Graph

7259 Commits

Author SHA1 Message Date
Nabin Hait
220ea94125 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 14:41:25 +05:30
Nabin Hait
eaaa5b1127 [fix] [minor] call dirty when synced with local doclist 2013-08-14 14:41:08 +05:30
Anand Doshi
379acbbd77 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 14:23:07 +05:30
Anand Doshi
9618cb8ef1 [fix] [minor] downsample data to 1000 points before plotting using flot.downsample plugin 2013-08-14 14:22:47 +05:30
Priya
c2f2103e4c [docs] 2013-08-14 13:59:02 +05:30
Priya
88d409cc83 [docs] 2013-08-14 13:46:18 +05:30
Nabin Hait
29c8327a2f [fix] [minor] Analytics role added in Financial Statements report 2013-08-14 12:48:41 +05:30
Nabin Hait
f3a9b31b1f Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 11:22:56 +05:30
Nabin Hait
de336dee9c [fix] [minor] map use_multi_level_bom from production order to stoc entry 2013-08-14 11:22:35 +05:30
Anand Doshi
0b6fa018d6 [fix] [minor] create birthday event only for active employees, else delete it 2013-08-14 10:54:16 +05:30
Rushabh Mehta
ffe64db8f7 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 10:41:19 +05:30
Priya
e896b45314 [docs] 2013-08-13 15:47:26 +05:30
Rushabh Mehta
6ca903f62a [minor] [demo] added commits 2013-08-13 14:31:15 +05:30
Priya
6528f679b6 [docs] 2013-08-13 14:26:41 +05:30
Priya
083ba78db4 [docs] 2013-08-13 14:24:41 +05:30
Anand Doshi
dd2ec17962 [fix] [minor] pull credit days from customer, update credit days in account of customer 2013-08-13 13:57:53 +05:30
Priya
a06ad6519a [docs][fix] merge conflict 2013-08-13 13:09:02 +05:30
Anand Doshi
47e14a9de4 [fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings 2013-08-13 13:01:12 +05:30
Priya
963f8b7a13 [docs][minor] material request 2013-08-13 12:56:10 +05:30
Anand Doshi
c4dde9bd99 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 20:13:02 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
2013-08-12 20:00:33 +05:30
Nabin Hait
358907d8a6 [fix] [minor] sales invoice: unhide fields if not hidden in database 2013-08-12 19:06:32 +05:30
Nabin Hait
8441a63121 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 17:39:51 +05:30
Nabin Hait
f638336886 [fix] [minor] description for period-closing-account field 2013-08-12 17:39:33 +05:30
Anand Doshi
3eb8c38efb Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 17:33:23 +05:30
Anand Doshi
5476318030 [fix] [minor] round off currency values in grid reports 2013-08-12 17:32:47 +05:30
Nabin Hait
bf5d44c804 [fix] [minor] reorder level bug through scheduler 2013-08-12 16:30:48 +05:30
Nabin Hait
37fe72e4e9 [fix] [minor] Do not validate leave balance if status is Rejected 2013-08-12 15:29:50 +05:30
Nabin Hait
9fa830805e Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 15:15:34 +05:30
Nabin Hait
d1055ce1bc [fix] [minor] Target variance report if distribution id is not specified 2013-08-12 15:15:19 +05:30
Rushabh Mehta
3e6c423c0b Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 14:18:47 +05:30
Rushabh Mehta
4c17f9420e [manufacturing] Added New Reports 2013-08-12 14:18:09 +05:30
Anand Doshi
f066f7166b [minor] [fix] [patch] rename price list 2013-08-12 12:29:36 +05:30
Nabin Hait
4af2dbf84d [perpetual accounting] [minor] patch for intial setup 2013-08-12 12:24:08 +05:30
Anand Doshi
e42a0222d5 [minor] [fix] precision for float fields on server-side 2013-08-12 11:58:02 +05:30
Anand Doshi
cf2cf3897b [minor] [install] added instruction to set domain for url generation within erpnext 2013-08-09 19:39:09 +05:30
Rushabh Mehta
813b1cba65 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 18:12:15 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Anand Doshi
43b38dfd71 [cleanup] [minor] wn.ui.toolbar.show_banner 2013-08-09 16:57:53 +05:30
Rushabh Mehta
0b9954059c [cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip) 2013-08-09 15:30:11 +05:30
Rushabh Mehta
be64070ed9 [report] material requests for which supplier quotations are not created 2013-08-09 15:26:47 +05:30
Anand Doshi
1da188ad17 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 15:13:53 +05:30
Anand Doshi
b6084f1e78 [fix] [minor] set customer defaults to fetch price list 2013-08-09 15:13:23 +05:30
Nabin Hait
f71f5f55e5 [minor] [fix] update serial no details on cancelling of purchase receipt 2013-08-09 14:46:16 +05:30
Nabin Hait
fd6a650e12 [perpetual accounting] [minor] create jv to book stock received but not billed 2013-08-09 14:42:48 +05:30
Nabin Hait
ceb4d309b5 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 13:17:51 +05:30
Nabin Hait
d9ef559f3b [fix] [minor] fix in updating numbering series 2013-08-09 13:17:32 +05:30
Akhilesh Darjee
44b2e23eba [fix] pos settings - replace customer account with customer 2013-08-09 12:43:57 +05:30
Akhilesh Darjee
de7d944f5e [issue] webnotes/erpnext#647 - recurring event for employee birthdays 2013-08-09 12:28:50 +05:30