Commit Graph

1379 Commits

Author SHA1 Message Date
Anand Doshi
dae6e1e6a2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-09 12:48:13 +05:30
Anand Doshi
ad37575701 First name and last name in setup account dialog 2012-02-09 12:48:04 +05:30
Rushabh Mehta
96765f170d Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-09 12:46:17 +05:30
Rushabh Mehta
0b2874afdb fix to install 2012-02-09 12:45:50 +05:30
Anand Doshi
95e89de21d Merge branch 'stable' into latest
Conflicts:
	erpnext/home/page/event_updates/event_updates.js
2012-02-09 12:23:15 +05:30
Anand Doshi
3801804a8a First Name and Last Name in setup account dialog box 2012-02-09 12:16:47 +05:30
Anand Doshi
83302dfe63 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 16:23:47 +05:30
Anand Doshi
cf5f0232a9 Merge branch 'stable' into latest 2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14 Fix in Purchase Invoice creation due to item tax stringify issue 2012-02-08 16:22:59 +05:30
Rushabh Mehta
f16e32eca1 report builder fix' 2012-02-08 16:16:28 +05:30
Rushabh Mehta
b8d6497818 many style fixes 2012-02-08 12:33:13 +05:30
Anand Doshi
a685379d6b Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 11:06:12 +05:30
Anand Doshi
9908d6e4be Merge branch 'stable' into latest 2012-02-08 11:05:47 +05:30
Rushabh Mehta
a1f3764238 about us style fix 2012-02-08 10:51:08 +05:30
Anand Doshi
c9fcc05792 Allow IS POS to be set as default from customize form view 2012-02-08 10:46:27 +05:30
Rushabh Mehta
02ec8c06fb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 10:44:33 +05:30
Rushabh Mehta
3fd279977b website p sty;e 2012-02-08 10:44:02 +05:30
Anand Doshi
c6eea1e1ca Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 10:24:16 +05:30
Anand Doshi
88e4a0ffc2 Merge branch 'stable' into latest 2012-02-08 10:24:03 +05:30
Rushabh Mehta
bd20d29dae pre style 2012-02-08 10:23:16 +05:30
Anand Doshi
d7ac84f430 removed msgprint in pending po items to receive report 2012-02-08 10:18:30 +05:30
Anand Doshi
a629fa3f05 Merge branch 'stable' into latest 2012-02-07 18:02:42 +05:30
Anand Doshi
02035d071a Fix in import docs containing utf-8 encoding 2012-02-07 17:57:40 +05:30
Rushabh Mehta
a7f0c448bb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:58:14 +05:30
Rushabh Mehta
4d20b2246c style fixes 2012-02-07 14:57:49 +05:30
Anand Doshi
f812acf063 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:51:56 +05:30
Anand Doshi
8d3d2a9905 Merge branch 'stable' into latest 2012-02-07 14:51:38 +05:30
Anand Doshi
e59f456ad4 If support ticket doesnt have body, then do not append in reply to string 2012-02-07 14:50:50 +05:30
Rushabh Mehta
5b625fa592 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:32:20 +05:30
Rushabh Mehta
f9620eaf44 fix to product, blog 2012-02-07 14:31:49 +05:30
Anand Doshi
b65363aa46 Merge branch 'stable' into latest 2012-02-07 14:28:29 +05:30
Anand Doshi
188a499f45 Fix in default customer group fetch while converting lead to customer 2012-02-07 14:28:05 +05:30
Anand Doshi
4e47c48707 Merge branch 'stable' into latest 2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193 Fixed mapping of conversion rate for PO-PR and PO-PV 2012-02-07 13:32:20 +05:30
Rushabh Mehta
8ebf4e27ef moved index to webnotes/cms 2012-02-07 13:31:09 +05:30
Rushabh Mehta
518533fde0 added sitemap, rss feeds 2012-02-07 13:29:31 +05:30
Rushabh Mehta
9c7fe3bce4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 11:43:51 +05:30
Rushabh Mehta
8b96b05163 fixes to products 2012-02-07 11:43:41 +05:30
Rushabh Mehta
f42e682f67 fixes to products 2012-02-07 07:12:48 +01:00
Rushabh Mehta
002340080d fixes to products 2012-02-07 07:08:05 +01:00
Anand Doshi
67d2c8396c Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-07 10:59:29 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Rushabh Mehta
f35992f695 top bar to accept url 2012-02-07 10:39:17 +05:30
Anand Doshi
99e7f3d7a4 Fix in valuation_control.py: eval requires a string. does not accept None. 2012-02-06 18:06:34 +05:30
Rushabh Mehta
0a45f96c48 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 17:40:46 +05:30
Rushabh Mehta
28307193a1 item group txt 2012-02-06 17:40:37 +05:30
Rushabh Mehta
cc54fd46bc website fixes 2012-02-06 13:09:08 +01:00
Rushabh Mehta
e651648b1b added missing icons 2012-02-06 16:28:06 +05:30
Rushabh Mehta
a7e68f7cd7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 15:33:37 +05:30