Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,506 Commits 3 Branches 0 Tags 1 GiB
eb1192771f
Commit Graph

2455 Commits

Author SHA1 Message Date
Akhilesh Darjee
dc45153430 webnotes/erpnext#1221 dont allow duplicate user id in employee 2014-01-31 12:23:13 +05:30
Akhilesh Darjee
4e3b601990 webnotes/erpnext#1188 sms center character count 2014-01-30 19:13:25 +05:30
Nabin Hait
b5be7bab9b Stock Return: fetch customer and supplier details 2014-01-30 18:47:12 +05:30
Nabin Hait
8dc2c6a16c Default accounts in company should not be copied 2014-01-30 17:00:09 +05:30
Nabin Hait
ec43e4dd33 Merged with develop 2014-01-30 15:22:10 +05:30
Rushabh Mehta
fcb6b01e4e cleaned up email 2014-01-30 15:09:05 +05:30
Akhilesh Darjee
e0a1039756 merge conflict fixed 2014-01-30 14:44:35 +05:30
Akhilesh Darjee
4cdb79941b map charge to taxes and charges in transactions 2014-01-30 13:56:57 +05:30
Nabin Hait
0ff32e73ba Merged with 4.0.0-wip 2014-01-30 12:41:52 +05:30
Nabin Hait
fe8db590a1 Fixed conflict while merging with develop 2014-01-30 12:32:47 +05:30
Nabin Hait
b87e9f2651 Fixes in fetching party details 2014-01-29 19:51:36 +05:30
Akhilesh Darjee
b665d86292 patch to reload all sales and purchase doctypes and print formats 2014-01-29 17:40:34 +05:30
Akhilesh Darjee
4f7215662d webnotes/erpnext#1090 set default tax type in customer and supplier 2014-01-29 16:31:38 +05:30
Rushabh Mehta
24da761a17 more updates to party 2014-01-29 15:26:04 +05:30
Akhilesh Darjee
2ced3b07d4 changed fieldname from charge to taxes 2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87 added get_supplier_details and commonified invoice functions 2014-01-28 17:43:10 +05:30
Rushabh Mehta
3b432dce88 added listviews 2014-01-28 16:10:15 +05:30
Nabin Hait
21d324c597 Merged with 4.0-wip 2014-01-28 15:52:25 +05:30
Akhilesh Darjee
a7ab20ec78 webnotes/erpnext#912 Stay Updated button in website fixed 2014-01-28 15:50:28 +05:30
Akhilesh Darjee
ffa4769b51 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix 2014-01-27 17:32:32 +05:30
Akhilesh Darjee
db4304914c POS Invoice print format showing inclusive taxes and discount amount 2014-01-27 17:27:39 +05:30
Akhilesh Darjee
86894f3bbf merge conflict fixed 2014-01-27 15:42:02 +05:30
Rushabh Mehta
1230e3a28b don't hide customer / supplier links, webnotes/erpenxt#796 2014-01-27 11:02:27 +05:30
Anand Doshi
3f8f4ff6cd BugFix: Production Planning Tool - get_raw_materials 2014-01-24 21:47:01 +05:30
Anand Doshi
cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 
Conflicts:
	config.json
	erpnext/accounts/utils.py
	erpnext/patches/patch_list.py
	erpnext/stock/doctype/price_list/price_list.txt
	erpnext/stock/doctype/warehouse/warehouse.py
	portal/templates/sale.html
	portal/utils.py
	selling/doctype/sales_order/templates/pages/order.py
	selling/utils/cart.py
	selling/utils/product.py
	utilities/demo/demo_docs/Fiscal_Year.csv
	utilities/demo/make_demo.py
 2014-01-24 21:44:36 +05:30
