Commit Graph

7928 Commits

Author SHA1 Message Date
Nabin Hait
1d35c444b6 [fix] [minor] check print hide property to show net total and grand total in purchase cycle standard print format 2013-11-20 16:24:11 +05:30
Nabin Hait
458b30b5d3 Merge branch '1310' of github.com:webnotes/erpnext into 1310 2013-11-20 13:51:16 +05:30
Nabin Hait
c8380bfed4 Merge pull request #1070 from akhileshdarjee/1310
[fix] [minor] all variance related reports fixed
2013-11-20 00:20:55 -08:00
Akhilesh Darjee
20f93546eb [fix] [minor] all variance related reports fixed 2013-11-20 13:25:04 +05:30
Nabin Hait
46220f9fab Merge branch '1310' of github.com:webnotes/erpnext into 1310 2013-11-20 13:14:39 +05:30
Nabin Hait
ca471f41a1 [fix] Rename and merge rewrite 2013-11-20 13:14:12 +05:30
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +05:30
Anand Doshi
c3c38d38f0 [minor] [fix] style settings 2013-11-20 12:09:21 +05:30
Anand Doshi
aa14f03f5c [minor] [fix] website sitemap reload 2013-11-20 11:51:42 +05:30
Rushabh Mehta
b340d06fe6 [readme] fixed copyright, now copyright is jointly owned by contributors 2013-11-20 10:38:06 +05:30
Rushabh Mehta
4e67b109f3 [website sitemap] [minor] fix and added patch 2013-11-19 16:39:54 +05:30
Anand Doshi
4b781d0117 [minor] website fixes 2013-11-19 15:54:28 +05:30
Rushabh Mehta
5d3cc45a75 [website sitemap] [setup] [minor] fixes 2013-11-19 15:12:10 +05:30
Rushabh Mehta
ebdddf3fb6 [website] [sitemap] cleanup 2013-11-19 14:20:52 +05:30
Nabin Hait
be78d05a0b Merge pull request #1067 from akhileshdarjee/master
[fix] [minor] added price list in supplier form
2013-11-18 23:47:38 -08:00
Akhilesh Darjee
910c7160cb [fix] [minor] fetch suppler default price list in purchase transactions 2013-11-19 12:51:14 +05:30
Akhilesh Darjee
5a1a22e907 [fix] [minor] product search to search on textbox keypress 2013-11-19 12:26:46 +05:30
Akhilesh Darjee
a2fbe5cfd2 [fix] [minor] added price list in supplier form and filtered customer and supplier for selling and buying respectively 2013-11-19 11:45:55 +05:30
Anand Doshi
5da0395779 [minor] [oops] removed print 2013-11-18 16:40:31 +05:30
Nabin Hait
d665ab2dd7 Merge pull request #1065 from akhileshdarjee/1310
[fix] [minor] product search box fixed
2013-11-18 02:05:18 -08:00
Anand Doshi
6f5bd11d79 Merge branch 'master' of github.com:webnotes/erpnext 2013-11-18 15:31:10 +05:30
Akhilesh Darjee
510a73a0de [fix] [minor] product search box fixed 2013-11-18 15:29:36 +05:30
Anand Doshi
1d55be86b2 [minor] [fix] dropbox 2013-11-18 13:49:41 +05:30
Rushabh Mehta
04cc5155f7 Added Notification Control for caching notifications probably causing the freezing problem 2013-11-18 13:23:20 +05:30
Anand Doshi
0809a95a70 [minor] [fix] setup page titles translatable 2013-11-18 12:50:43 +05:30
Nabin Hait
dd9e7a44df Merge branch '1310' of github.com:webnotes/erpnext into 1310 2013-11-18 12:43:24 +05:30
Nabin Hait
48bd4a1ded [fix] [minor] stock value difference rounding issue 2013-11-18 12:42:55 +05:30
Nabin Hait
b5a58c8a8f Merge pull request #1064 from akhileshdarjee/1310
[fix] [minor] stock related reports fixed for serialized item
2013-11-17 22:50:09 -08:00
Akhilesh Darjee
6ca0548231 [fix] [minor] stock related reports fixed for serialized item 2013-11-18 12:16:48 +05:30
Anand Doshi
0ebe35bbe0 [minor] [install] updated requirements and use python2.7 2013-11-18 12:06:33 +05:30
Anand Doshi
63945b2e81 Merge pull request #1058 from jevonearth/master
[fix] [minor] Add cssmin python module to the requirements variable
2013-11-17 22:04:04 -08:00
Nabin Hait
1e74aa8c56 Merge pull request #1062 from akhileshdarjee/1310
[fix] [minor] stock related report fixed
2013-11-17 21:54:11 -08:00
Akhilesh Darjee
0b3a8477b0 [fix] [minor] stock related report fixed 2013-11-18 11:21:04 +05:30
Jev Bjorsell
157e635f3b Fix spelling and pluralization. 2013-11-17 17:25:57 -08:00
Jev Bjorsell
2721ee3acd Corrected spelling so that 'splitted' becomes 'split' 2013-11-17 17:17:57 -08:00
Jev Bjorsell
ffd851eb34 Convert spaces to tabs, as tabs appears to be the norm. 2013-11-17 16:30:25 -08:00
Jev Bjorsell
449d8852ee Added the cssmin python module to requirements, and sorted the list of requirements alphabetically for easier reading. 2013-11-17 16:25:41 -08:00
Anand Doshi
2b71380f1f [minor] [patch] update reqd fields in reports 2013-11-16 12:33:34 +05:30
Nabin Hait
d42c3e0f48 [fix] [minor] fixes in patch 2013-11-15 23:38:09 +05:30
Anand Doshi
aa268f0fed [minor] [oops] removed sales_common.py 2013-11-15 19:21:33 +05:30
Anand Doshi
0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	accounts/doctype/account/account.py
	controllers/accounts_controller.py
	patches/patch_list.py
	selling/doctype/sales_common/sales_common.py
	stock/doctype/purchase_receipt/purchase_receipt.py
2013-11-15 19:12:09 +05:30
Rushabh Mehta
154c8579d6 [index] [minor] add indexes 2013-11-15 16:09:45 +05:30
Rushabh Mehta
27336de68b [minor] added missing icon 2013-11-15 13:55:45 +05:30
Nabin Hait
e505fbea54 [fix] [minor] stock balance report for serialized item 2013-11-15 13:38:23 +05:30
Rushabh Mehta
e34090aa2f [pos] [minor] button back on toolbar and css, fixes webnotes/erpnext#1052 2013-11-15 11:30:23 +05:30
Nabin Hait
c10621a5be [patch] make gl entries for submitted sales invoice where no gl entries exists 2013-11-15 10:32:47 +05:30
Nabin Hait
7373a83043 Merge branch '1310' of github.com:webnotes/erpnext into 1310 2013-11-14 18:50:23 +05:30
Nabin Hait
9e5da835ec [patch] make gl entries for submitted sales invoice where no gl entries exists 2013-11-14 18:41:09 +05:30
Nabin Hait
e83069cb32 [fix] update future gl entries for stock 2013-11-14 18:40:08 +05:30
Nabin Hait
155232e04e [fix] credit limit validation 2013-11-14 18:37:33 +05:30