Commit Graph

515 Commits

Author SHA1 Message Date
Anand Doshi
66f90687e9 import unicode_literals where missing 2012-07-27 14:29:29 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
2012-07-26 15:46:13 +02:00
Anand Doshi
9b8fca9d75 new patches for unicode release 2012-07-23 13:10:33 +05:30
Nabin Hait
e9a62d1236 reload trial balance report 2012-07-23 11:46:37 +05:30
Anand Doshi
dbe31be55c deprecated bulk rename tool 2012-07-20 18:11:41 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
2012-07-18 20:31:37 +05:30
Nabin Hait
28115f3373 repost stock due to incorrect packing list 2012-07-18 18:29:05 +05:30
Nabin Hait
ddb9f948ee repost stock due to incorrect packing list 2012-07-18 18:12:34 +05:30
Anand Doshi
3a281ae6c3 Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
	erpnext/patches/patch_list.py
2012-07-17 13:21:55 +05:30
Anand Doshi
26ca2c8c77 fix in syntax of owner match patch 2012-07-17 13:08:46 +05:30
Anand Doshi
5d4aaaa8a7 patch to remove match condition of owner on event doctype 2012-07-17 13:06:34 +05:30
Rushabh Mehta
2d7cb22f1f added auth_table patch file: 2012-07-13 15:07:07 +05:30
Rushabh Mehta
91ba346354 profile cleanup start and new auth table for better security 2012-07-13 14:54:40 +05:30
Nabin Hait
0c9a262de4 fixed conflict 2012-07-13 10:39:45 +05:30
Nabin Hait
91223d325b fixed conflict 2012-07-13 10:35:44 +05:30
Anand Doshi
158e7751a8 Merge branch 'master' into dev 2012-07-13 08:53:17 +05:30
Anand Doshi
255d58b3a0 fixes in error logging and refresh cache issues 2012-07-13 08:53:07 +05:30
Anand Doshi
31d8e5618e Merge branch 'master' into dev 2012-07-13 08:24:28 +05:30
Anand Doshi
6c3b622c00 fixes in cms2 patch 2012-07-13 08:24:16 +05:30
Anand Doshi
4a56e996f1 Merge branch 'master' into dev 2012-07-12 23:38:45 +05:30
Anand Doshi
4659b1eb25 log error on saving doclist in cms2 patch 2012-07-12 23:38:31 +05:30
Anand Doshi
c97f780940 Merge branch 'master' into dev
Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js
2012-07-12 22:16:19 +05:30
Anand Doshi
af1f437fad update in cms2 patch: delete html files 2012-07-12 22:06:27 +05:30
Anand Doshi
c4eb9bf838 cms2 patch updates 2012-07-12 19:15:52 +05:30
Anand Doshi
1a51cc9ad0 fixes in cms2 updates 2012-07-12 19:03:58 +05:30
Anand Doshi
51146c07c3 cleaner web cache code 2012-07-12 18:41:12 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Anand Doshi
8790188fc8 fixes in web cache record insert for exceptional pages like 404, login-page, index etc. 2012-07-11 20:04:32 +05:30
Anand Doshi
1522f5d76b Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-11 14:27:22 +05:30
Rushabh Mehta
e57267f79a added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:18:58 +05:30
Anand Doshi
40fce89631 Favicon for website
Started work on comments to be embedded in blog page
2012-07-09 20:02:52 +05:30
Anand Doshi
e47def842d Improvements in product page and its listing
Login page rendered via a template
2012-07-09 15:56:12 +05:30
Anand Doshi
ac475c61dc Merge branch 'master' of github.com:webnotes/erpnext 2012-07-04 11:26:01 +05:30
Anand Doshi
1731786a61 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-03 15:51:11 +05:30
Nabin Hait
b0e15d6ec5 Update master 2012-07-03 15:30:52 +05:30
Anand Doshi
af539fa5bd deprecate import data control 2012-07-03 14:45:03 +05:30
Nabin Hait
fdb1993125 fixed conflict 2012-07-03 12:14:48 +05:30
Anand Doshi
851b9c0aad address contact permissions 2012-07-02 20:25:26 +05:30
Nabin Hait
9b1e9aceaf packing list cleanup and serial no status update 2012-07-02 16:42:46 +05:30
Nabin Hait
52fd9de425 packing list cleanup and serial no status update 2012-07-02 16:41:11 +05:30
Anand Doshi
8c7cd2c407 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-02 14:44:05 +05:30
Nabin Hait
6751261589 reload pr-po mapper patch' 2012-07-02 11:24:37 +05:30
Anand Doshi
b38546489d Merge branch 'master' into dev 2012-06-28 20:49:31 +05:30
Anand Doshi
bfd9258326 fix in cacheitem table 2012-06-28 20:46:46 +05:30
Anand Doshi
10bcf5ea25 blog listing + started with products page and listing 2012-06-26 18:54:10 +05:30
Anand Doshi
401f12418f Merge branch 'master' into dev
Conflicts:
	erpnext/patches/patch_list.py
2012-06-26 12:20:29 +05:30
Anand Doshi
0b06004986 delete unwanted doctypes of website settings 2012-06-26 12:18:41 +05:30
Anand Doshi
68196bc966 delete records in child table where parent is missing or parent is like
old_par%
2012-06-26 12:15:21 +05:30
Nabin Hait
c6fc345f35 alter tabsessions to change user column definition 2012-06-25 15:30:59 +05:30