Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,935 Commits 3 Branches 0 Tags 1 GiB
88ac9b2ec9
Commit Graph

1761 Commits

Author SHA1 Message Date
Rushabh Mehta
22ababbec1 configs 2014-02-07 18:16:11 +05:30
Anand Doshi
7c34f1c472 Test Item Group 2014-02-07 14:52:14 +05:30
Anand Doshi
7bb9c3f125 Nested Set Test using Test Item group 2014-02-06 17:51:18 +05:30
Nabin Hait
a03f654446 Merge pull request #1382 from akhileshdarjee/4.0-hotfix 
Newsletter can also be sent to employees
 2014-02-06 16:02:39 +05:30
Anand Doshi
3decf4dbc5 Fixes related website hierarchy 2014-02-06 12:50:35 +05:30
Akhilesh Darjee
8f674fe0fb minor changes 2014-02-03 17:47:50 +05:30
Akhilesh Darjee
abb3af7b30 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix 2014-02-03 16:44:14 +05:30
Akhilesh Darjee
d6d2193f91 newsletter reload 2014-01-31 19:59:25 +05:30
Nabin Hait
8dc2c6a16c Default accounts in company should not be copied 2014-01-30 17:00:09 +05:30
Akhilesh Darjee
86894f3bbf merge conflict fixed 2014-01-27 15:42:02 +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
Nabin Hait
5ae6a61c4d Fixes related to appifing shopping cart 2014-01-23 15:33:30 +05:30
Rushabh Mehta
f96bcf943b added explicit delete perimssions 2014-01-20 17:52:13 +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
5c96b75a68 fixed maintenance schedule 2014-01-02 17:54:12 +05:30
Anand Doshi
9a4a13cb73 Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes 2013-12-31 17:38:21 +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
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
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +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
c652a6254f Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:48:38 +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
Rushabh Mehta
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Anand Doshi
1fc9ae2230 Fixes and Validations for nested doctypes 2012-09-24 14:00:59 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Anand Doshi
8bdfaa3438 msgprint fix, company abbreviation length validation 2012-09-19 12:41:06 +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
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
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Nabin Hait
d948e9b15c reload doc before auto nification 2012-09-05 12:59:07 +05:30
Anand Doshi
b4ea4adeec Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/setup/doctype/price_list/price_list.py
 2012-08-31 16:56:44 +05:30
Anand Doshi
41cd5a68f4 autocommit for price list update 2012-08-31 13:57:22 +05:30
Anand Doshi
7b20428976 merged master 2012-08-16 17:10:39 +05:30
Anand Doshi
1467a059ed Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-16 17:09:37 +05:30
Anand Doshi
37b1b88710 fix in email settings: json.loads defaults to unicode string, hence encode string for smtp login 2012-08-16 17:09:13 +05:30
Anand Doshi
241437995f Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/setup/doctype/company/company.txt
 2012-08-10 12:58:48 +05:30
Anand Doshi
6810979dab Company Form: do not hide 'Default Settings' section break for a new company, as it contains a mandatory field 'Default Currency' 2012-08-10 12:38:48 +05:30
Anand Doshi
0cedc1cc9c removed reply_to while sending email in email digest 2012-08-08 10:54:11 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Rushabh Mehta
f0018b5e05 added unsubscribed fields in Lead and Contact and cleaned up sendmail function 2012-08-02 18:03:12 +05:30
Anand Doshi
dbe31be55c deprecated bulk rename tool 2012-07-20 18:11:41 +05:30
Anand Doshi
76ec66dd65 fixes for unicode 2012-07-20 18:11:30 +05:30
Anand Doshi
1703cc89b4 fixes for unicode 2012-07-19 20:31:56 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Rushabh Mehta
4ae82ca0c2 users pages deprecated 2012-07-16 16:20:11 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Rushabh Mehta
8cbbab2e75 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-12 18:01:31 +05:30
Rushabh Mehta
357fb2640b sales bom fixes and mandatory in table fields 2012-07-12 18:00:21 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a fixed conflict in setup control 2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Rushabh Mehta
cf969143f2 cleaned up customer group 2012-07-12 09:54:43 +05:30
Rushabh Mehta
b9fabf8e16 sales bom cleanup 2012-07-11 19:18:50 +05:30
Rushabh Mehta
cda9732f51 price list cleanup 2012-07-11 17:29:46 +05:30
Rushabh Mehta
3a0f191658 cleaned up fiscal_year, currency and added select-all + help in doclistview 2012-07-11 16:35:39 +05:30
Nabin Hait
3b0f5dddea fiscal_year_closed and abbr removed from code 2012-07-11 15:14:06 +05:30
Rushabh Mehta
9acf463427 budget distribution cleanup and formatting of markdown 2012-07-11 14:39:33 +05:30
Rushabh Mehta
e3dd54c220 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 13:19:36 +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
45ec64a58e fixes in outgoing email connection error handling 2012-07-11 12:06:38 +05:30
Anand Doshi
090a12d167 do not force send email using conf.py configuration 2012-07-10 15:15:46 +05:30
Anand Doshi
0f5e220d6c Email Digest: New Transactions --> consider feed_type is null records only 2012-07-09 12:48:32 +05:30
Anand Doshi
af539fa5bd deprecate import data control 2012-07-03 14:45:03 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Anand Doshi
d4425cc57d Merge branch 'master' into dev 
Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py
 2012-06-27 14:13:34 +05:30
