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

345 Commits

Author SHA1 Message Date
Nabin Hait
0f61b476a2 toggle display of contact info based on customer 2013-01-09 12:50:43 +05:30
Nabin Hait
dc8913e132 toggle display of contact info based on customer and conatct, address query based on customer 2013-01-09 12:35:24 +05:30
Anand Doshi
435fd1426b Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-09 11:25:34 +05:30
Nabin Hait
9d0f636c46 stock reconciliation - rewrite in progress 2013-01-07 18:51:11 +05:30
Rushabh Mehta
143ea718c3 commified item_code query 2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Anand Doshi
f9a3c8fcdc added status validation 2012-12-28 19:42:49 +05:30
Nabin Hait
5d273df92e changes in layout of module home page 2012-12-28 15:39:21 +05:30
Anand Doshi
44c9def74f if no address, only then have address type as Office 2012-12-27 18:34:35 +05:30
Rushabh Mehta
43eb513a43 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 16:50:55 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +05:30
Nabin Hait
562de92070 removed project related doctype mapper 2012-12-27 15:14:27 +05:30
Nabin Hait
e05a5b6043 do not pull customer on selection of project 2012-12-27 15:05:06 +05:30
Anand Doshi
f04fa4664d fixes in lead list 2012-12-27 14:05:10 +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
Anand Doshi
a85b2e4ee3 show company name in lead list 2012-12-27 13:52:47 +05:30
Anand Doshi
bde1f4f454 minor fix in support ticket 2012-12-27 13:32:11 +05:30
Anand Doshi
5ea807829a added company in lead list 2012-12-27 13:07:50 +05:30
Anand Doshi
a0713196d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:08:16 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Rushabh Mehta
6f65de15ae appframe fixes 2012-12-22 13:50:35 +05:30
Anand Doshi
879ec66ea3 Merge branch 'production' of github.com:webnotes/erpnext into production 
Conflicts:
	accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
	buying/doctype/purchase_order_item/purchase_order_item.txt
	buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
	patches/patch_list.py
 2012-12-19 22:28:00 +05:30
