532 Commits

Author SHA1 Message Date
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Nabin Hait
4ed7f68344 [utility] repost stock 2013-10-23 11:50:09 +05:30
Nabin Hait
1abbebad7b [fix] [minor] naming series patch 2013-10-21 16:29:10 +05:30
Akhilesh Darjee
41e4fb2bb8 [fix] [minor] item wise price list rate report currency fix 2013-10-21 16:14:02 +05:30
Rushabh Mehta
f3f496a8d7 [naming series] [minor] [fix] 2013-10-21 15:24:49 +05:30
Nabin Hait
953d0a955f [feature] Replace Company Abbr 2013-10-21 12:53:10 +05:30
Nabin Hait
c559ecf278 [fix] [minor] update values from report 2013-10-20 21:26:55 +05:30
Rushabh Mehta
70d7c481e9 [naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854 2013-10-18 17:27:45 +05:30
Akhilesh Darjee
f295692937 [fix] [minor] item price added in setup page and stock 2013-10-18 16:21:32 +05:30
Anand Doshi
0bc5ae55d8 [minor] fixes in data import, serial no and setup wizard 2013-10-18 16:07:47 +05:30
Akhilesh Darjee
cd80d86dbb [fix] [minor] renamed edit prices button from price list and item 2013-10-18 15:35:13 +05:30
Akhilesh Darjee
4ceef34c74 [report] created new item-wise price list rate report 2013-10-18 15:24:53 +05:30
Akhilesh Darjee
fcd70d04f3 [item price] item price made as an individual master and removed from price list 2013-10-18 14:24:21 +05:30
Rushabh Mehta
46eaa55f06 [editable] [minor] made item, item_group pages editable 2013-10-18 12:17:20 +05:30
Anand Doshi
9106221ea4 [minor] fixes after merge with master 2013-10-10 18:44:26 +05:30
Anand Doshi
97e9deb1ff Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-10-10 16:10:25 +05:30
Anand Doshi
b604eddbfd [minor] [fixes] view in website and other fixes 2013-10-10 15:43:32 +05:30
Rushabh Mehta
69ad94a795 [minor] fixes to form layouts 2013-10-10 15:30:12 +05:30
Rushabh Mehta
ddca90ef7b [communication] [setup wizard] [minor] [fixes] 2013-10-09 16:08:54 +05:30
Rushabh Mehta
5d45557729 [wsgi] [minor] fixed flags 2013-10-08 18:23:05 +05:30
Rushabh Mehta
8c5a5f1ed5 New Setup Wizard 2013-10-08 17:59:11 +05:30
Rushabh Mehta
8941841a9c [setup wizard] added more steps [minor] [wip] 2013-10-07 18:22:29 +05:30
Rushabh Mehta
ae307e8bf8 [setup wizard] Started - WIP 2013-10-04 17:48:05 +05:30
Rushabh Mehta
43247cedea [issues] [minor] fixed multiple minor issues 2013-10-03 14:50:55 +05:30
Anand Doshi
fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
2013-10-02 16:52:52 +05:30
Anand Doshi
c49986f092 [minor] [fix] price list table 2013-10-02 16:14:30 +05:30
Anand Doshi
6f817b58ea [minor] [fix] item price grid 2013-10-02 15:16:22 +05:30
Anand Doshi
2ebbe95e04 [minor] [fix] item prices html table 2013-10-02 12:44:59 +05:30
Anand Doshi
b6177cbb5b [minor] change filename to unicode after os.walk and os.listdir 2013-10-01 17:11:39 +05:30
Akhilesh Darjee
67a9ea6800 [price_list] [minor] move header of new grid to right if currency 2013-09-30 19:05:36 +05:30
Akhilesh Darjee
eb8753e8b6 [fix] [minor] new grid to hide delete button on new row & added description 2013-09-30 15:56:36 +05:30
Akhilesh Darjee
9cb2cdbce6 [price_list] [minor] fix of new grid 2013-09-30 15:43:00 +05:30
Akhilesh Darjee
7d36fc821b [fix] [minor] new grid fix to hide other grid 2013-09-30 12:44:00 +05:30
Akhilesh Darjee
d086d724b6 [price_list] new grid finished with fixes 2013-09-30 11:37:44 +05:30
Akhilesh Darjee
ff15367a1d Merge branch 'master' of github.com:webnotes/erpnext 2013-09-30 11:35:36 +05:30
Akhilesh Darjee
2ba61236c1 [price list] make new grid 2013-09-27 21:08:37 +05:30
Anand Doshi
5b004ff8a7 Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py
2013-09-25 19:55:41 +05:30
Nabin Hait
a7687e9ab6 [fix] [minor] create default web page only for first company 2013-09-25 13:43:35 +05:30
Nabin Hait
69a3ee54f2 [fix] [minor] create default warehouse on saving of company if not exists 2013-09-25 13:00:22 +05:30
Nabin Hait
625da79e9f item-wise price list rate, editable report 2013-09-25 10:32:51 +05:30
Anand Doshi
de8b6aadaf [minor] fixes for import conf 2013-09-24 17:17:39 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Pratik Vyas
cfed8c44b4 conf migration 2013-09-21 15:16:47 +05:30
Pratik Vyas
5e16a69b35 mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
Pratik Vyas
e55fbfc090 remove sql = 2013-09-18 11:10:59 +05:30
Anand Doshi
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Anand Doshi
2840620070 [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Nabin Hait
142007a226 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 15:15:16 +05:30
Anand Doshi
619ed5e949 [fix] [minor] [website] 2013-09-17 13:46:50 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30