Akhilesh Darjee
a4e0a1c061 minor changes 2014-01-24 19:57:52 +05:30
Rushabh Mehta
e288e5238a added title_fields for Task, Newsletter 2014-01-24 15:33:42 +05:30
Rushabh Mehta
1cd96a136f updates for restriction 2014-01-24 11:10:24 +05:30
Nabin Hait
93eab5521c Minor fix in path 2014-01-23 17:58:03 +05:30
Nabin Hait
4ba95d0b7a Fix in testcases 2014-01-23 16:45:22 +05:30
Nabin Hait
5ae6a61c4d Fixes related to appifing shopping cart 2014-01-23 15:33:30 +05:30
Nabin Hait
6a23cfa5cd Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip 2014-01-22 15:57:32 +05:30
Rushabh Mehta
7460dcf406 updated Bootstrap 2014-01-22 12:44:46 +05:30
Rushabh Mehta
f96bcf943b added explicit delete perimssions 2014-01-20 17:52:13 +05:30
Nabin Hait
9e056ec1ce Auto closing of tickets through schedulers 2014-01-20 17:46:37 +05:30
Rushabh Mehta
cef681942f merge fix 2014-01-20 17:41:13 +05:30
Nabin Hait
5c6d13a0df Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
Nabin Hait
719f2803b3 Fixed conflict while merging with develop branch 2014-01-20 17:01:28 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Akhilesh Darjee
2a79b00700 minor fix 2014-01-15 11:54:05 +05:30
Akhilesh Darjee
6a749e3a8e removed while loop 2014-01-15 11:43:47 +05:30
Anand Doshi
b9b6a6cea5 Moved webnotes scheduler event hooks 2014-01-13 21:22:23 +05:30
Nabin Hait
f6cf5e0f43 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup 2014-01-06 17:36:04 +05:30
Akhilesh Darjee
5dd92fd5d6 reload doc in maintenance schedule 2014-01-03 19:14:01 +05:30
Akhilesh Darjee
e27717261d merge conflict fixed 2014-01-03 18:18:31 +05:30
Akhilesh Darjee
57738a0ff3 flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30
Akhilesh Darjee
5c96b75a68 fixed maintenance schedule 2014-01-02 17:54:12 +05:30
Akhilesh Darjee
064d2ba16a fixed sr no in maintenance schedule 2014-01-02 17:47:32 +05:30
Rushabh Mehta
b09d9dabc5 started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions 2014-01-02 11:47:23 +05:30
Nabin Hait
06720dfb90 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip 2014-01-01 10:47:18 +05:30
Nabin Hait
a2e0a9b05f Fliend rearrangemet in tables 2014-01-01 10:45:42 +05:30
Rushabh Mehta
3f7e2729bb removed demo hooks 2014-01-01 10:45:26 +05:30
Nabin Hait
6260b58a0a Merge pull request #1253 from nabinhait/4.0.0-wip 
4.0.0 wip
 2013-12-31 21:13:45 -08:00
Anand Doshi
9a4a13cb73 Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes 2013-12-31 17:38:21 +05:30
Nabin Hait
139aa71666 Fixed conflict while merging with master 2013-12-31 16:09:22 +05:30
Nabin Hait
d3f04d754a General ledger path fixed 2013-12-31 16:04:48 +05:30
Nabin Hait
432b86344e Validate account with reference voucher if against voucher mentioned 2013-12-31 15:07:58 +05:30
Akhilesh Darjee
829eda47a8 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount 2013-12-30 12:31:07 +05:30
Anand Doshi
0663ec4a9c Merge fixes: removed patches, removed Warehouse User 2013-12-27 18:00:28 +05:30
Rushabh Mehta
61bf425935 deleted moves 2013-12-27 17:58:39 +05:30
Akhilesh Darjee
d203aea7c2 [flat discount] flat discount implemented on sales cycle 2013-12-27 17:49:57 +05:30
Rushabh Mehta
c4a0ed63ef Moved demo to separate app, moved patches folder 2013-12-27 17:30:24 +05:30
Rushabh Mehta
4ac68952e8 Moved patches and fixed method routing in pages 2013-12-27 13:43:40 +05:30
Anand Doshi
e7fc25d6a8 Fixes after permissions merge 2013-12-27 10:49:28 +05:30
Anand Doshi
8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
 2013-12-26 19:12:51 +05:30