Rushabh Mehta
1ba4bd4485 added webclient.py and some misc fixes 2012-12-19 17:05:51 +05:30
Rushabh Mehta
40ca2c681a removed next_contact in quotation, fixed regex to convert relative links to absolute 2012-12-19 12:46:03 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Nabin Hait
e93150bf26 sales order linked with project 2012-12-18 10:33:04 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Nabin Hait
22c3f63edd small fixes: sms, quotation messages etc 2012-12-13 15:09:42 +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
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
9e12af4b7c updated recipients email in communication 2012-12-12 16:13:29 +05:30
Nabin Hait
34f89e4760 Update selling/page/selling_home/selling_home.html 2012-12-12 13:13:13 +05:30
Nabin Hait
33e0b5581e communication list in selling module 2012-12-12 13:01:01 +05:30
Nabin Hait
be356b8692 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-12 12:58:22 +05:30
Rushabh Mehta
74aebf0965 added Communication to Selling and refactored module pages a bit 2012-12-12 11:03:51 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Anand Doshi
50a19b578c fix in fiscal year validation 2012-12-10 18:06:14 +05:30
Rushabh Mehta
af63b16be8 f 2012-12-10 13:41:10 +05:30
Nabin Hait
9b924ce695 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-07 14:43:40 +05:30
Nabin Hait
2ce027fc9f floating point issue in percentage delivered/billed 2012-12-07 14:43:06 +05:30
Rushabh Mehta
2fd32859e7 added: sales_orders_pending_to_be_delivered 2012-12-07 10:17:22 +05:30
Rushabh Mehta
76c4f61ffb more refactoring to renaming 2012-12-06 12:09:52 +05:30
Rushabh Mehta
bbd5ea32d1 added client side functions and mode_of_payment defaults 2012-12-04 16:31:54 +05:30
Nabin Hait
23aac61bbf removed basic info section 2012-12-03 17:27:21 +05:30
Nabin Hait
4c70cd974a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-03 15:58:37 +05:30
Nabin Hait
dd4c679899 stock entry incoming rate fixes and batch no get_query 2012-12-03 15:57:50 +05:30
Anand Doshi
ef6a76f8aa fixes in renaming account, supplier, customer; fixes in accounts browser; fixes in customer address contact fetching in opportunity 2012-12-03 15:45:03 +05:30
Rushabh Mehta
7dd13a45f6 chart of account fixes, added delete, rename 2012-12-03 14:11:24 +05:30
Rushabh Mehta
833f070991 added allow_rename and also fix in autonotification 2012-12-03 11:33:08 +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
535fbb1b00 replaced get_value 2012-11-30 17:16:03 +05:30
Anand Doshi
a2c6349342 added get_value 2012-11-30 17:08:00 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Nabin Hait
3e0612db83 fixed conflict 2012-11-30 15:02:20 +05:30
Nabin Hait
faf251a53e Production cleanup with linking with sales order 2012-11-30 14:36:01 +05:30
Rushabh Mehta
35c017a78f cleanup of notification control: now in boot 2012-11-30 10:57:28 +05:30
Rushabh Mehta
b12d5363bc merge 2012-11-29 16:30:57 +05:30
Rushabh Mehta
d7fe2bfe1b webnotes.model.doctype (new version) 2012-11-29 11:49:56 +05:30
Anand Doshi
342e3c4616 mark expected delivery date mandatory for Sales Order of type Sales 2012-11-28 18:28:23 +05:30
Anand Doshi
88d522aa51 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 17:14:23 +05:30
Anand Doshi
01bf10b8b6 changed default to Monthly in new grid reports 2012-11-28 17:12:18 +05:30
Nabin Hait
c62fe40e85 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 16:49:53 +05:30
Nabin Hait
c4fb30dc8d Removed basic info section 2012-11-28 16:49:18 +05:30
Rushabh Mehta
57774c032c contact.js: set customer, supplier 2012-11-28 16:01:58 +05:30
Nabin Hait
ef71940d58 Update delivered qty and billed amt in SO, if POS against Sales Order 2012-11-28 12:15:45 +05:30
Rushabh Mehta
fe9707a08a refactored communication and added to Lead / Contact 2012-11-27 18:43:19 +05:30
Rushabh Mehta
80127bfb6a refactored communication and added to Lead / Contact 2012-11-27 18:41:35 +05:30
Anand Doshi
726963c153 minor fixes in overflow percent of sales common 2012-11-27 16:38:43 +05:30
Anand Doshi
58babf93c6 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-26 18:48:11 +05:30
Anand Doshi
ca868e42ae added module icons in grid reports 2012-11-26 18:47:54 +05:30
Rushabh Mehta
c4e7b6800a separated communication view 2012-11-26 18:18:10 +05:30
Rushabh Mehta
de91a21946 commonified naming_series 2012-11-26 11:58:22 +05:30
Rushabh Mehta
bf09c672cd support ticket response deprecated, moved to communication 2012-11-24 15:26:48 +05:30
Rushabh Mehta
bc54dadd44 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-23 17:54:19 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
f471aa65cd get charges, if specified as default through customize form 2012-11-23 16:48:10 +05:30
Anand Doshi
93a35cab19 added customer get_query to allow search based on customer name. also don't show name again if id naming is based on customer name and not series 2012-11-21 18:02:22 +05:30
Anand Doshi
b45cbda7fa fixed order by for common queries, should be ordered based on startswith match and then alphabetical order for fuzzy match 2012-11-21 18:00:22 +05:30
Anand Doshi
452e6869b1 lead get query to search by lead name or lead's company name 2012-11-19 18:08:55 +05:30
Anand Doshi
e33b755946 shipping address changed back to link field 2012-11-19 16:03:05 +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
2d231514e6 lead list name bugfix 2012-11-16 18:40:29 +05:30
Rushabh Mehta
ce4ed265d2 fixes to rename_tool, added serial no for rename 2012-11-16 14:25:03 +05:30
Rushabh Mehta
188185f3a3 help link fixes in lead, opportunity; delete cancelled sles for item 2012-11-16 12:39:05 +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
3684155f28 deprecated breadcrumbs, titles are now selectable 2012-11-13 16:44:27 +05:30
Rushabh Mehta
fe7b444903 reportview, grid_report part of build and separate default dates 2012-11-12 15:39:47 +05:30
Nabin Hait
b444ba73e9 removed overwriting delivery date code on so_item 2012-11-07 11:52:38 +05:30
Nabin Hait
ed81573545 gross profit report fix 2012-11-06 15:28:15 +05:30
Nabin Hait
84d8d0538f gross profit report fix 2012-11-06 15:21:55 +05:30
Nabin Hait
e75b558b3e gross profit report fix 2012-11-06 14:56:40 +05:30
Nabin Hait
0c33b0e9d4 gross profit overloaded query 2012-11-06 14:37:03 +05:30
Nabin Hait
03d957027c reorder level fixes 2012-10-30 12:43:04 +05:30
Anand Doshi
548eb7b1c3 change project get_query to include projects with status other than Completed and Cancelled 2012-10-29 14:26:38 +05:30
Nabin Hait
981d48339a Warehouse merging feature and update_bin cleanup 2012-10-26 14:42:48 +05:30
Anand Doshi
57e947ddcf removed set_fetch from opportunity.js 2012-10-17 15:26:19 +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
Nabin Hait
760955fc68 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-04 18:35:47 +05:30
Nabin Hait
3e32040ae0 customer addresses and contacts report (query) 2012-10-04 18:35:17 +05:30
Anand Doshi
cdba51c5a9 added page permissions, modified report listing links 2012-10-04 18:11:29 +05:30
Anand Doshi
278f93c941 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-04 13:54:17 +05:30
Anand Doshi
037ce25f37 fixes in data import tool - restrict import upto 500 rows, commit only if import is successful, else rollback 2012-10-04 11:51:30 +05:30
Rushabh Mehta
e7ccc317de dynamic loading for reports 2012-10-04 09:57:01 +05:30
Rushabh Mehta
92207be0bd lead, support show modified avatar 2012-10-03 18:44:32 +05:30
Rushabh Mehta
3009c46ba5 moved to bootstrap 2.1 and some ui fixes in todo and messages 2012-10-03 11:56:38 +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
3245a15cb7 added future imports 2012-10-01 11:35:49 +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
534a7a92fe updated shortcuts 2012-09-28 12:33:42 +05:30
Rushabh Mehta
224714c248 no role access for financial analytics 2012-09-28 10:23:27 +05:30
Rushabh Mehta
901af83f48 lead.js, bugfix 2012-09-27 17:17:23 +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
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
Brahma K
e7eec96485 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-01 16:09:16 +05:30
Nabin Hait
630f433741 if source qty/amt zero, do not check for over delivery/bill 2011-08-31 17:23:23 +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
2c03015537 same from and to flds deleted from mapper 2011-08-25 19:41:24 +05:30
Brahma K
29d5549bde Features Setting 
1. Features Setting DocType
2. Startup.js will be added with a function which binds with refresh of doc
3. Startup.js contains the Features dictionary
 2011-08-25 16:20:16 +05:30
