Commit Graph

930 Commits

Author SHA1 Message Date
Nabin Hait
3027241150 Merge pull request #1136 from anandpdoshi/migrate-grid-reports
[minor] stock ledger report as script report
2013-12-02 00:57:23 -08:00
Anand Doshi
56a3165ac8 [minor] stock ledger report as script report
Issue #1121
2013-12-02 12:49:02 +05:30
Pratik Vyas
7e8f98368a [fix] allow lot of queries in update comments patch 2013-11-29 19:57:38 +05:30
Anand Doshi
39896233fa [minor] patch list 2013-11-29 16:41:09 +05:30
Anand Doshi
cfd33d2a1d [docs] removed from repository 2013-11-27 19:01:31 +05:30
Nabin Hait
ceda0d772e [fix] [minor] fixes in patch 2013-11-27 11:02:50 +05:30
Nabin Hait
e3eafd94ff Merge pull request #1100 from akhileshdarjee/master
[fix] [minor] patch for fixing report columns in defaults
2013-11-26 21:26:08 -08:00
Nabin Hait
6a3f0a8b0f [fix] [minor] naming series patch fix 2013-11-26 17:59:11 +05:30
Akhilesh Darjee
259208187c [fix] [minor] patch for fixing report columns in defaults 2013-11-26 16:35:50 +05:30
Akhilesh Darjee
60ae96d588 [fix] [minor] merge conflict fixed 2013-11-26 11:21:07 +05:30
Akhilesh Darjee
ec0da0b177 [fix] [setup_wizard] fiscal year fix for setup wizard 2013-11-25 19:51:18 +05:30
Nabin Hait
4ccb2edbfd Merge branch 'master' of github.com:webnotes/erpnext 2013-11-22 18:10:46 +05:30
Anand Doshi
ef114773a6 [minor] [website] brand_html 2013-11-22 13:25:58 +05:30
Rushabh Mehta
ef80282388 [minor] fix whitespace in patch_list 2013-11-22 13:14:12 +05:30
Rushabh Mehta
bc7358a12e [comment] [minor] added patch to update 2013-11-22 12:22:41 +05:30
Nabin Hait
8eb0c61649 [minor] merge conflict fixed 2013-11-21 12:28:50 +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
4e67b109f3 [website sitemap] [minor] fix and added patch 2013-11-19 16:39:54 +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
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
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
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
9e5da835ec [patch] make gl entries for submitted sales invoice where no gl entries exists 2013-11-14 18:41:09 +05:30
Anand Doshi
ec491dcc57 [minor] [patch] 2013-11-13 17:34:21 +05:30
Anand Doshi
778056ca5f [minor] [patch] save style settings 2013-11-13 17:34:21 +05:30
Anand Doshi
5f73a980b5 [minor] replace 'raise e' with 'raise' for correct tracebacks 2013-11-13 17:31:00 +05:30
Rushabh Mehta
3b9e864dec [ui cleanup] [minor] 2013-11-11 18:01:37 +05:30
Rushabh Mehta
515636f24c Merge branch 'master' of github.com:webnotes/erpnext into cleanup 2013-11-08 16:28:12 +05:30
Anand Doshi
8728f26442 Refactored plugin architecture to allow custom script reports 2013-11-06 14:19:09 +05:30
Rushabh Mehta
a063b4d50e [cleanup] UI Fixes, minor 2013-11-06 11:29:47 +05:30
Anand Doshi
d47db9bccf Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	patches/october_2013/p07_rename_for_territory.py
	patches/october_2013/p08_cleanup_after_item_price_module_change.py
	setup/doctype/setup_control/setup_control.py
	utilities/demo/demo_docs/Lead.csv
2013-11-04 15:34:10 +05:30
Anand Doshi
a3a348fc10 [minor] fix in patch 2013-11-04 15:33:39 +05:30
Anand Doshi
4bfaaf33aa [minor] fix in patch 2013-11-04 15:31:00 +05:30
Anand Doshi
b03f870441 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-04 15:22:50 +05:30
Anand Doshi
3673a25176 [minor] fixes after item price move 2013-11-04 15:14:57 +05:30
Anand Doshi
daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
2013-11-04 13:14:39 +05:30
Rushabh Mehta
f7b203de2d [cleanup] UI Fixes 2013-11-03 20:37:49 +05:30
Akhilesh Darjee
e158cea77a [cleanup] [minor] replaced for territory to applicable territory 2013-10-31 19:50:51 +05:30
Anand Doshi
7944ea3067 [minor] [fix] plugin patch 2013-10-31 19:07:05 +05:30
Akhilesh Darjee
0b39e95011 [cleanup] moved for territory, price list and item price doctype from setup to stock 2013-10-31 12:35:52 +05:30
Pratik Vyas
297041ed3e Merge remote-tracking branch 'upstream/wsgi' into HEAD
Conflicts:
	public/js/complete_setup.js
	setup/doctype/setup_control/setup_control.py
2013-10-25 14:07:48 +05:30
Anand Doshi
7fa2ec40e1 Removed Update Manager 2013-10-24 20:47:35 +05:30
Nabin Hait
96333b6bc7 [minor] try block in serial no status patch 2013-10-24 17:41:52 +05:30
Nabin Hait
e36edc14f6 [minor] try block in serial no status patch 2013-10-24 17:30:20 +05:30
Nabin Hait
8f185b7d3b [fix] [minor] patches 2013-10-24 14:55:29 +05:30
Akhilesh Darjee
3d0af67799 [fix] [minor] add time zone and country to global defaults 2013-10-24 12:37:43 +05:30