Commit Graph

6805 Commits

Author SHA1 Message Date
Rushabh Mehta
20279534f4 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-16 11:17:59 +05:30
Rushabh Mehta
6c18cbcb4b Merge pull request #755 from fogueri/master
[docs] Changed grammatical errors
2013-08-15 21:52:10 -07:00
Rushabh Mehta
8134175458 Merge pull request #763 from sharpec/patch-1
initial italian translation
2013-08-15 21:49:07 -07:00
Rushabh Mehta
6e252d64aa Merge branch 'master' of github.com:webnotes/erpnext 2013-08-16 10:04:45 +05:30
Nabin Hait
f32a4643e5 [fix] [minor] reload shopping_cart_price_list 2013-08-15 14:39:12 +05:30
Nabin Hait
3ead4a6e08 [fix] [minor] reload event on birthday patch 2013-08-15 14:30:46 +05:30
sharpec
a882cc715b initial translation
about 26%
2013-08-14 22:55:20 +02:00
Anand Doshi
894341be72 [fix] [minor] price list rename patch 2013-08-14 19:24:36 +05:30
Anand Doshi
3cb7cf497b [fix] [minor] project query for purchase receipt 2013-08-14 18:55:50 +05:30
Rushabh Mehta
9cd825f2e0 [minor] [fixed conflicts] 2013-08-14 18:51:05 +05:30
Rushabh Mehta
170be3b717 [minor] merge master 2013-08-14 18:41:42 +05:30
Rushabh Mehta
62030e05cc [Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master 2013-08-14 18:39:27 +05:30
Anand Doshi
3d1ecf5254 [fix] [minor] take correct docname when creating contact/address from a previous document 2013-08-14 17:22:14 +05:30
Anand Doshi
30324b857a [fix] [minor] set due date in sales invoice after mapping 2013-08-14 17:07:42 +05:30
Priya
cc9b922e00 [docs] 2013-08-14 16:01:01 +05:30
Priya
394d40e877 [docs] 2013-08-14 15:56:13 +05:30
Priya
eb3df65146 [docs] 2013-08-14 15:51:02 +05:30
Anand Doshi
01aa860e07 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 15:13:37 +05:30
Anand Doshi
e7d77cad74 [fix] [minor] install erpnext - pip installation 2013-08-14 15:12:46 +05:30
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