Brahma K
28a7b2800f Delivery Note changes 1.Net Wt, Gross Wt at packing slip level 2011-08-22 12:23:53 +05:30
Rushabh Mehta
89717292b7 fixed get_server_values to make them utf-8 friendly 2011-08-12 10:55:43 +05:30
Nabin Hait
e35618bb21 fixed bug of reserved_qty if sales bom exists for the item 2011-08-11 15:52:21 +05:30
Nabin Hait
76980b0e55 update billed_amt, per billed and billing status based on amount 2011-08-10 16:35:25 +05:30
Nabin Hait
8a80d61cc4 billiing status based on amount 2011-08-10 16:29:20 +05:30
Nabin Hait
b24ba8ef52 indentation replaced by tab 2011-08-05 11:15:07 +05:30
Nabin Hait
d8b7f8eb77 fn reordered in sales common 2011-08-05 11:13:27 +05:30
nabinhait
23760e755d export_to_files function removed from index_patch, it was only for local 2011-07-20 10:46:21 +05:30
nabinhait
1458af0691 Index patch released and doctype updated based on index 2011-07-20 10:31:19 +05:30
Ravi Dey
6c174a6e35 company default currency fix 2011-07-11 16:40:49 +05:30
nabinhait
1bd56b1c08 removed get_tips() from js file 2011-07-05 14:41:36 +05:30
nabinhait
c297df5b16 Removed Tips Common from each js file 2011-07-05 10:54:05 +05:30
nabinhait
68c6e00b52 removed check_approving_authority fn and Approval Structure dt bcoz it was not using anywhere 2011-07-04 13:18:15 +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
nabinhait
ec097975d0 restructured erpnext and deleted unwanted 2011-07-01 13:34:41 +05:30