Anand Doshi
74962a9213 auto create email digest after setup is completed 2012-06-26 12:47:14 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Anand Doshi
b4aa0f8ce8 fix in price list: check if a row has content before checking its length; allow only 1 attachment 2012-06-22 10:56:12 +05:30
Anand Doshi
616c355d20 fix in todos and email settings 2012-06-14 16:46:48 +05:30
Anand Doshi
92fd9cce35 fixes in support ticket and email settings 2012-06-14 14:55:44 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Anand Doshi
4f4f58293f fix in item group on_trash 2012-06-12 17:03:09 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Rushabh Mehta
0873e75fb2 better notification message 2012-06-07 11:00:33 +05:30
Rushabh Mehta
c91e16dd1e email_digest updates 2012-06-06 11:27:38 +05:30
Rushabh Mehta
0b00b46a99 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-06 11:11:58 +05:30
Rushabh Mehta
260162db1b email digest: mobile friendly 2012-06-06 11:11:35 +05:30
Anand Doshi
937d838bdc min height for communication history and transaction history 2012-06-05 20:19:52 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log 
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
 2012-06-05 18:37:17 +05:30
Nabin Hait
f24d2efe2c Parent node validation fixed for tree 2012-06-05 10:41:27 +05:30
Nabin Hait
0e4afb910b parent node get_query modified in all tree 2012-06-04 10:32:31 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Nabin Hait
0908b2709b fixed conflict 2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Anand Doshi
82695ddd90 fixes in transaction history of customer and supplier 2012-05-29 14:14:27 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Nabin Hait
b695f73293 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 14:53:40 +05:30
Nabin Hait
86375f089a Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-21 15:48:21 +05:30
Nabin Hait
d9742a6a58 on_trash modified for item group, territory, customer group, and sales person 2012-05-21 13:33:09 +05:30
Rushabh Mehta
6598b6276b fixes to website settings and linking import data in setup 2012-05-14 15:02:35 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Anand Doshi
29d36a6cea fixes in account setup 2012-05-04 16:20:30 +05:30
Anand Doshi
4b6c1f8de5 fixes in notification control due to renaming of doctype 2012-05-03 16:26:38 +05:30
Anand Doshi
359852e3d9 fix in email digest 2012-05-03 13:23:06 +05:30
Anand Doshi
57bc3f424f fix in email digest 2012-05-03 12:57:56 +05:30
Anand Doshi
996abdd155 fix in email digest 2012-05-03 12:48:44 +05:30
Anand Doshi
e5982c0399 email digest fixes 2012-05-03 12:37:26 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
41cc32790f Fixed issie in auto notification 2012-04-30 14:36:18 +05:30
Anand Doshi
b60807c325 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 12:23:03 +05:30
Anand Doshi
c55d9ad033 working on setup account 2012-04-30 12:22:47 +05:30
Nabin Hait
ebbd328977 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:15:13 +05:30
Anand Doshi
f5216b46e3 fixes 2012-04-27 18:03:47 +05:30
Nabin Hait
914d67a1a3 selective deletes from child table while overwriting 2012-04-27 17:47:46 +05:30
Anand Doshi
3fbf2ec0c5 fix in setup control 2012-04-27 16:11:56 +05:30
Anand Doshi
1dac43159a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 15:31:35 +05:30
Anand Doshi
1ed4ef1946 fixes in setup 2012-04-27 15:30:23 +05:30
Nabin Hait
a6b7886175 resolved conflict while merging with master 2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
e6d808820a Error fixed in notification control 2012-04-24 11:06:48 +05:30
Nabin Hait
a8d83b6c51 update modified date 2012-04-20 14:02:44 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Anand Doshi
7c67aad059 removed account_url from global defaults 2012-04-18 17:25:06 +05:30
Anand Doshi
619e16c956 removed account_url from global defaults 2012-04-18 17:17:02 +05:30
Anand Doshi
8d1a0b4061 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:08:15 +05:30
Anand Doshi
385380125b fixes in customize form, naming series form loading 2012-04-18 16:04:02 +05:30
Nabin Hait
97051ba79f allow negative stock field in global defaults 2012-04-18 12:51:11 +05:30
Rushabh Mehta
3a9ddaf2c1 permission engine bugfix 2012-04-18 12:34:18 +05:30
Nabin Hait
7afc2124a6 allow negative qty feature 2012-04-18 12:04:20 +05:30
Anand Doshi
acb3d56e02 fix in install docs 2012-04-17 11:39:18 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Nabin Hait
7fca9e617d fixes in global defaults 2012-04-13 12:18:06 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Nabin Hait
c594bbcae0 address html issue fixed 2012-04-11 17:14:45 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Anand Doshi
a9ccc7d6bd naming series changes now saved as property setter 2012-04-10 15:31:48 +05:30
Anand Doshi
859cb72606 new favicon 2012-04-10 11:35:19 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
 2012-04-09 12:14:53 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
