Commit Graph

210 Commits

Author SHA1 Message Date
Nabin Hait
8a7d4f51b4 [latest updates] 2013-05-17 12:49:15 +05:30
Anand Doshi
9d504e4706 Merge branch 'price_list_country'
Conflicts:
	home/page/latest_updates/latest_updates.js
	setup/doctype/price_list/price_list.txt
2013-05-02 16:25:46 +05:30
Anand Doshi
97e2a7eeb9 [latest updates] 2013-05-02 15:54:28 +05:30
Rushabh Mehta
f5f478ee78 [item] [naming] by series or code / [naming series] optionally set number of digits 2013-05-02 15:36:33 +05:30
Rushabh Mehta
3487e0a0f3 [price list] added currency property, validates currency, duplication in Item Price 2013-05-02 14:46:12 +05:30
Anand Doshi
d7ad13a8a7 [price list] [country] specify country for a price list 2013-04-29 19:38:34 +05:30
Anand Doshi
c9897ff533 Merge branch 'edge'
Conflicts:
	home/page/latest_updates/latest_updates.js
2013-04-29 10:42:21 +05:30
Anand Doshi
319e0f43da [latest updates] added default cost center and update manager 2013-04-29 08:53:12 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +05:30
Anand Doshi
9beae1e5c7 [attributions] [updates] added GeoLite attribution 2013-04-18 19:41:28 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
2013-04-16 21:32:06 +05:30
Anand Doshi
13760a1d74 [employee leave approvers] updated latest_updates.js 2013-04-12 21:59:22 +05:30
Rushabh Mehta
44323693f4 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:44 +05:30
Nabin Hait
8022a439a8 role added in some pages 2013-04-09 11:49:42 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Rushabh Mehta
b596bcbccf [desktop] [cleanup] moved to framework 2013-04-03 11:41:01 +05:30
Rushabh Mehta
81aec56531 [form] [usability] added min width on link fields in grid 2013-03-28 10:34:46 +05:30
Rushabh Mehta
b6c117957f [fields, project] [fix] NaN bug, project gantt refresh bug 2013-03-26 13:02:22 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Rushabh Mehta
11b1fb811f fixes to about us 2013-03-12 14:28:29 +05:30
Rushabh Mehta
f47d53adbc Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 11:09:12 +05:30
Rushabh Mehta
758131b853 fixed slideshow 2013-03-12 11:07:45 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Rushabh Mehta
f559a437a1 completed Time Log / Time Log Batch 2013-03-01 18:25:55 +05:30
Anand Doshi
a6acdda094 fixes in calendar event display on desktop 2013-03-01 14:41:32 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Rushabh Mehta
03fead184e added time log 2013-02-27 15:44:12 +05:30
Nabin Hait
adebebfccf updated latest_updates page 2013-02-26 11:00:44 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
c64da278ca fixed auto material request email 2013-02-21 12:04:42 +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
Nabin Hait
bd03b899b3 updated latest_updates page 2013-02-20 17:03:51 +05:30
Rushabh Mehta
2fe861fa71 defaults cleanup 2013-02-19 15:54:15 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
9249f354cd added view selector and calendar view for leave application 2013-02-15 19:28:05 +05:30
Rushabh Mehta
1a9f0848b3 added calendar view 2013-02-15 12:09:05 +05:30
Rushabh Mehta
5eb37647cf added new calendar and renamed holiday block list 2013-02-14 17:34:51 +05:30
Anand Doshi
5070224079 select leave approver by fullname in leave application 2013-02-13 19:49:42 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Rushabh Mehta
0c2c521d38 cleanp: bookmarks 2013-02-06 14:20:07 +05:30
Rushabh Mehta
0dbe898d82 added warehouse user to retrict entry and also introduced query handlers 2013-02-04 13:56:50 +05:30
Rushabh Mehta
d4ae9861f4 added tabsessions_to_myisam 2013-01-28 16:56:32 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30