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

598 Commits

Author SHA1 Message Date
Rushabh Mehta
9db1a68d89 [website] [cleanup] moved website generic utils to framework 2013-04-02 10:41:37 +05:30
Anand Doshi
bdedd555ca [setup] [update manager] renamed update-this-app page to update-manager 2013-04-01 16:51:33 +05:30
Anand Doshi
72b28807d2 [setup] [feature] Update Manager for self hosted applications based on wnframework 2013-04-01 16:40:19 +05:30
Rushabh Mehta
6d61024e9e Merge branch 'master' of github.com:webnotes/erpnext 2013-04-01 15:05:13 +05:30
Rushabh Mehta
9f43fc50ad [website] [product list] image clickable 2013-04-01 12:12:47 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Nabin Hait
acecb94a0f patch: update item tax rate in json format 2013-03-29 10:48:41 +05:30
Rushabh Mehta
7ab3267886 updated item group limit to 100 2013-03-28 17:09:23 +05:30
Nabin Hait
41fe3567bb fixed conflict and aii check in global defaults 2013-03-28 15:54:11 +05:30
Anand Doshi
9d601d593d removed in dialog from activity type 2013-03-28 11:49:00 +05:30
Rushabh Mehta
06e3ef055b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 12:47:51 +05:30
Rushabh Mehta
4731fb999c [feature] [fix] utilities/rename tool upgraded to upload multiple items 2013-03-26 12:47:19 +05:30
Anand Doshi
fc33ef6bfb fixes in purchase invoice 2013-03-26 12:13:14 +05:30
Nabin Hait
82be7dc301 fixed conflict 2013-03-25 18:30:15 +05:30
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Rushabh Mehta
df8b652402 [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:44:36 +05:30
Rushabh Mehta
c5570c6341 added warehouse company validation, if warehouse is added to company 2013-03-25 15:21:24 +05:30
Nabin Hait
0931642c3a fixes in backup_dropbox 2013-03-25 11:54:42 +05:30
Nabin Hait
690fefe9c1 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 11:07:38 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Anand Doshi
44e35ab231 removed unnecessary imports from backup manager files 2013-03-22 18:47:52 +05:30
Anand Doshi
aeed499d12 Merge branch 'master' into edge 
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
 2013-03-22 18:43:47 +05:30
Rushabh Mehta
af578d73ef merge 2013-03-21 17:40:08 +05:30
Rushabh Mehta
bed19ac4d3 added website pages for orders, tickets and added sales invoice print format 2013-03-21 17:12:25 +05:30
Akhilesh Darjee
4e7a58608f google drive redirect url fixed. 2013-03-20 16:33:02 +05:30
Akhilesh Darjee
ba9ecaeef7 backup dropbox and googledrive problems fixed. 2013-03-20 13:47:17 +05:30
Akhilesh Darjee
3abf67cf5e dropbox and googledrive problems fixed 2013-03-20 13:25:28 +05:30
Akhilesh Darjee
3433f11abe Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-20 12:50:57 +05:30
Nabin Hait
aa6f939b86 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-20 11:43:47 +05:30
Akhilesh Darjee
4ff94e389e dropbox chunked uploader fixed. 2013-03-20 11:20:47 +05:30
Akhilesh Darjee
09957b61c8 Dropbox upload chunked fixed. 2013-03-20 10:21:51 +05:30
Nabin Hait
8803df04cc aii: get_query for default account in company 2013-03-19 18:53:00 +05:30
Anand Doshi
9bddd83604 fix in global defaults 2013-03-19 18:40:35 +05:30
Nabin Hait
364f08a171 fixed conflict 2013-03-19 18:29:05 +05:30
Nabin Hait
80abad2ee0 aii: default account from company 2013-03-19 18:18:52 +05:30
Nabin Hait
d98e511c8b deafult account creation in company 2013-03-19 12:45:02 +05:30
Nabin Hait
e68103be30 fixes in reorder level and company 2013-03-19 12:34:47 +05:30
Nabin Hait
928355ad9a Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 12:02:13 +05:30
Nabin Hait
89a94d8135 aii: stock reconciliation with test case 2013-03-19 12:01:46 +05:30
Rushabh Mehta
a54cb247c4 webshop login, logout 2013-03-19 11:12:22 +05:30
Anand Doshi
f11e2f8f6f Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return 
Conflicts:
	patches/patch_list.py
 2013-03-18 17:42:08 +05:30
Rushabh Mehta
edf639b607 fixed backup/gdrive 2013-03-18 12:48:34 +05:30
Akhilesh Darjee
b0f0e7a82f added backup_googledrive.py in backup_manager 2013-03-18 11:15:44 +05:30
Akhilesh Darjee
d3a30d84df Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-15 16:23:59 +05:30
Akhilesh Darjee
479af526b0 Backup commited. 2013-03-15 16:17:31 +05:30
Anand Doshi
23d742693a Merge branch 'master' into sales_purchase_return 2013-03-13 14:01:34 +05:30
Anand Doshi
71bed3116f working on merging sales purchase return into stock entry 2013-03-13 12:57:04 +05:30
Rushabh Mehta
6a4c468219 fix in about 2013-03-12 14:59:46 +05:30
Rushabh Mehta
11b1fb811f fixes to about us 2013-03-12 14:28:29 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30
webnotes
08bd677664 Commit all these files. 2013-03-11 10:43:33 +05:30
Rushabh Mehta
177226616a fix to blog and wnf backup does not backup files 2013-03-08 11:56:52 +05:30
Rushabh Mehta
b6eed77526 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 12:26:15 +05:30
Rushabh Mehta
202508410c completed dropbox backup in backup manager 2013-03-07 12:25:21 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Rushabh Mehta
8ff938a377 backup manager (wip) 2013-03-06 11:20:56 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Anand Doshi
91484391ce invalidate cache if 'show in website' is unchecked for item and item group 2013-03-04 14:28:38 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Nabin Hait
380f555a8c fixes in price list currency 2013-02-28 18:41:49 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
4a7248ee0b commonified some purchase code, added test case for auto inventory accounting for purchase invoice 2013-02-27 18:10:30 +05:30
Anand Doshi
a1d4b78fbe started with Auto Inventory Accounting - test case for purchase receipt 2013-02-26 18:09:47 +05:30
Rushabh Mehta
29786e38df added get_value, fixed appframe from Single 2013-02-26 14:27:03 +05:30
Anand Doshi
bdf4bcc2ed Merge branch 'master' of github.com:webnotes/erpnext 2013-02-25 13:14:09 +05:30
Anand Doshi
98e78e7ccb fixes in email digest 2013-02-25 13:13:04 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
135a4ccabd changed modified of global defaults.txt after merge conflict 2013-02-21 11:10:36 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge 
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
 2013-02-21 11:09:43 +05:30
Rushabh Mehta
833b0f12d5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 09:48:35 +05:30
Nabin Hait
6f1a5ec209 Disable rounded total feature 2013-02-20 16:25:05 +05:30
Anand Doshi
7ce7d7cad4 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-20 16:08:43 +05:30
Rushabh Mehta
87e4801946 website settings social icons 2013-02-20 15:02:21 +05:30
Nabin Hait
0e5ea316cc fixes in naming series 2013-02-19 16:14:27 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Anand Doshi
d6f97c26e0 show todo and calendar as unorder list 2013-02-16 15:50:57 +05:30
Anand Doshi
d628916a2c email digest for todo and calendar 2013-02-16 14:51:25 +05:30
Anand Doshi
e74a1f2b85 fixes in outstanding amount calculation on cancellation of payment entry 2013-02-14 13:38:12 +05:30
Rushabh Mehta
eaf3de4605 added test runner 2013-02-13 11:59:17 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
6209046772 added some test records 2013-02-07 19:47:34 +05:30
Anand Doshi
613cb6a9f9 bug fix in clear unallocated advances 2013-02-06 17:33:46 +05:30
Rushabh Mehta
c2563effbf added test case for leave_application 2013-02-05 23:25:37 +05:30
Rushabh Mehta
4e95bb59a0 added test_runner 2013-02-05 19:20:51 +05:30
Nabin Hait
fb3fd6e3e5 deprecated gl_control and some rewrites 2013-01-30 19:16:13 +05:30
Rushabh Mehta
08da1a0a3d setting list_views 2013-01-29 17:53:29 +05:30
Rushabh Mehta
4dbc813741 removing listviews and added hide_currency_symbol in global defaults 2013-01-28 15:11:18 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
7b563f7569 added translation files 2013-01-28 11:19:03 +05:30
Rushabh Mehta
671538ff8c fixes to currency number formatting - will pick first from currency master and also made explict options for number formatting 2013-01-28 10:42:32 +05:30
Anand Doshi
44077d22cc fixes related to currency and po price list 2013-01-27 17:02:49 +05:30
Rushabh Mehta
83e08362bd nsm bug in customer_group and removed abbr in Cost Center 2013-01-25 15:11:26 +05:30
Nabin Hait
bf8c5033fe Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 12:12:45 +05:30
Nabin Hait
5ce1c668b5 removed default_currency_fraction and default_currency_format from global defaults 2013-01-25 12:06:57 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
877a1a9274 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-24 15:56:15 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Nabin Hait
195d579361 check customer/customer_group with same name while creating customer_group/customer 2013-01-24 15:07:24 +05:30
Nabin Hait
8cf90f18f0 check item/item group with same name while creating item group/item 2013-01-24 14:58:21 +05:30
Rushabh Mehta
880a7034c8 global default for currency display 2013-01-24 13:55:44 +05:30
Rushabh Mehta
a90943ff19 added masking for currency fields 2013-01-24 11:59:37 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Nabin Hait
291e8c2545 removed landed cost master 2013-01-23 16:06:44 +05:30
Rushabh Mehta
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Nabin Hait
5b4c294b40 commonified in_words function 2013-01-22 11:12:02 +05:30
Anand Doshi
fc36e57233 fixes in setup control and website contact helper 2013-01-21 19:02:58 +05:30
Nabin Hait
d3b625035c fixes in total_in_words 2013-01-21 17:24:31 +05:30
Rushabh Mehta
a1e8e07fde added number format to global defaults 2013-01-21 16:39:24 +05:30
Rushabh Mehta
4e03ce2107 added number formatter 2013-01-21 16:28:37 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +05:30
Rushabh Mehta
f5b04cff8b added number format, sent country info in boot, link options not extracted from cache 2013-01-21 10:14:10 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
 2013-01-17 20:31:41 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Nabin Hait
ec65665151 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-16 13:04:44 +05:30
Nabin Hait
30ab3b40a3 fixes in tree type documents 2013-01-16 13:03:33 +05:30
Rushabh Mehta
8f3916dd54 add job applicant, sales and jobs email settings to module help 2013-01-16 12:50:55 +05:30
Rushabh Mehta
83f5181987 added automatic lead creation for sales email id 2013-01-16 11:35:09 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Rushabh Mehta
3169ef0691 added job application 2013-01-15 17:23:23 +05:30
Rushabh Mehta
ae1b0cee1b added help in doclistview to show match conditions 2013-01-11 16:13:41 +05:30
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Rushabh Mehta
978d4e87c9 updated setup 2013-01-09 17:23:45 +05:30
Nabin Hait
f8c6531c3d set as default button in fiscal year 2013-01-09 14:44:24 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Anand Doshi
22c9497833 Merge branch 'edge' of github.com:webnotes/erpnext into edge 
Conflicts:
	patches/patch_list.py
 2013-01-02 14:02:36 +05:30
Nabin Hait
488d0ab6cd removed rename master link from setup 2013-01-02 11:37:30 +05:30
Rushabh Mehta
74d3363a7e new permission manager 2013-01-01 19:56:51 +05:30
Rushabh Mehta
7d19e5c4dd new permission manager 2013-01-01 19:52:36 +05:30
Rushabh Mehta
78a0c20305 new permission manager 2013-01-01 19:51:35 +05:30
Anand Doshi
e9c6ecc0d8 fix in permission engine: allow restrictions based on custom field 2012-12-31 12:04:36 +05:30
Rushabh Mehta
4337802cdb integrated workflow, disable Submit, Cancel if workflow is defined 2012-12-28 16:07:55 +05:30
Rushabh Mehta
0357f1409c clear cache in website 2012-12-27 18:57:03 +05:30
Rushabh Mehta
5f1d57ecb7 address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner 2012-12-27 14:05:02 +05:30
Rushabh Mehta
4ce83836b3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 18:23:37 +05:30
Rushabh Mehta
7edf899706 added wesite slideshow and attributions on website 2012-12-25 18:18:17 +05:30
Nabin Hait
bfe864e11a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 18:17:16 +05:30
Nabin Hait
ce159ab66b stock balance report and inclusion of filter on brand in all stock reports 2012-12-25 18:04:10 +05:30
Rushabh Mehta
f50c012808 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 15:09:58 +05:30
Rushabh Mehta
7837d80716 fixes to website, item (added table for cross listing), modules_setup and form_header 2012-12-25 15:09:14 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Rushabh Mehta
d3c9fb6b3b changed desktop modules now using font-awesome instead of noun project fonts 2012-12-21 18:27:40 +05:30
Rushabh Mehta
88a4c44cfa Merge branch 'master' of github.com:webnotes/erpnext 2012-12-20 17:12:59 +05:30
Rushabh Mehta
fc19f25c88 updates to item, item_group and website 2012-12-20 17:11:51 +05:30
Nabin Hait
4ecc785aab fixed conflict 2012-12-19 12:18:15 +05:30
Rushabh Mehta
e109fa4fb8 website updates and fix to sessions 2012-12-19 10:14:59 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Nabin Hait
7c59c68434 stock entry cleanp 2012-12-18 10:28:36 +05:30
Rushabh Mehta
0e9e848cfc added item specification, bugfix for form grid 2012-12-17 16:00:34 +05:30
Nabin Hait
9ea22b75bd Merge branch 'master' into production 2012-12-17 11:39:41 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +05:30
Anand Doshi
b0f6dde7bf permission control: get parent doctype doclist in get permissions 2012-12-14 16:23:33 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Nabin Hait
df011dbfa5 deleted unwanted control doctype and pages 2012-12-14 10:42:09 +05:30
Anand Doshi
221f03be01 minor fixes 2012-12-13 15:04:18 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Rushabh Mehta
1b8a4cab26 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 16:30:40 +05:30
Rushabh Mehta
4b8f90c5b4 permission, user_default fix 2012-12-12 16:28:21 +05:30
Nabin Hait
003b31ae06 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 16:27:22 +05:30
Nabin Hait
06cbd3427f dynamic query for root in sales browser, validation for tree structure document 2012-12-12 16:26:39 +05:30
Rushabh Mehta
686022f777 fixes to recent patch and removed company_control, home_control, webforms, wip_monitor 2012-12-12 15:25:51 +05:30
Rushabh Mehta
2e580fc345 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 14:33:34 +05:30
Rushabh Mehta
20b75e372f added session expiry in global defaults 2012-12-12 14:33:02 +05:30
Nabin Hait
b5171539cc Expense Claim option removed from authorization rule 2012-12-12 11:03:16 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Anand Doshi
c551964d5d Merge branch 'master' into production 
Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt
 2012-12-11 14:59:19 +05:30
Nabin Hait
69b3730a18 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-11 14:36:19 +05:30
Nabin Hait
cddbe6dd80 validation while created through company saving and root deleted 2012-12-11 14:35:45 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Nabin Hait
05de088473 merge, fixed production cleanup patch 2012-12-10 19:28:38 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Anand Doshi
85e785fa0d fix in naming series 2012-12-08 11:47:36 +05:30
Rushabh Mehta
6b118571db Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 15:48:01 +05:30
Rushabh Mehta
0db74a7ebd cleaned up item, fixed bug in dependency, removed legacy Listing, re-layed out DocField, refactored build.json for web, added featured_item and item_website_specification 2012-12-07 15:47:32 +05:30
Anand Doshi
197d1b4e55 show expiry date in setup home page 2012-12-07 15:21:34 +05:30
Rushabh Mehta
76c4f61ffb more refactoring to renaming 2012-12-06 12:09:52 +05:30
Anand Doshi
cca5fc8c74 fix in authorization rule 2012-12-04 16:17:08 +05:30
Anand Doshi
e00244628a fixed naming series form 2012-12-04 12:38:00 +05:30
Rushabh Mehta
e751be1132 allow rename for Item Group 2012-12-03 18:05:49 +05:30
Rushabh Mehta
346c832475 remove rename_tool 2012-12-03 14:15:53 +05:30
Rushabh Mehta
833f070991 added allow_rename and also fix in autonotification 2012-12-03 11:33:08 +05:30
Anand Doshi
eb7f47ddad shifted render list method to contact_control 2012-12-01 18:19:33 +05:30
Anand Doshi
eaed03d010 replaced convert_to_lists 2012-11-30 17:24:54 +05:30
Anand Doshi
ea61d8cf99 replaced set 2012-11-30 17:18:45 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Rushabh Mehta
35c017a78f cleanup of notification control: now in boot 2012-11-30 10:57:28 +05:30
Rushabh Mehta
d7fe2bfe1b webnotes.model.doctype (new version) 2012-11-29 11:49:56 +05:30
Rushabh Mehta
57774c032c contact.js: set customer, supplier 2012-11-28 16:01:58 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
353d408e88 added get_query for employee related table 2012-11-19 17:35:50 +05:30
Anand Doshi
e65e621145 get_query for profile based link fields to enable searching by name 2012-11-19 15:43:18 +05:30
Rushabh Mehta
14c8223985 updated data import template and removed upload feature in price list 2012-11-15 12:44:41 +05:30
Rushabh Mehta
e97dce3447 bugfix in email digest 2012-11-15 10:08:21 +05:30
Rushabh Mehta
d94bc9697a do not allow mandatory and hidden and also bugfix in communication creation 2012-11-14 12:23:04 +05:30
Rushabh Mehta
3684155f28 deprecated breadcrumbs, titles are now selectable 2012-11-13 16:44:27 +05:30
Rushabh Mehta
40f5b15e8c doctype field validation commonified and added to customize form view and custom fields and property setter save 2012-11-13 15:41:12 +05:30
Rushabh Mehta
5af4056cff task listview and added footer to email digest 2012-11-12 17:55:10 +05:30
Rushabh Mehta
f64372ba81 added open tickets for email digest 2012-11-12 16:18:24 +05:30
Anand Doshi
3b8d588f3d if recipients only then try to send email digest 2012-11-05 13:28:30 +05:30
Nabin Hait
44dacca0ff Valuation Method restored 2012-10-26 16:44:39 +05:30
Nabin Hait
981d48339a Warehouse merging feature and update_bin cleanup 2012-10-26 14:42:48 +05:30
Nabin Hait
5eefff040c fixes customer group trashing issue 2012-10-22 11:03:22 +05:30
Anand Doshi
7aedaec6b6 added get_site_address method to website's init 2012-10-16 10:47:18 +05:30
Anand Doshi
f75ce4f9e5 fixed is_testing error for sales partner 2012-10-15 11:43:27 +05:30
Anand Doshi
1aace542c9 removed import error bypass and added missing py files for each doctype 2012-10-10 14:26:23 +05:30
Anand Doshi
372697d9c5 fixes in voucher import tool 2012-10-05 15:58:47 +05:30
Anand Doshi
ae09b37a08 fix in setup control and patch to fix existing docstatus problem 2012-10-05 15:10:40 +05:30
Anand Doshi
727643210c fixes in stock reconciliation and price list csv reading 2012-10-05 11:38:06 +05:30
Anand Doshi
cdba51c5a9 added page permissions, modified report listing links 2012-10-04 18:11:29 +05:30
Anand Doshi
2e6e0963d0 do not send email digests to expired accounts 2012-10-03 09:18:16 +05:30
Anand Doshi
05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
 2012-10-02 14:35:20 +05:30
Anand Doshi
05f6f181f7 fixes in add user of Setup Control 2012-10-02 13:40:42 +05:30
Anand Doshi
769392eee9 in create profile, set password in auth table 2012-10-01 20:44:54 +05:30
Rushabh Mehta
beb3a872ce Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-10-01 14:47:06 +05:30
Rushabh Mehta
2d700dd90d added query report and cleaned up wn.ui.Dialog 2012-10-01 14:46:37 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Anand Doshi
b83307823b Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-09-28 12:39:37 +05:30
Anand Doshi
8bde7cb8db Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-28 12:36:22 +05:30
Rushabh Mehta
b02744de8f updates to form comment (post on enter) and global defaults 2012-09-28 09:56:55 +05:30
Anand Doshi
47ee285ff9 Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-26 12:44:44 +05:30
Rushabh Mehta
7c454b3039 dont save duplicate files 2012-09-25 18:20:36 +05:30
Rushabh Mehta
0152b12e75 __session_cache removed and introducted memcache for caching 2012-09-25 14:22:23 +05:30
Rushabh Mehta
707932da0c updated paths 2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Rushabh Mehta
2a9afbf4f6 synced timestamps 2011-09-05 13:17:22 +05:30
Rushabh Mehta
962e92ee00 timestamps, comments 2011-09-05 13:14:18 +05:30
Brahma K
8e8c4820cb Changes in patch of feature setup and added description against each feature 2011-08-31 15:46:29 +05:30
Brahma K
3c9a6a19e8 Feature Setup changes, related patch, Production Order 'produced_qty' label change, item->ref_rate_details->currency fills with defaut 2011-08-31 12:55:41 +05:30
Brahma K
5ecb6933a8 added features to feature setup 2011-08-31 09:02:01 +05:30
Brahma K
cc236198f7 Feature Setup merge with upstream 2011-08-30 09:32:41 +05:30
Brahma K
6ae1219956 Added new Feature List option to control front end based on companies broad requirements 2011-08-29 19:24:54 +05:30
Nabin Hait
5b9b27d98c update series server code shifted from custom script to py file 2011-08-29 14:23:14 +05:30
Nabin Hait
d075a6c53d Removed cstr in return for get_server_fields() 2011-08-17 10:50:57 +05:30
Rushabh Mehta
ab5292a008 merged live 2011-08-16 10:04:29 +05:30
Rushabh Mehta
c3ef493171 added setup wizard 0.1 2011-08-12 14:51:33 +05:30
Rushabh Mehta
89717292b7 fixed get_server_values to make them utf-8 friendly 2011-08-12 10:55:43 +05:30
Rushabh Mehta
8852c066ce updated email digest ui 2011-07-27 17:46:16 +05:30
Rushabh Mehta
5f3010735b updated email digest ui 2011-07-27 17:43:21 +05:30
Rushabh Mehta
1ead1fcef1 added email_digest UI 2011-07-27 15:41:11 +05:30
Brahma K
3085b10224 Upload Account Transactions .txt added 2011-07-27 13:08:11 +05:30
Brahma K
790a78785b fixed conflict 2011-07-27 10:54:11 +05:30
Brahma K
d7db2ea20f Lease Agreement 
Used by leasing and loan agents (i.e. Automobile leasing etc) for receipt follow up and reporting

Account Transactions Upload
	Uploads transactions from a csv files, creates Journal Vouchers and submits
 2011-07-26 19:04:13 +05:30
Nabin Hait
587ac5c941 fixed conflict 2011-07-26 15:46:10 +05:30
Rushabh Mehta
a1c232ac16 fixes to support ticket 2011-07-25 15:08:11 +05:30
Rushabh Mehta
391aa028e6 cleanups to support email (dirty) 2011-07-25 14:07:50 +05:30
nabinhait
de9826cba1 Reload Rename and Bulk Rename Tool and link in setup module 2011-07-20 18:02:59 +05:30
nabinhait
1458af0691 Index patch released and doctype updated based on index 2011-07-20 10:31:19 +05:30
Anand Doshi
65dd16f62a DB Allocation issue fixing 2011-07-19 15:02:07 +05:30
Ravi Dey
716ba28c98 Company Name special characters js validation 2011-07-14 17:51:04 +05:30
Ravi Dey
459805fadd Company Name special characters js validation 2011-07-14 17:45:04 +05:30
Ravi Dey
446e138867 Company Name special characters js validation 2011-07-14 17:42:27 +05:30
Rushabh Mehta
af596344ba merged conflict in gl_control.py 2011-07-13 14:37:17 +05:30
Rushabh Mehta
98eb61e6de setup_control.py: fixed gateway issue 2011-07-13 14:33:51 +05:30
Anand Doshi
cb54a24ead Implemented auto setting of default currency format in global defaults depending on currency after initial setup 2011-07-08 16:25:01 +05:30
Anand Doshi
7b18b6c8f8 Resolved issue of default currency not getting assigned to first company through setup_control 2011-07-08 16:12:19 +05:30
nabinhait
077c0c7b9c restored series detail 2011-07-08 13:26:40 +05:30
Rushabh Mehta
3a50b342ef feed fix 2011-07-06 14:50:30 +05:30
nabinhait
5deab24401 fixed conflict while merging with webnotes repo 2011-07-06 09:23:02 +05:30
nabinhait
7f339e0a6d removed landed cost wizard link 2011-07-05 15:43:17 +05:30
nabinhait
1bd56b1c08 removed get_tips() from js file 2011-07-05 14:41:36 +05:30
Ravi Dey
1b6d158f27 sales person fix 2011-07-05 12:11:40 +05:30
Anand Doshi
d958262761 Added method is_setup_okay to confirm if a db is setup properly 2011-07-05 11:42:24 +05:30
nabinhait
c297df5b16 Removed Tips Common from each js file 2011-07-05 10:54:05 +05:30
nabinhait
b0c3bfc454 delete mapper b4 doctype 2011-07-04 12:18:24 +05:30
nabinhait
d4403c3ec8 utilities module exported and company, rename tool txt updated 2011-07-01 19:26:59 +05:30
nabinhait
a56fc00ea3 resoved conflict in patch, company and renaming tools 2011-07-01 16:32:03 +05:30
nabinhait
963f36b969 all txt files updated due to module renaming/merging 2011-07-01 15:47:42 +05:30
Ravi Dey
94a332a8ab Rename Tool updates 2011-07-01 13:50:34 +05:30
nabinhait
ec097975d0 restructured erpnext and deleted unwanted 2011-07-01 13:34:41 +05:30
Ravi Dey
27c5b4075f company reload doc 2011-06-29 18:05:18 +05:30
Ravi Dey
73e155cadc Fixed Company Deletion 2011-06-29 17:50:12 +05:30
Rushabh Mehta
ab24d950bb added sample tests 2011-06-28 13:26:02 +05:30
Rushabh Mehta
adce217e05 setup fixes 2011-06-23 22:36:27 +05:30
Rushabh Mehta
dc7cbc23af setup fixes 2011-06-23 22:31:59 +05:30
Rushabh Mehta
48ebb2ab4a bugfix for sales_person.py 2011-06-22 18:16:30 +05:30
Rushabh Mehta
64b6c2c80d added rename tool 2011-06-22 16:38:11 +05:30
nabinhait
b9d6fa5068 removed code related to Badge 2011-06-16 14:51:52 +05:30
Pratik Vyas
c1e6e4c752 Sourced wnframework-modules from Google Code as erpnext 2011-06-08 14:37:15 +05:30