00ceafb42d fix in fiscal year of email digest 2012-04-03 18:43:17 +05:30
Anand Doshi
fc8bf7b1d8 add select type link fields in permission control 2012-04-03 13:49:14 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename 
Conflicts:
	erpnext/patches/patch_list.py
 2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Anand Doshi
779a365420 fix in print hide of amount in words 2012-03-28 18:31:26 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge 
Conflicts:
	erpnext/projects/doctype/project/project.txt
 2012-03-23 14:51:35 +05:30
Anand Doshi
9b56a8ada9 Merge branch 'handlerupdate' into sync_handler_merge 
Conflicts:
	js/all-app.js
	version.num
 2012-03-23 13:55:20 +05:30
Nabin Hait
f88326ba3f sync ref db 2012-03-22 15:07:05 +05:30
Anand Doshi
8463870a4f Added Custom Scripts in setup page 2012-03-22 13:39:23 +05:30
Anand Doshi
71d0b2a428 permission engine fix - is doctype submittable 2012-03-21 17:15:49 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
f74ef4c64b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:18:41 +01:00
Anand Doshi
986caee03d clear item cache on update of certain docs 2012-03-20 17:30:31 +05:30
Anand Doshi
8347aad402 email settings separated from control panel 2012-03-20 14:54:25 +05:30
Rushabh Mehta
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Rushabh Mehta
ffe9d358e8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 12:40:07 +01:00
Nabin Hait
16d9f4942a Update erpnext/setup/doctype/manage_account/manage_account.txt 2012-03-19 15:48:08 +05:30
Nabin Hait
9aa3777ba6 Update erpnext/setup/doctype/sales_person/sales_person.txt 2012-03-19 15:21:30 +05:30
Nabin Hait
e5d99f5ed1 Update erpnext/setup/doctype/manage_account/manage_account.txt 2012-03-19 15:15:20 +05:30
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30
Rushabh Mehta
b9878d01e1 style fixes 2012-03-12 16:12:09 +05:30
Rushabh Mehta
f81a64e57f new listing and changed wn.widgets.listing to wn.ui.listing 2012-03-07 18:19:41 +05:30
Rushabh Mehta
0dd5da2299 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-06 18:41:52 +05:30
Rushabh Mehta
15da133de9 removed 2012-03-06 18:41:11 +05:30
Anand Doshi
2bc141f5db fix in support ticket and email settings 2012-03-06 18:05:23 +05:30
Anand Doshi
bb64d302df email digest fix 2012-03-06 11:42:32 +05:30
Rushabh Mehta
b9004bd6d0 doclist2 2012-03-05 18:28:33 +05:30
Anand Doshi
68fb2c9b19 fix in import error due to indentation issues in item_grou[ 2012-03-01 18:20:31 +05:30
Anand Doshi
e90e35dcda restoring contact control 2012-03-01 17:52:31 +05:30
Anand Doshi
0e140962b8 Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults 2012-03-01 12:16:02 +05:30
Anand Doshi
fd5a213890 fix in account setup and user addition 2012-02-29 18:58:02 +05:30
Anand Doshi
0b8ac7fc68 fix in company setup 2012-02-29 18:33:39 +05:30
Anand Doshi
8049c27d78 Merge branch 'master' into navupdate 2012-02-29 16:22:30 +05:30
Rushabh Mehta
864a47933e Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-29 15:11:27 +05:30
Rushabh Mehta
12852e73ab added activity page 2012-02-29 15:11:06 +05:30
Anand Doshi
1304d97416 fix in import data page 2012-02-29 14:05:43 +05:30
Nabin Hait
41d6852218 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-29 11:25:09 +05:30
Nabin Hait
a3eee118fc Added on_trash function for checking link of the master 2012-02-29 11:24:55 +05:30
Rushabh Mehta
a38bbe28ce home page fixes 2012-02-29 10:55:43 +05:30
Rushabh Mehta
17da764d04 modules_setup 2012-02-28 18:56:56 +05:30
Anand Doshi
f9e4b16731 fix in scheduler related import issue 2012-02-28 11:31:46 +05:30
Anand Doshi
0455ddfb98 Merge branch 'master' into navupdate 
Conflicts:
	version.num
 2012-02-27 13:21:48 +05:30
Anand Doshi
ef041114bb show submittable warning 2012-02-23 12:56:45 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
1a35574afe redesigned scheduler 2012-02-23 11:46:28 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
c5471ddb8d added setup and removed multi-col layout in body 2012-02-22 12:07:42 +05:30
Anand Doshi
0b3f4d40c4 fix in support ticket and email digest 2012-02-20 18:38:33 +05:30
Nabin Hait
db0df4fd53 over-wrinting of child tables data in import_data 2012-02-17 15:55:51 +05:30
Anand Doshi
e7ecb86ce7 roles for a new company's first user 2012-02-16 16:34:47 +05:30
Anand Doshi
aa92ecdd26 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 15:56:57 +05:30
Anand Doshi
8aa841866f add Website Manager Role to first user 2012-02-16 15:56:36 +05:30
Rushabh Mehta
8425c87d5f fixed old style file names 2012-02-16 13:01:28 +05:30
Anand Doshi
ec1af179cb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 12:08:10 +05:30
Anand Doshi
f8395343f7 fix in password not copied to server database during company creation 2012-02-16 12:07:38 +05:30
Nabin Hait
da1f48b96e mentioed account type for some tax/chargeable account 2012-02-16 10:55:05 +05:30
Anand Doshi
ec6f9fedd6 Fix in smtplib import issue 2012-02-14 13:54:04 +05:30
Nabin Hait
7eda1cac27 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 09:57:57 +05:30
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Anand Doshi
5fe5df370f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 17:57:45 +05:30
Anand Doshi
e8928b8bff website settings 2012-02-13 17:56:59 +05:30
Rushabh Mehta
f17ce7bc67 added whitelist check 2012-02-13 16:50:52 +05:30
Nabin Hait
bd0c05bf94 Mentioned account type in default accounts 2012-02-13 14:48:34 +05:30
Anand Doshi
945b3c4680 Domain Name list in Website Settings 2012-02-13 14:04:54 +05:30
Nabin Hait
043b0f26bd Merge branch 'stable' of github.com:webnotes/erpnext 2012-02-13 12:26:45 +05:30
Nabin Hait
bf0d92e125 deleted and disabled users excluded in applicable to and approver link fields 2012-02-13 12:22:08 +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
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
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
04048ff890 Merge branch 'stable' of github.com:webnotes/erpnext into latest 2012-02-06 07:12:43 +01:00
Anand Doshi
7e13f9b4b5 Fix in email digest due to unicode change 2012-02-06 11:41:25 +05:30
Rushabh Mehta
fd5005567b Fix in setup role permissions 2012-02-06 06:34:04 +01:00
Rushabh Mehta
bc5ec4f19e version 2012-01-30 14:02:41 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
e72de12993 Merge branch 'master' into latest 
Conflicts:
	index.html
	version.num
 2012-01-30 11:59:05 +05:30
Anand Doshi
69cfc5566a Email settings check on save 2012-01-30 11:54:59 +05:30
Anand Doshi
327269fbc6 Check email settings while saving 2012-01-27 18:49:51 +05:30
Anand Doshi
6e174cc2c4 Merge branch 'master' into latest 
Conflicts:
	erpnext/setup/doctype/notification_control/notification_control.js
	index.html
	version.num
 2012-01-25 17:21:14 +05:30
Anand Doshi
d194e6b5cf Fix: show message if contact doesn't have email if notification control is enabled 2012-01-24 17:08:53 +05:30
Rushabh Mehta
865c00a79a started website 2012-01-24 14:33:21 +05:30
Anand Doshi
cfdd827a84 Merge branch 'master' into latest 2012-01-23 14:09:50 +05:30
Anand Doshi
0529bc1e53 Doc's name in subject of auto notifications 2012-01-23 10:54:53 +05:30
Rushabh Mehta
764fdb942e updated account url and js version 2012-01-20 12:07:56 +05:30
Anand Doshi
cb1f361461 Fix: Notify via email on new post on my company page 2012-01-12 13:46:46 +05:30
Anand Doshi
06d43bcfe2 Fix: Rounded Total appearing extra in Standard Print Format 2012-01-11 15:05:24 +05:30
Anand Doshi
a8c2f59d1b Escape (') in customer name in authorization control 2012-01-11 12:07:48 +05:30
Anand Doshi
385299903d Escape (') in customer name in authorization control 2012-01-11 12:03:47 +05:30
Anand Doshi
266829f024 Merge branch 'master' into stable 2012-01-10 13:59:14 +05:30
Anand Doshi
a0aa3d5605 Merge branch 'master' of github.com:webnotes/erpnext 2012-01-10 13:59:04 +05:30
Anand Doshi
a9df960494 On Print Hide, hide net_total, rounded_total_export and grand_total_export 2012-01-09 16:55:30 +05:30
Nabin Hait
40de49110e Removed webforms link from setup 2012-01-09 12:54:20 +05:30
Nabin Hait
b50c02214c removed pur of service 2012-01-05 12:21:03 +05:30
Anand Doshi
5e57a39bb1 Merge branch 'master' into stable 2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480 Changes in Notifications 2012-01-04 19:31:32 +05:30
Nabin Hait
15e8277a46 Dont update series starts from if no prefix 2012-01-04 16:23:09 +05:30
Nabin Hait
9d8e85c1f5 Dont update series starts from if no prefix 2012-01-04 16:17:18 +05:30
Anand Doshi
6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable 
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
 2012-01-03 11:45:11 +05:30
Anand Doshi
d56d57d205 Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login 2012-01-02 16:25:05 +05:30
Anand Doshi
62dbf27780 Merge pull request #192 from anandpdoshi/master 
New transaction entries fix for email digest
 2011-12-30 02:33:05 -08:00
Anand Doshi
34b9f5b1e0 Fix new transaction entries issue 2011-12-30 16:02:03 +05:30
Nabin Hait
6182b929bf set default value as blank insead of None through manage account 2011-12-29 12:56:55 +05:30
Anand Doshi
ac20eb2107 Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create 2011-12-23 13:50:28 +05:30
Anand Doshi
bd269cdbe7 Fix: Email digest gets deleted if even one is disabled. 2011-12-23 11:55:00 +05:30
Anand Doshi
f5d5f10ff3 Remove "Add Recipients" button from Email Digest (again!) 2011-12-22 19:02:15 +05:30
Anand Doshi
a4db9e9b5a Merge pull request #175 from anandpdoshi/master 
Added feature: Income Year To Date in Email Digest
 2011-12-22 04:33:35 -08:00
Anand Doshi
61a4a498cf Added feature: Income Year To Date in Email Digest 2011-12-22 18:02:36 +05:30
Anand Doshi
6d0be02364 Merge pull request #174 from anandpdoshi/master 
Fixed issue: If account of type "Bank or Cash" is not associated to a GL Entry, then it displays an alert in the email digest email body
 2011-12-22 04:06:35 -08:00
Anand Doshi
94a18109d7 Fixed issue: If account of type "Bank or Cash" is not associated to any GL Entry, then it displays an alert in the email digest email body 2011-12-22 17:34:11 +05:30
Anand Doshi
3ca92bb3e4 Merge pull request #173 from anandpdoshi/master 
Dont show bank balance if no ledger of type "Bank or Cash"
 2011-12-22 03:54:48 -08:00
Anand Doshi
7792d08408 Dont show bank balance if no ledger of type "Bank or Cash" 2011-12-22 17:23:11 +05:30
Nabin Hait
b9e8a41cd2 Account and cost center get_query changes for other charges table 2011-12-21 17:33:57 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nabin Hait
da9e2e6898 Company master link in global defaults 2011-12-21 13:24:10 +05:30
Nijil Y
0f9eaeaa3c updation Merge branch 'master' of git://github.com/webnotes/erpnext 
Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
 2011-12-21 12:34:13 +05:30
Nabin Hait
7c03cfad6a Default Price List Currency fld added in Global Defaults 2011-12-20 18:50:41 +05:30
Nijil Y
8dd861bda5 Auto Indent creation when stock reaches re-order level 2011-12-20 17:17:51 +05:30
Nabin Hait
74fcb69b13 Error fixed in cust group 2011-12-20 11:48:27 +05:30
Anand Doshi
48d8d36b79 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 14:28:02 +05:30
Anand Doshi
7f18dd3b94 Patches for email digest and remove page break from defaults 2011-12-15 14:24:55 +05:30
Nabin Hait
b3081fafb6 Merge pull request #160 from nijil/master 
Accounts Default Form Fix
 2011-12-14 22:28:52 -08:00
Anand Doshi
21c649527a Provides better error message to the user 2011-12-14 20:35:19 +05:30
Anand Doshi
e7982f0f85 Merge branch 'master' of github.com:anandpdoshi/erpnext 
Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py
 2011-12-14 20:05:16 +05:30
Anand Doshi
ddf4c2655d Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:04:04 +05:30
Anand Doshi
3fe9795020 Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:00:55 +05:30
Anand Doshi
ad42e558df Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 16:10:44 +05:30
Anand Doshi
ed73fb2b26 Fixed bug regarding setting of banner 2011-12-14 16:09:59 +05:30
Nijil Y
d18153e413 Account Default settings form fix 2011-12-14 15:28:51 +05:30
Anand Doshi
e47be26682 Merge pull request #159 from anandpdoshi/master 
Commented print statement in email_digest.py
 2011-12-13 23:07:30 -08:00
Anand Doshi
8875d91a8e Commented print statement while inserting record in scheduler 2011-12-14 12:35:07 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
3a2fcba15f Purchase Discount option in Features Setup 2011-12-14 11:26:46 +05:30
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
633edbef46 Email Digest - ready to be deployed 2011-12-08 19:34:01 +05:30
Nabin Hait
cde8bec0a6 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-06 19:05:14 +05:30
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Anand Doshi
590448aaef Changes in email digest 2011-12-06 18:51:14 +05:30
Anand Doshi
41e542ce4d Email Digest changes 2011-12-06 10:41:54 +05:30
Anand Doshi
adf2f777d3 Removed print format option. Instead show html code. 2011-12-05 12:16:31 +05:30
Anand Doshi
393f5e6078 Queries to get new records in a particular doctype 2011-12-02 19:20:10 +05:30
Anand Doshi
f10ad98ebf Refactored queries to be more clean 2011-12-02 17:53:08 +05:30
Anand Doshi
7057cbf9e5 Started with email digest 2011-12-02 15:15:38 +05:30
Anand Doshi
ed825062f1 Hide programming error messages from user on update_security 2011-11-30 15:23:37 +05:30
Anand Doshi
6e5e30c420 Merge pull request #147 from anandpdoshi/master 
Added Customize Form View and Print Formats to Setup Page
 2011-11-23 04:35:20 -08:00
Anand Doshi
a04afc9b3b Added Customize Form View (DocLayer) and Print Formats(docbrowser) to Setup Page 2011-11-23 13:51:52 +05:30
Nabin Hait
ed6b489715 filter property changed in address 2011-11-23 13:17:54 +05:30
Nabin Hait
3addd27f2c Address is added in setup for deleting purpose 2011-11-23 13:11:15 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Ravi Dey
24ef523cac Issue fixed in setup control 2011-10-10 18:39:49 +05:30
Nabin Hait
da50c0859c features by default on 2011-10-05 12:10:08 +05:30
Nabin Hait
b30c4a6611 Fieldname changed in Features Setup 2011-10-05 11:36:16 +05:30
Nabin Hait
525887fd8a Error fixed in auth control 2011-09-27 17:00:01 +05:30
Nabin Hait
5941ae3b75 Default account creation order changed 2011-09-22 16:10:43 +05:30
Nabin Hait
e10900115e updated company on_trash function 2011-09-16 15:50:45 +05:30
Rushabh Mehta
1e11cb486d merging from master and usability fixes to setup 2011-09-14 13:25:10 +05:30
Rushabh Mehta
5f50617121 removed readme 2011-09-13 15:48:51 +05:30
Rushabh Mehta
8cf45175a7 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-08 14:17:41 +05:30
Rushabh Mehta
5ede3e8411 fixes to home (multiple loading) 2011-09-08 14:16:34 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30