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

Commit Graph

  • 0d7c162d2e Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-03-06 11:21:29 +05:30
  • 8ff938a377 backup manager (wip) Rushabh Mehta 2013-03-06 11:20:56 +05:30
  • acd52a021b Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-03-05 18:23:50 +05:30
  • 46043f2d94 messages updated in voucher import tool Nabin Hait 2013-03-05 18:23:34 +05:30
  • f1dfc914af Merge branch 'master' into edge Anand Doshi 2013-03-05 17:36:34 +05:30
  • b343a4895c fix in empty col check in voucher import tool Anand Doshi 2013-03-05 17:24:15 +05:30
  • 8361179d4c Merge branch 'master' into edge Anand Doshi 2013-03-05 17:11:37 +05:30
  • ffd190ff3c fix in patch list Anand Doshi 2013-03-05 17:10:33 +05:30
  • 95bba2e492 Merge branch 'master' into edge Anand Doshi 2013-03-05 17:06:36 +05:30
  • a0accd9f67 fixed conflict Nabin Hait 2013-03-05 15:58:04 +05:30
  • dae20d87dc refactored upload attendace tool Nabin Hait 2013-03-05 15:52:07 +05:30
  • c4529ebb0d Merge pull request #300 from mayur-patel/master Rushabh Mehta 2013-03-05 01:27:26 -08:00
  • 53aba86dd8 Merge branch 'master' into edge Anand Doshi 2013-03-05 14:49:57 +05:30
  • bec17f078c Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-03-05 14:44:28 +05:30
  • c7e28c7e5d changed the logic to be more elegant. mayur-patel 2013-03-05 20:14:05 +11:00
  • 18c1980e38 voucher import tool - throw message if empty columns are found Anand Doshi 2013-03-05 14:44:05 +05:30
  • ba7ed4c27c Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-03-05 14:20:24 +05:30
  • 07287e8b93 removed colour fields from txt files Rushabh Mehta 2013-03-05 14:19:48 +05:30
  • 5640a69e78 updated sync Rushabh Mehta 2013-03-05 14:12:34 +05:30
  • 547604cf5a Added a new field called allow_negative. This field was added for allowing a negative balance for a particular leave type. mayur-patel 2013-03-05 19:11:53 +11:00
  • 94f44b4073 Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-03-05 13:40:07 +05:30
  • 9e69dc5ad8 fix in material request test case Anand Doshi 2013-03-05 13:39:28 +05:30
  • f10f2513fa Added checks to see if the selected leave type allows negative balance. If it does then warn the user and continue with saving the form else just warn the user and don't save the form data. mayur-patel 2013-03-05 18:20:57 +11:00
  • bc8ac8b532 Merge branch 'master' of https://github.com/webnotes/erpnext mayur-patel 2013-03-05 18:09:38 +11:00
  • 1f3a5c3798 use validate value method to validate valuation rate should be greater than 0 in stock entry Anand Doshi 2013-03-05 12:25:15 +05:30
  • 37731471fd lead organization added in quotation classic/spartan/modern print format Nabin Hait 2013-03-05 11:59:20 +05:30
  • 639392a0b1 Allowing user to add leaves which may results in negative leave balance. mayur-patel 2013-03-05 16:21:00 +11:00
  • 071a1f548a Merge branch 'master' into edge Anand Doshi 2013-03-04 17:51:33 +05:30
  • 9bba9ed4d2 fixes in cform Anand Doshi 2013-03-04 17:48:31 +05:30
  • 72f76cb403 Merge branch 'edge' of github.com:webnotes/erpnext into edge Rushabh Mehta 2013-03-04 17:37:11 +05:30
  • fcafcefaef Merge branch 'master' into edge Rushabh Mehta 2013-03-04 17:35:28 +05:30
  • 986d48b424 timesheet patch update Rushabh Mehta 2013-03-04 16:29:48 +05:30
  • 3e712f212a timesheet patch update Rushabh Mehta 2013-03-04 16:21:54 +05:30
  • 040e599e99 fixed to timesheet patch Rushabh Mehta 2013-03-04 15:47:42 +05:30
  • d2b91bc644 Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-03-04 15:46:03 +05:30
  • 5423c96bef fixed to timesheet patch Rushabh Mehta 2013-03-04 15:45:46 +05:30
  • 4c5af2f33d Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-03-04 15:36:27 +05:30
  • 0d20d6fdd2 fixes for purchase price list Nabin Hait 2013-03-04 15:35:45 +05:30
  • ac46aac46e Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-03-04 15:35:16 +05:30
  • f934a240ba refactored get_value and added backlink check in 'cancel' Rushabh Mehta 2013-03-04 15:34:45 +05:30
  • 28cd1ca283 Merge branch 'master' into edge Anand Doshi 2013-03-04 14:31:00 +05:30
  • 91484391ce invalidate cache if 'show in website' is unchecked for item and item group Anand Doshi 2013-03-04 14:28:38 +05:30
  • ba0e1ea194 Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-03-01 19:09:38 +05:30
  • 213b180060 merge, update bean validations Rushabh Mehta 2013-03-01 19:09:06 +05:30
  • d191e2fa64 Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-03-01 18:52:40 +05:30
  • 54d209ffb0 sub-contracting code refactored for po Nabin Hait 2013-03-01 18:51:10 +05:30
  • f559a437a1 completed Time Log / Time Log Batch Rushabh Mehta 2013-03-01 18:25:55 +05:30
  • fee642d547 completed Time Log / Time Log Batch Rushabh Mehta 2013-03-01 18:24:52 +05:30
  • 976f3b5adb Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-03-01 18:05:58 +05:30
  • 3e157ec2ea show pin code after state instead of after city in address display Anand Doshi 2013-03-01 17:55:37 +05:30
  • 73b2bb6f91 Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-03-01 17:40:31 +05:30
  • 37ef553f6b fixes for sub_contracting Nabin Hait 2013-03-01 17:39:41 +05:30
  • d88a49baa8 Merge branch 'master' into edge Anand Doshi 2013-03-01 16:21:26 +05:30
  • a10461e16c minor fix in purchase receipt Anand Doshi 2013-03-01 16:12:50 +05:30
  • 619dc6fcf8 send support ticket response at the end of all operations Anand Doshi 2013-03-01 16:12:37 +05:30
  • 9568d869f8 Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-03-01 15:12:53 +05:30
  • 541cbe3df9 Merge branch 'edge' of github.com:webnotes/erpnext into edge Nabin Hait 2013-03-01 14:47:49 +05:30
  • a6acdda094 fixes in calendar event display on desktop Anand Doshi 2013-03-01 14:41:32 +05:30
  • a139dc93f0 Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-03-01 14:40:59 +05:30
  • 483731e06c fixes in attendance control panel Nabin Hait 2013-03-01 14:40:40 +05:30
  • f8a01cfb93 Merge branch 'master' into edge Anand Doshi 2013-03-01 14:13:08 +05:30
  • 57f83ed36b show leave balance in leave balance report Anand Doshi 2013-03-01 14:11:56 +05:30
  • 5ec043c920 Merge branch 'master' into edge Anand Doshi 2013-03-01 13:44:54 +05:30
  • 13c3c8ab67 Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-03-01 13:22:11 +05:30
  • 1ead851e16 datatype validation in voucher import tool Nabin Hait 2013-03-01 13:21:29 +05:30
  • db52264f83 Merge branch 'master' into edge Anand Doshi 2013-03-01 12:58:46 +05:30
  • 322bd08f26 allow attachment in batch Anand Doshi 2013-03-01 12:52:34 +05:30
  • 95a72a7a4a fixes for material request Nabin Hait 2013-03-01 11:07:07 +05:30
  • 5657cd775f fixes for material request Nabin Hait 2013-03-01 11:05:57 +05:30
  • a9afc254bc fixes for conversion factor in old invoices Nabin Hait 2013-03-01 10:41:41 +05:30
  • 1bfec3a6c8 buying - update valuation rate when item row has item_code and quantity, else set valuation rate as 0 Anand Doshi 2013-02-28 19:17:46 +05:30
  • 5b56e78580 Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-02-28 19:16:31 +05:30
  • b05185ba96 hide website fields function removed Anand Doshi 2013-02-28 18:49:17 +05:30
  • b21eb9ac09 added time log batch Rushabh Mehta 2013-02-28 18:42:46 +05:30
  • 380f555a8c fixes in price list currency Nabin Hait 2013-02-28 18:41:49 +05:30
  • bb6a8b224a Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-02-28 18:10:54 +05:30
  • 15e7c18639 fixes in price list currency Nabin Hait 2013-02-28 18:10:19 +05:30
  • 3d2a9ca738 Merge branch 'master' into edge Anand Doshi 2013-02-28 17:46:21 +05:30
  • 4a36e479c1 fix in subcontracted validation Anand Doshi 2013-02-28 17:41:03 +05:30
  • e11214373a Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-02-28 17:15:45 +05:30
  • 86dc888648 datetime issue in stock balance repory Nabin Hait 2013-02-28 17:09:08 +05:30
  • a8caa5edef patch to delete warehouses with docstatus = 2 Anand Doshi 2013-02-28 16:45:37 +05:30
  • a71ace0d74 fixed asynchronus issue in purchase cycle Nabin Hait 2013-02-28 16:30:53 +05:30
  • b0486b9d33 Merge pull request #297 from billyfordon/master Rushabh Mehta 2013-02-27 20:52:16 -08:00
  • 9b352309c6 Adding German translation billyfordson 2013-02-27 17:36:23 +01:00
  • 215fc02395 Merge branch 'master' into edge Anand Doshi 2013-02-27 19:14:16 +05:30
  • 5c6fc62b9e added company filter in employee leave balance report Anand Doshi 2013-02-27 19:08:01 +05:30
  • 46d437e2ef fix in get previous fiscal year for leave allocation Anand Doshi 2013-02-27 18:55:37 +05:30
  • 89e70d77ca show leave application of other employees in deparment if user has Employee role, but also show leave applications based on permissions - show unique of both Anand Doshi 2013-02-27 18:46:21 +05:30
  • d4d0288540 fixed test case of purchase invoice for auto inventory accounting Anand Doshi 2013-02-27 18:29:13 +05:30
  • 55d9a62114 Merge branch 'master' of github.com:webnotes/erpnext Anand Doshi 2013-02-27 18:14:28 +05:30
  • e5daef72bf Merge branch 'master' of github.com:webnotes/erpnext Nabin Hait 2013-02-27 18:11:48 +05:30
  • 5418d71fc0 sub-contracting rewrite with testcases Nabin Hait 2013-02-27 18:11:17 +05:30
  • 4a7248ee0b commonified some purchase code, added test case for auto inventory accounting for purchase invoice Anand Doshi 2013-02-27 18:10:30 +05:30
  • 03fead184e added time log Rushabh Mehta 2013-02-27 15:44:12 +05:30
  • 9d794fccc1 fixes in jv test and purchase invoice test Anand Doshi 2013-02-27 13:34:22 +05:30
  • 0fe7dd69f5 Merge branch 'master' of github.com:webnotes/erpnext Rushabh Mehta 2013-02-27 10:52:10 +05:30
  • 891ff09ac1 website: fixed social icons and don't take lang from session for demo Rushabh Mehta 2013-02-27 10:51:26 +05:30
  • 82fce3ccb9 Merge branch 'master' into edge Anand Doshi 2013-02-26 18:56:13 +05:30
  • a1d4b78fbe started with Auto Inventory Accounting - test case for purchase receipt Anand Doshi 2013-02-26 18:09:47 +05:30