Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • b0a76bdfe2 material receipt from bin Rushabh Mehta 2013-02-20 11:16:47 +05:30
  • 150d98d786 calculate total leave days on load Anand Doshi 2013-02-19 18:52:20 +05:30
  • 64e47afec1 calculate total leave days on load Anand Doshi 2013-02-19 18:49:12 +05:30
  • f36a00bcbe changed description of allow users in Leave Block List Anand Doshi 2013-02-19 18:43:20 +05:30
  • d70f7dec2b raise leave blocked error when status is saved as Approved Anand Doshi 2013-02-19 18:37:51 +05:30
  • c25cf3f413 :erge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-02-19 16:55:42 +05:30
  • b05b1dacd5 added Follow Via Email Anand Doshi 2013-02-19 16:54:49 +05:30
  • 704d5f0f4a delete service order/quotation doctype Nabin Hait 2013-02-19 16:23:21 +05:30
  • 452de98a6c fixes in patch_list Nabin Hait 2013-02-19 16:18:00 +05:30
  • 0e5ea316cc fixes in naming series Nabin Hait 2013-02-19 16:14:27 +05:30
  • f2d68e2fd5 display customer name instead of customer id in quotation print format Nabin Hait 2013-02-19 15:55:11 +05:30
  • 2fe861fa71 defaults cleanup Rushabh Mehta 2013-02-19 15:54:15 +05:30
  • 3fdad97b74 Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-02-19 15:48:15 +05:30
  • 39fc5179f9 display customer name instead of customer id in quotation print format Nabin Hait 2013-02-19 15:47:19 +05:30
  • 5c6216f0bd merge Rushabh Mehta 2013-02-19 15:36:38 +05:30
  • 5117d9c266 refactored defaults, bin material request wip Rushabh Mehta 2013-02-19 15:27:31 +05:30
  • 63910e3f20 Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-02-19 15:25:48 +05:30
  • 7621a94ed9 allow leave application to have attachments Anand Doshi 2013-02-19 15:24:34 +05:30
  • 789af74891 Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-02-19 15:15:11 +05:30
  • 66ea0861ff fixes in gle_floating_point_issue patch Nabin Hait 2013-02-19 15:13:23 +05:30
  • 04ae7b86ff Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-02-19 15:09:52 +05:30
  • a95e2db5b6 leave application calendar: add leaves based on permission; add holidays applicable to the employee Anand Doshi 2013-02-19 15:09:21 +05:30
  • fe787259b6 removed observer function for employee Nabin Hait 2013-02-19 12:56:12 +05:30
  • 22d3a8b41b fetch docstatus in leave application for calendar view; fix in leave application test Anand Doshi 2013-02-19 08:45:22 +05:30
  • 6ad06f3210 fixes in employee helper Anand Doshi 2013-02-18 19:57:16 +05:30
  • ac1985ff68 added observer for employee doctype to update salary structure Anand Doshi 2013-02-18 19:42:02 +05:30
  • d19e2f56cc make sure employee name is a string Anand Doshi 2013-02-18 19:15:56 +05:30
  • 62ef71be57 added leave application to allow import list Anand Doshi 2013-02-18 18:38:36 +05:30
  • b54b22734f fixed leave application error -- take employee name from employee record Anand Doshi 2013-02-18 18:33:20 +05:30
  • c53231a841 model_wrapper is now bean, refactoring defaults Rushabh Mehta 2013-02-18 18:24:28 +05:30
  • 17bc54107f make leave application importable Anand Doshi 2013-02-18 18:02:47 +05:30
  • 78352d1e71 leave application permissions patch - removed permlevel 2 Anand Doshi 2013-02-18 17:09:11 +05:30
  • 9c880da381 removed old doctypes Rushabh Mehta 2013-02-18 14:28:34 +05:30
  • c06ce25470 updated translations Rushabh Mehta 2013-02-18 14:24:05 +05:30
  • fe62769078 reload search criteria in material request patch Anand Doshi 2013-02-18 13:51:41 +05:30
  • 10eeae067c rename Purchase Request to Material Request Anand Doshi 2013-02-18 13:49:22 +05:30
  • 236cc173ad rename Purchase Request to Material Request Anand Doshi 2013-02-18 13:49:15 +05:30
  • de46f43dc1 Merge branch 'master' into edge Anand Doshi 2013-02-18 12:09:47 +05:30
  • 89869cf635 fixes in purchase invoice listing Anand Doshi 2013-02-18 12:09:29 +05:30
  • 696d6ea073 Merge branch 'master' into edge Anand Doshi 2013-02-17 00:27:18 +05:30
  • 19df1882fa fix in startup init file Anand Doshi 2013-02-17 00:26:59 +05:30
  • a0e2f51c2f Merge branch 'master' into edge Anand Doshi 2013-02-16 18:46:09 +05:30
  • a3acd57654 email digest patch Anand Doshi 2013-02-16 18:45:09 +05:30
  • 2794736d5d email digest patch Anand Doshi 2013-02-16 18:44:40 +05:30
  • 2872b1b9bb Merge branch 'master' into edge Anand Doshi 2013-02-16 15:51:47 +05:30
  • d6f97c26e0 show todo and calendar as unorder list Anand Doshi 2013-02-16 15:50:57 +05:30
  • b17f3d280b Merge branch 'master' into edge Anand Doshi 2013-02-16 15:09:38 +05:30
  • 96bebb44b0 patch to enable calendar events and todo list in email digest if email digest is enabled Anand Doshi 2013-02-16 15:09:34 +05:30
  • e81ff2bbdd Merge branch 'master' into edge Anand Doshi 2013-02-16 15:06:38 +05:30
  • 03741698e4 added icons in modules drop down menu Anand Doshi 2013-02-16 15:05:37 +05:30
  • d628916a2c email digest for todo and calendar Anand Doshi 2013-02-16 14:51:25 +05:30
  • c79cd76746 Merge branch 'master' into edge Anand Doshi 2013-02-16 11:11:14 +05:30
  • 32faa57692 Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-02-16 11:09:37 +05:30
  • 0cfdeec218 added event patch in patch list Anand Doshi 2013-02-16 11:08:55 +05:30
  • bf4ef36341 removed calendar and fix Rushabh Mehta 2013-02-16 10:44:51 +05:30
  • e51b5e3643 Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-02-15 19:28:41 +05:30
  • 9249f354cd added view selector and calendar view for leave application Rushabh Mehta 2013-02-15 19:28:05 +05:30
  • 9cde1bbb0e Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-02-15 18:29:22 +05:30
  • 33839d9b8f fix in patches Anand Doshi 2013-02-15 18:27:12 +05:30
  • 0bf801af62 email to leave approver and employee Anand Doshi 2013-02-15 18:27:05 +05:30
  • aae45532f3 request: remove _type from form Rushabh Mehta 2013-02-15 14:39:34 +05:30
  • 1a9f0848b3 added calendar view Rushabh Mehta 2013-02-15 12:09:05 +05:30
  • 6227527cdb added leave applications and block lists to calendar Rushabh Mehta 2013-02-14 20:42:33 +05:30
  • b496756696 Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-02-14 17:35:32 +05:30
  • 5eb37647cf added new calendar and renamed holiday block list Rushabh Mehta 2013-02-14 17:34:51 +05:30
  • 4b631947fc Merge branch 'master' into edge Anand Doshi 2013-02-14 16:48:26 +05:30
  • fb67605042 fix in trend analyzer - show currency only for amt field Anand Doshi 2013-02-14 15:50:01 +05:30
  • 5ea0133f97 Merge branch 'master' into edge Anand Doshi 2013-02-14 13:39:10 +05:30
  • e74a1f2b85 fixes in outstanding amount calculation on cancellation of payment entry Anand Doshi 2013-02-14 13:38:12 +05:30
  • 13dc9f3b1f shifted get_url to startup Anand Doshi 2013-02-13 23:42:48 +05:30
  • ffb1e0c096 Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-02-13 22:02:44 +05:30
  • 8fbfbfbb78 number format fix Rushabh Mehta 2013-02-13 22:02:09 +05:30
  • 8da053a7f3 Merge branch 'master' into edge Anand Doshi 2013-02-13 20:33:24 +05:30
  • 9c35b2897c raise holiday block list exception only when submitting Anand Doshi 2013-02-13 20:26:45 +05:30
  • 798c6b4fdb fixes in test runner and add role for profile Anand Doshi 2013-02-13 19:57:58 +05:30
  • 5070224079 select leave approver by fullname in leave application Anand Doshi 2013-02-13 19:49:42 +05:30
  • 223072be02 when saving employee add employee image to profile Anand Doshi 2013-02-13 18:53:08 +05:30
  • c45630faf8 added add_role method in profile Anand Doshi 2013-02-13 18:35:33 +05:30
  • eb92b52817 fixes in employee form Anand Doshi 2013-02-13 18:30:53 +05:30
  • 86af352bf3 fixes in parentfield of userrole Anand Doshi 2013-02-13 18:04:21 +05:30
  • 6685fbd348 Merge branch 'master' of github.com:webnotes/erpnext into edge Rushabh Mehta 2013-02-13 13:22:05 +01:00
  • 362455e749 fix outstanding and floating point issue in gl entry Nabin Hait 2013-02-13 15:50:39 +05:30
  • a9545794aa number format fix, permission fix in listview Rushabh Mehta 2013-02-13 12:33:02 +05:30
  • 1c9e96f3a1 Merge branch 'edge' Rushabh Mehta 2013-02-13 12:00:27 +05:30
  • eaf3de4605 added test runner Rushabh Mehta 2013-02-13 11:59:17 +05:30
  • bcbc2f6ce5 c-form fixes Nabin Hait 2013-02-13 11:30:14 +05:30
  • c2e478556d Merge branch 'edge' of github.com:webnotes/erpnext into edge Rushabh Mehta 2013-02-13 05:18:47 +01:00
  • 51709b7eb3 Merge branch 'master' into edge Rushabh Mehta 2013-02-12 19:23:48 +05:30
  • 4b9827a5fc upgraded test_runner, now can run multiple tests Rushabh Mehta 2013-02-12 19:20:39 +05:30
  • 4860754407 call calc_adjustment_amount function only if docstatus is zero Nabin Hait 2013-02-12 18:49:55 +05:30
  • cd50c2513f removed wrong validation Nabin Hait 2013-02-12 15:46:24 +05:30
  • 945b39f984 fixes in payemnt reconciliation Nabin Hait 2013-02-12 15:17:25 +05:30
  • 17fc0fe2d2 Merge branch 'edge' of github.com:webnotes/erpnext into edge Rushabh Mehta 2013-02-12 08:40:01 +01:00
  • 9b051db7d6 show page name in web page list view Anand Doshi 2013-02-12 13:04:15 +05:30
  • 3422bdfec5 added Website Manager role in install Anand Doshi 2013-02-12 13:03:25 +05:30
  • c9629a481d fetch favicon from website settings Anand Doshi 2013-02-12 12:54:58 +05:30
  • af7ae5a5d4 Merge branch 'edge' of github.com:webnotes/erpnext into edge Rushabh Mehta 2013-02-12 07:20:49 +01:00
  • c5377e2583 Merge branch 'edge' of github.com:webnotes/erpnext into edge Anand Doshi 2013-02-12 11:38:56 +05:30
  • e1ad443c91 re-adding description as it is distorting list Anand Doshi 2013-02-11 20:28:56 +05:30
  • dd1c63e9ef Merge branch 'edge' of github.com:webnotes/erpnext into edge Rushabh Mehta 2013-02-11 15:56:34 +01:00