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

152 Commits

Author SHA1 Message Date
Bárbara Perretti
4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
 2013-10-16 15:09:18 -03:00
Bárbara Perretti
7934140969 Fix translate projects/report/daily_time_log_summary/daily_time_log_summary.js 2013-10-15 17:14:28 -03:00
Anand Doshi
a295bf5421 [minor] don't rollback when running all tests, fixed test cases 2013-10-15 19:52:29 +05:30
Bárbara Perretti
e9c36599f5 Fix translate time_log_batch.js 2013-10-08 15:23:51 -03:00
Bárbara Perretti
e52998fd12 Fix translate time_log_calendar.js 2013-10-08 15:19:18 -03:00
Bárbara Perretti
f4cde68097 Fix translate time_log_calendar.js 2013-10-08 15:17:44 -03:00
Bárbara Perretti
ac6fc6fab6 Fix translate project.js 2013-10-08 15:13:25 -03:00
Anand Doshi
fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
 2013-10-02 16:52:52 +05:30
Rushabh Mehta
24ca7e4e2e Added Transactions for Import webnotes/erpnext#911 2013-10-02 14:25:36 +05:30
Nabin Hait
6060cc4896 [fix] [minor] fetch project on selection of task in time log 2013-09-26 17:59:05 +05:30
Pratik Vyas
5e16a69b35 mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
Pratik Vyas
e55fbfc090 remove sql = 2013-09-18 11:10:59 +05:30
Rushabh Mehta
22f4816832 [project] [link-fix] minor 2013-09-13 10:21:46 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Nabin Hait
97bde682f1 [fix] [time log] syntax error 2013-07-19 11:13:15 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Saurabh
ee85cfd476 get_query to server side 2013-07-10 17:35:14 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Saurabh
f52dc07a58 queries to server side 2013-07-10 13:07:49 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Rushabh Mehta
bcff7dce8e [cleanup] [stock entry] [sales order] 2013-07-03 18:32:29 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Anand Doshi
aa0ccf8223 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-17 13:46:55 +05:30
Anand Doshi
b5fd788131 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	projects/doctype/project/project.py
	utilities/transaction_base.py
 2013-06-17 12:55:05 +05:30
Anand Doshi
11d311376e [event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue 2013-06-17 12:51:36 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Anand Doshi
b53b9dcff4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 16:23:45 +05:30
Anand Doshi
618edee8b7 [search criteria] [cleanup] removed search criteria folders and files 2013-06-11 15:04:37 +05:30
Rushabh Mehta
110af4b312 [docs] added docs for projects 2013-06-11 14:29:28 +05:30
Rushabh Mehta
9025b27858 [cleanup] removed Project Activity, Project Activity Update, Project Control, projects (page) 2013-06-11 14:28:55 +05:30
Anand Doshi
47530db4d9 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-10 15:58:34 +05:30
Anand Doshi
f09a9f68e4 [project] [event] fix in creation of event 2013-06-10 15:57:52 +05:30
Anand Doshi
bb39fc85dd Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-10 15:40:38 +05:30
Anand Doshi
7e2010a649 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/patch_list.py
	projects/doctype/project/project.py
	utilities/transaction_base.py
 2013-06-10 15:25:07 +05:30
Anand Doshi
e53a81dcea [event] [lead, opportunity, project] [fix] create events 2013-06-10 15:15:40 +05:30
Rushabh Mehta
c067366c98 [project] consider cancelled tasks as completed 2013-06-10 12:35:45 +05:30
Rushabh Mehta
cbb176cdf1 [form] [status] fix #172 2013-06-07 14:57:30 +05:30
Rushabh Mehta
cdd265d3bf [project] added patch 2013-06-07 14:52:53 +05:30
Rushabh Mehta
f79e3451dd [projects] added ganttview, removed old timesheet 2013-06-07 12:58:29 +05:30
Rushabh Mehta
0716e5ce09 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-05 17:15:39 +05:30
Rushabh Mehta
c4f08ef456 [views] cleaned up, added ganttview 2013-06-05 17:14:52 +05:30
Nabin Hait
90202aec2b [merge conflict] 2013-06-05 12:37:10 +05:30
Saurabh
4bf08fa1cd [Reports][Supplier Account Head -> Account] and [Project wise Stock Tracking -> Project] 2013-06-04 15:51:16 +05:30
Anand Doshi
52adc34e04 shifted tasks above milestone in Project 2013-06-03 17:04:01 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30