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

583 Commits

Author SHA1 Message Date
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