Rushabh Mehta
7334bea3c2 fixed languages, moved framework strings to framework 2013-12-26 14:44:08 +05:30
Rushabh Mehta
caa4380d49 Merge with 3.3.8 2013-12-26 11:07:58 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
4b6b377134 Removed config.json 2013-12-25 17:38:12 +05:30
Rushabh Mehta
df200f305b Redesigned templates. Now all templates must be inside templates/pages templates/generators 2013-12-25 15:19:22 +05:30
Rushabh Mehta
3c68488873 Fixes to setup wizard 2013-12-24 18:51:49 +05:30
Rushabh Mehta
b63d550a70 Added Applications page and fixed issues in translations and hooks 2013-12-23 16:09:00 +05:30
Rushabh Mehta
2b08985e16 Translations redesigned webnotes/wnframework#351 2013-12-19 18:27:48 +05:30
Rushabh Mehta
91e9822f65 fixed test cases webnotes/wnframework#351 2013-12-16 18:43:42 +05:30
Rushabh Mehta
c652a6254f Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:48:38 +05:30
Rushabh Mehta
30430796c7 notifications via hooks webnotes/wnframework#351 2013-12-13 15:33:40 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
d2dd83c3a3 fixed template loader webnotes/wnframework#351 2013-12-12 13:57:58 +05:30
Pratik Vyas
1b23208779 [minor] get bundle working, almost 2013-12-12 10:44:38 +05:30
Rushabh Mehta
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +05:30
Rushabh Mehta
e460aa277b added setup.py 2013-12-11 11:32:21 +05:30
Rushabh Mehta
b234a3545a moved config.json inside erpnext 2013-12-11 10:55:55 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
55fd5f3ed6 added voucher import tool 2012-09-26 19:00:02 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-09-26 12:24:28 +05:30
Nabin Hait
0baf74a139 fixes in gross profit report 2012-09-26 11:38:48 +05:30
Nabin Hait
e89379f8a2 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-26 11:30:59 +05:30
Nabin Hait
9be5717f6c fixes in gross profit report 2012-09-26 11:30:30 +05:30
Nabin Hait
052a5e85e0 fixes in gross profit report 2012-09-26 11:27:23 +05:30
Anand Doshi
dcbeec1407 fix in bin.py msgprint 2012-09-25 16:07:52 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Anand Doshi
da3d9a3ee0 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-24 18:26:17 +05:30
Anand Doshi
4627867786 fix in general ledger report: account filter options to be filtered by company 2012-09-24 18:16:52 +05:30
Anand Doshi
bc243dee81 fix in general ledger report: account filter options to be filtered by company 2012-09-24 18:03:35 +05:30
Nabin Hait
9b4ffcb507 total gross profit % in gross profit report 2012-09-24 16:12:01 +05:30
Nabin Hait
acd39fd957 rounding issue fixed in gross profit 2012-09-24 15:59:26 +05:30
Nabin Hait
de7fcc66df updated repost_stock patch 2012-09-24 15:53:01 +05:30
Nabin Hait
9ed7b8bb75 fixed conflict 2012-09-24 15:46:55 +05:30
Nabin Hait
6e6dd1b0d5 reload gross profit report 2012-09-24 15:45:02 +05:30
Anand Doshi
5f76ceb38e Delete permission for Event doctype to System Manager 2012-09-24 15:41:41 +05:30
Anand Doshi
9ef7bd8494 Delete permission for Event doctype to System Manager 2012-09-24 15:41:27 +05:30
Nabin Hait
41207dbec1 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-24 15:41:16 +05:30
Nabin Hait
e4e88c9715 repost_stock patch and gross profit report 2012-09-24 15:40:56 +05:30
Anand Doshi
e47a6779e9 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-24 14:32:01 +05:30
Anand Doshi
1fc9ae2230 Fixes and Validations for nested doctypes 2012-09-24 14:00:59 +05:30
Rushabh Mehta
feaea28fdf bulk email: parse html2text only once and autocommit on many writes 2012-09-24 13:09:05 +05:30
Nabin Hait
59f70af79b Merge branch 'master' of github.com:webnotes/erpnext 2012-09-24 11:23:30 +05:30
Nabin Hait
74f1480e6e updated incoming_rate in outgoing stock ledger entry 2012-09-24 11:23:05 +05:30
Rushabh Mehta
473f7d6314 removed signin.erpnext.com 2012-09-24 10:05:14 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d added sales analytics 2012-09-21 15:19:40 +05:30
Rushabh Mehta
6ca8054d55 added stock analytics 2012-09-20 19:03:14 +05:30
Anand Doshi
c63f0518d7 removed zoom from grid report 2012-09-20 12:08:47 +05:30
Anand Doshi
09d686f7f6 zoom for stock ledger report 2012-09-19 19:06:38 +05:30
Rushabh Mehta
40a3b46d61 Added code for plot zoom 2012-09-19 17:13:10 +05:30
Rushabh Mehta
b803cbab3d Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 16:48:30 +05:30
Rushabh Mehta
5b5bc97c50 separated tooltip text in plot 2012-09-19 16:47:43 +05:30
Rushabh Mehta
4573515899 added graphs in stock ledger and general ledger 2012-09-19 16:41:19 +05:30
Nabin Hait
2d52bf6a4b Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 16:06:21 +05:30
Nabin Hait
757a785872 sales/ pur invoice listview fix 2012-09-19 16:06:03 +05:30
Anand Doshi
70f76117ac Show Create Button for link fields which are allowed for submit 2012-09-19 13:06:58 +05:30
Anand Doshi
8bdfaa3438 msgprint fix, company abbreviation length validation 2012-09-19 12:41:06 +05:30
Anand Doshi
39ca69e978 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 12:24:03 +05:30
Anand Doshi
86096ff0b4 syntax error fix 2012-09-19 12:23:35 +05:30
Nabin Hait
684de08120 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 12:22:24 +05:30
Nabin Hait
6a1e40bb46 Date validation in bank reco 2012-09-19 12:21:59 +05:30
Anand Doshi
bb6d06f64a Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 12:18:18 +05:30
Anand Doshi
cdd5cfefd5 make item code read-only after saving 2012-09-19 12:17:41 +05:30
Anand Doshi
e70eeb510e Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 12:12:31 +05:30
Anand Doshi
1953f04e68 added validation that abbreviation should not be more than 5 characters when creating company 2012-09-19 12:12:07 +05:30
Rushabh Mehta
6a6b1de7cd Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-19 12:01:54 +05:30
Rushabh Mehta
823c021e9c added index patch and updated general_ledger 2012-09-19 12:01:01 +05:30
Nabin Hait
27ec8f1e26 pull all entry of bank where clearance date not mentioned in bank reconciliation 2012-09-19 12:00:11 +05:30
Nabin Hait
6e9f1469d9 pull all entry of bank where clearance date not mentioned in bank reconciliation 2012-09-19 11:55:44 +05:30
Nabin Hait
6112a4d170 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 11:46:23 +05:30
Nabin Hait
52c595dbf1 pull all entry of bank where clearance date not mentioned in bank reconciliation 2012-09-19 11:45:59 +05:30
Anand Doshi
06f4c1a55f if last purchase not found, take last purchase rate from item 2012-09-19 11:29:32 +05:30
Rushabh Mehta
eb8673ecc6 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-18 18:52:38 +05:30
Rushabh Mehta
2ad0d424a9 Stock Ledger Report 2012-09-18 18:52:05 +05:30
Anand Doshi
05f1d45600 removed unicode literals from patch list 2012-09-18 14:04:22 +05:30
Anand Doshi
8c3cfe076e get last purchase rate from item if not found from purchase order or receipt 2012-09-18 13:56:47 +05:30
Nabin Hait
9a90c89b3f removed duplicate function from sales invoice 2012-09-18 13:37:27 +05:30
Nabin Hait
214d62a09a Merge branch 'master' of github.com:webnotes/erpnext 2012-09-18 11:19:59 +05:30
Nabin Hait
82efcc780b reset standard transaction series in cleanup_data 2012-09-18 11:19:34 +05:30
Anand Doshi
6b52d77c76 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-17 21:24:39 +05:30
Rushabh Mehta
4156523175 added flot for graphs in report_grid 2012-09-17 19:10:36 +05:30
Anand Doshi
8263419691 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:35:40 +05:30
Anand Doshi
6450b12881 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:34:24 +05:30
Rushabh Mehta
f16b28b92b moved chart_of_accounts as GridReport 2012-09-17 11:05:59 +05:30
Rushabh Mehta
40c1ac00bc merge 2012-09-17 10:05:46 +05:30
Rushabh Mehta
4ce6b60fce updates to general ledger, todo 2012-09-17 10:04:07 +05:30
Anand Doshi
d86e282eda show only those bank/cash balances which have non-zero value 2012-09-15 22:42:45 +05:30
Anand Doshi
609b25bcdb refactor email digest 2012-09-15 22:11:23 +05:30
Rushabh Mehta
cfb5466d30 added export to reports using downloadify 2012-09-14 18:12:17 +05:30
Rushabh Mehta
b40e93733c merge with master 2012-09-14 11:29:52 +05:30
Nabin Hait
ebc3b6a68d stock ledger added 2012-09-14 11:25:57 +05:30
Rushabh Mehta
c6369046a1 merge 2012-09-14 11:09:46 +05:30
Rushabh Mehta
bf65507939 added watch, check progress 2012-09-14 11:08:53 +05:30
Nabin Hait
9d3f8b9f59 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-14 10:18:09 +05:30
Nabin Hait
266ee64dc7 rebuild account tree before reposting acocunt balance 2012-09-14 10:17:46 +05:30
Rushabh Mehta
2be4c6f8ed created grid report, report dump and general ledger report 2012-09-13 19:42:28 +05:30
Rushabh Mehta
95e4e1418d created grid report, report dump and general ledger report 2012-09-13 19:40:56 +05:30
Anand Doshi
e08249f3d5 allow multisort with selectable sort order 2012-09-13 15:39:34 +05:30
Anand Doshi
99e5ac3452 multi sort for stock ledger search criteria 2012-09-13 15:24:19 +05:30
Rushabh Mehta
93e9fdfe48 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-13 12:00:54 +05:30
Rushabh Mehta
4a91f29d0f updates to gzip, chart of accounts 2012-09-13 11:59:32 +05:30
Rushabh Mehta
fd1c166f5b late loading js (require) files in localStorage, brought back versions (simpler) 2012-09-13 10:21:29 +05:30
Rushabh Mehta
24ebe3ffdd merge with master 2012-09-12 19:07:07 +05:30
Rushabh Mehta
588a98a10f fixes to chart_of_accounts, added opening + pl condition 2012-09-12 19:00:14 +05:30
Rushabh Mehta
aeb5c0fe70 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-12 18:15:26 +05:30
Rushabh Mehta
0fa8e33835 chart of accounts: balances calculation 2012-09-12 18:14:12 +05:30
Rushabh Mehta
ad37f276da Created Chart of Accounts using Slick Grid and Tree 2012-09-12 17:13:36 +05:30
Nabin Hait
b146353db2 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-12 16:15:09 +05:30
Nabin Hait
5337ce8d02 period closing voucher issue fixed 2012-09-12 16:14:23 +05:30
Anand Doshi
d29e06852d Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-12 15:33:50 +05:30
Nabin Hait
303c78ce0e Merge branch 'master' of github.com:webnotes/erpnext 2012-09-12 15:27:24 +05:30
Nabin Hait
6a6cf5e573 parent account mandatory validation 2012-09-12 15:26:56 +05:30
Anand Doshi
af5e5c9f3a Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-12 14:56:28 +05:30
Anand Doshi
d14dc83b88 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-12 14:55:20 +05:30
Anand Doshi
94dd7ef879 show employee name in employee link field in attendance form 2012-09-12 14:53:44 +05:30
Nabin Hait
8fdaa4dd66 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-12 14:43:09 +05:30
Nabin Hait
eff2907911 error fixed in period closing entry 2012-09-12 14:42:25 +05:30
Anand Doshi
ae64c46671 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 15:46:52 +05:30
Anand Doshi
ff6754ccf4 fix in bin query 2012-09-10 15:46:38 +05:30
Anand Doshi
3b3a42303d Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 15:14:16 +05:30
Anand Doshi
0a55a35452 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-10 15:13:45 +05:30
Anand Doshi
bb2bb03bcc fix in bin reorder item condition 2012-09-10 15:13:22 +05:30
Anand Doshi
4de55b6f6b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 14:44:03 +05:30
Nabin Hait
94390d2c3f Merge branch 'master' of github.com:webnotes/erpnext 2012-09-10 14:37:28 +05:30
Nabin Hait
eb9f6eda02 order type fix in quote/SO 2012-09-10 14:36:49 +05:30
Anand Doshi
ce946afb67 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	public/js/all-app.js
 2012-09-10 14:18:17 +05:30
Anand Doshi
9d389461bb Merge branch 'master' of github.com:webnotes/erpnext 2012-09-10 14:13:57 +05:30
Anand Doshi
bf8f343da7 check match conditions for companies list in chart of accounts/cost center 2012-09-10 14:13:01 +05:30
Nabin Hait
6c8504877b Fixes in item wise purchase details report 2012-09-10 12:23:06 +05:30
Anand Doshi
21e8447e6c Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 12:04:30 +05:30
Anand Doshi
20d82800f3 add delete permission to communication 2012-09-10 12:03:31 +05:30
Anand Doshi
1971ca9ecb renamed Report to report 2012-09-10 11:40:06 +05:30
Anand Doshi
10f4ae814c renamed Report name to small case name 2012-09-10 11:34:51 +05:30
Anand Doshi
88411eddb8 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-10 11:32:17 +05:30