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

Commit Graph

  • 8026137998 employee name added to activity cost title changed for activity type time log -fetch logic added for billing and internal rate validations and calculation logic added Neil Trini Lasrado 2015-03-26 19:19:11 +05:30
  • 458b8885f0 New Document Activity Cost created. In TL - billing rate and internal rate added In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims. In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount. Neil Trini Lasrado 2015-03-24 12:49:45 +05:30
  • 0f2b7bd2bf Update setup.py Rushabh Mehta 2015-04-22 10:50:02 +05:30
  • 6814a39186 Update .travis.yml Pratik Vyas 2015-04-21 19:19:34 +05:30
  • 3c77b332ae Merge pull request #3142 from neilLasrado/production-planning Rushabh Mehta 2015-04-21 19:13:13 +05:30
  • d93750a868 Manufacturing Settings - Datatype of capacity_planning_for_days and mins_between_operations changed to Int Neil Trini Lasrado 2015-04-21 17:38:33 +05:30
  • b650d691a0 fixed conflict Nabin Hait 2015-04-21 17:16:28 +05:30
  • 7337c80f09 Merge pull request #3141 from neilLasrado/production-planning Rushabh Mehta 2015-04-21 16:47:01 +05:30
  • 261e27b9ec type of Hour rate in Production order operations and bom operations changed to currency (previouslly float). Desc to Actual Operation Cost changed Neil Trini Lasrado 2015-04-21 16:43:43 +05:30
  • e68e86f109 execute on_doctype_update Nabin Hait 2015-04-21 15:26:22 +05:30
  • 50918a8fcf [pos] fixes #3138, #3140 Rushabh Mehta 2015-04-21 14:38:48 +05:30
  • 4665f7eb70 [enhancement] added description, batch_no in packing slip Rushabh Mehta 2015-04-21 11:20:24 +05:30
  • 80381475c4 [ux] re-arranged columns in bank reconciliation, fixes #3114 Rushabh Mehta 2015-04-21 11:08:53 +05:30
  • dfa93305ab [minor] fixes #3127 Rushabh Mehta 2015-04-21 10:36:39 +05:30
  • 7f9c4d8677 [fix] item grid fix, via #3136 Rushabh Mehta 2015-04-21 10:19:29 +05:30
  • 5c7f0bcb32 Party filter and columns in general ledger report Nabin Hait 2015-04-20 17:13:43 +05:30
  • e9bd77d674 [minor] fixes in welcome mails Rushabh Mehta 2015-04-20 13:00:22 +05:30
  • 44aaa56000 get standard chart of account if country code not found Nabin Hait 2015-04-20 11:51:16 +05:30
  • 3b8682f534 Merge branch 'v4.x.x' Pratik Vyas 2015-04-20 10:44:21 +05:30
  • dbb3b49625 bumped to version 4.25.1 Pratik Vyas 2015-04-20 11:14:21 +06:00
  • b78ab03b2b Merge 'upstream/master' into v4.x.x (account receivable hotfix) Pratik Vyas 2015-04-20 10:41:31 +05:30
  • 80f8b7be2f [minor] [perms] Expense Claim Type Rushabh Mehta 2015-04-19 16:18:15 +05:30
  • d7330ec709 [minor] add disabled property in fiscal year: Rushabh Mehta 2015-04-18 17:03:49 +05:30
  • 92b253dceb Update accounts_receivable.py Rushabh Mehta 2015-04-18 12:13:57 +05:30
  • 1b26c6f02a Merge pull request #3125 from nabinhait/v4.x.x Nabin Hait 2015-04-17 16:16:35 +05:30
  • 0287b1f75c hotfix in patch Nabin Hait 2015-04-17 16:15:25 +05:30
  • e19578bac1 Merge branch 'v4.x.x' Pratik Vyas 2015-04-17 16:02:11 +05:30
  • e7eb92ce70 bumped to version 4.25.0 Pratik Vyas 2015-04-17 16:32:11 +06:00
  • 6ae352bf12 Merge pull request #3124 from nabinhait/v4.x.x Nabin Hait 2015-04-17 15:58:27 +05:30
  • 4743cbe002 issue fixed in accounts receivable report Nabin Hait 2015-04-17 15:55:19 +05:30
  • ddaedefb32 minor fix for fieldname Nabin Hait 2015-04-17 15:01:41 +05:30
  • f6215c7740 Merge pull request #3122 from nabinhait/v4.x.x Rushabh Mehta 2015-04-17 14:20:50 +05:30
  • 9e6812cfab Merge pull request #3108 from BhupeshGupta/fix_bank_reports Rushabh Mehta 2015-04-17 14:17:22 +05:30
  • 2ba88c4a5f patch: delete gle for cancelled invoices Nabin Hait 2015-04-17 12:05:00 +05:30
  • b092339c3a [minor] ignore list for dropbox Rushabh Mehta 2015-04-17 12:01:40 +05:30
  • 0939a5ac4c feature to delete company Rushabh Mehta 2015-04-17 11:47:55 +05:30
  • 63ea99e929 [hotfix] item group set_parent_website_route Anand Doshi 2015-04-16 20:45:54 -04:00
  • 1a6299176a delete gl entries on cancellation of sales invoice, if grand total is zero Nabin Hait 2015-04-16 19:22:42 +05:30
  • 2029ea9abf toggle editable price list rate Nabin Hait 2015-04-16 17:55:35 +05:30
  • 2182cd5487 Update journal_entry.js Nabin Hait 2015-04-16 16:00:37 +05:30
  • acf489c5ef [hot] [fix] journal entry Rushabh Mehta 2015-04-16 15:35:49 +05:30
  • d839a730cf [hot] [fix] journal entry Rushabh Mehta 2015-04-16 15:27:46 +05:30
  • 5674c4f28c [splash] new image Rushabh Mehta 2015-04-16 15:09:42 +05:30
  • d64e928b50 [favicon] darker Rushabh Mehta 2015-04-16 14:04:51 +05:30
  • 5ecceb55fe Merge pull request #3119 from nabinhait/v4.x.x Rushabh Mehta 2015-04-16 14:02:35 +05:30
  • c3daa91c8a Reset no-copy fields for recurring docs and patch to fix Nabin Hait 2015-04-16 13:13:18 +05:30
  • 2e7c36ec99 [favicon] light grey for erpnext Rushabh Mehta 2015-04-16 12:41:42 +05:30
  • 600aa622b1 [fix] [minor] journal entry, via error report Rushabh Mehta 2015-04-16 11:43:09 +05:30
  • 12ade3573b [minor] fix default permissions for purchase taxes and charges master Rushabh Mehta 2015-04-16 10:48:13 +05:30
  • a7b7e62e26 [travis] Add gitter webhook Pratik Vyas 2015-04-16 10:45:03 +05:30
  • 3f59615555 switch to tabs bhupeshg2 2015-04-15 22:29:45 +05:30
  • 2887913797 [fix] opportunity -> quotation Rushabh Mehta 2015-04-15 15:40:05 +05:30
  • 2dea40f7be [leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042 Rushabh Mehta 2015-04-15 15:02:29 +05:30
  • 850ee3c53d Fix make_email_account patch Pratik Vyas 2015-04-15 14:36:09 +05:30
  • 749e20f66d Merge pull request #3076 from kidakaka/patch-1 Rushabh Mehta 2015-04-15 12:29:52 +05:30
  • 53bc304be2 Merge pull request #3037 from neilLasrado/production-planning Rushabh Mehta 2015-04-15 12:06:44 +05:30
  • e027d3f34f [fix] a better solution for #2776 Rushabh Mehta 2015-04-15 12:03:21 +05:30
  • e2e973f7be Add reqd to bank clearance aummary report Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query bhupeshg2 2015-04-14 22:15:24 +05:30
  • 68dfc934bf [hotfix] [report] Received Items to be Billed Anand Doshi 2015-04-14 11:56:42 -04:00
  • 3ee1f11771 [cleanup] quality inspection fixes #3061 Rushabh Mehta 2015-04-14 17:53:36 +05:30
  • 5e7f8fd156 [ux] bom fixes #3072 Rushabh Mehta 2015-04-14 14:24:21 +05:30
  • de9bd108d0 [usability] journal entry type fixes #3085 Rushabh Mehta 2015-04-14 14:10:19 +05:30
  • 39539f14ce [patch-fix] make_email_accounts Rushabh Mehta 2015-04-14 13:07:28 +05:30
  • 18dc151fc7 Fixes in make_time_log function in Production Order Neil Trini Lasrado 2015-04-14 13:06:07 +05:30
  • cf96cc26a0 Fixes for test cases Neil Trini Lasrado 2015-04-13 13:04:18 +05:30
  • 1371afce2e added default date to planned start date in Prod Order & made planned end date read-only Neil Trini Lasrado 2015-04-13 12:15:52 +05:30
  • c43ac20115 Fixes in logic for production order scheduling Neil Trini Lasrado 2015-04-08 13:48:07 +05:30
  • d3d94d1efe fix- Material Transferred for Manufacturing not Updating in Production Order Error Neil Trini Lasrado 2015-04-06 12:53:37 +05:30
  • cd1816cc5a removed unnecesssary functions. Production related feilds made mandatory in TIme Log Neil Trini Lasrado 2015-04-06 12:41:44 +05:30
  • 5ab7d930b6 make time log button in Production order operations fixed show time logs button made available for compleated operations Neil Trini Lasrado 2015-04-01 17:59:01 +05:30
  • 8d5d5cc0a7 Planned Start Date made mandatory in production order server side check added to not plan operations if planned_start_date is None Production Order on submit - unwanted error messsages problem fixed. Neil Trini Lasrado 2015-04-01 17:31:12 +05:30
  • 2c78796716 [fix] opportunity / make quotation Rushabh Mehta 2015-04-14 11:24:42 +05:30
  • adfc34ba00 [opportunity] status open Rushabh Mehta 2015-04-13 22:23:50 +05:30
  • f579cf9871 [opportunity] status open Rushabh Mehta 2015-04-13 16:58:47 +05:30
  • 4ac3094049 [opportunity] status open Rushabh Mehta 2015-04-13 16:56:03 +05:30
  • c712dc6729 [opportunity] status open Rushabh Mehta 2015-04-13 16:51:27 +05:30
  • 99a4d63d97 [opportunity] status open Rushabh Mehta 2015-04-13 16:24:35 +05:30
  • fd0f1cb8b7 [opportunity] not submittable Rushabh Mehta 2015-04-13 16:21:58 +05:30
  • 20bcf6aeff [fixes] print_hide on stock uom and gross profit Rushabh Mehta 2015-04-13 15:31:24 +05:30
  • 39c84fe31c [hot] coa Rushabh Mehta 2015-04-13 12:16:25 +05:30
  • b4c4351513 [report] fix via error report Rushabh Mehta 2015-04-13 11:30:10 +05:30
  • 2437d4cce2 Fix #3046 Customer Acquisition and Loyalty repor Pratik Vyas 2015-04-10 12:35:43 +05:30
  • 950bf72471 Merge pull request #3087 from pdvyas/lang Pratik Vyas 2015-04-10 10:29:54 +05:30
  • 7f8cc32d38 update translations Pratik Vyas 2015-04-09 09:50:38 +05:30
  • a0630671da [hotfix] batch query Anand Doshi 2015-04-09 13:34:57 +05:30
  • 9490d9dee3 Merge branch 'v4.x.x' Pratik Vyas 2015-04-09 13:16:47 +05:30
  • c95e4e89d5 bumped to version 4.24.4 Pratik Vyas 2015-04-09 12:56:05 +06:00
  • b362bb076d Merge pull request #3083 from nabinhait/v4.x.x Nabin Hait 2015-04-09 11:50:19 +05:30
  • 031b1251cf Merge branch 'anandpdoshi-anand-mar-30' into v4.x.x Nabin Hait 2015-04-09 11:42:47 +05:30
  • 4642d0697e fixed conflict Nabin Hait 2015-04-09 11:42:24 +05:30
  • 4f0231e34b Merge pull request #3075 from nabinhait/v4.x.x Nabin Hait 2015-04-09 11:22:20 +05:30
  • 00a07de426 fixed test earning type Anand Doshi 2015-04-08 21:49:11 +05:30
  • c994647704 fixed test cases Anand Doshi 2015-04-08 21:22:08 +05:30
  • 2f87fb41fa Merge pull request #3069 from neilLasrado/dob Anand Doshi 2015-04-08 13:25:01 +05:30
  • 2a29e53cb2 Update README.md Prasad Ajinkya 2015-04-08 13:24:25 +05:30
  • a1a3468704 Merge pull request #3068 from neilLasrado/leaves Anand Doshi 2015-04-08 13:20:18 +05:30
  • 519f0f8b0c Merge pull request #2966 from neilLasrado/HR Anand Doshi 2015-04-08 13:06:36 +05:30
  • 4b29ccc2b0 Salary Structure - Earnings made mandatory Neil Trini Lasrado 2015-04-06 16:27:07 +05:30
  • 4ba4d9dbef fix - update button didnt work in leave allocation after submit Neil Trini Lasrado 2015-04-06 16:16:32 +05:30
  • 20f0ef2515 validation added - dob cannot accept a future date Neil Trini Lasrado 2015-04-06 15:07:31 +05:30