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

Commit Graph

  • 3126c88da2 Merge pull request #6658 from nabinhait/develop Nabin Hait 2016-10-20 12:40:03 +05:30
  • 97fa119b37 Set prefered contact email in Employee Nabin Hait 2016-10-19 17:43:51 +05:30
  • 0702fa2fc6 Fixed version conflict Nabin Hait 2016-10-19 16:49:36 +05:30
  • d5e52bc251 Merge branch 'hotfix' Nabin Hait 2016-10-19 16:48:05 +05:30
  • 13a07c2029 bumped to version 7.0.62 Nabin Hait 2016-10-19 17:18:04 +06:00
  • 9ef4f0dc30 Merge pull request #6640 from rohitwaghchaure/item_projected_qty_issue Nabin Hait 2016-10-19 16:45:28 +05:30
  • aa8abfa5b3 Test cases added in sales order to check total projected qty Rohit Waghchaure 2016-10-19 15:26:10 +05:30
  • ac9172f6df [Fix] total projected qty Rohit Waghchaure 2016-10-18 17:22:56 +05:30
  • 44b4e5eef3 Merge pull request #6648 from saurabh6790/hotfix Nabin Hait 2016-10-19 15:05:11 +05:30
  • ff183eedb9 Fixes for testcases Nabin Hait 2016-10-19 13:03:49 +05:30
  • 184f6d42cc Merge pull request #6647 from netchampfaris/hotfix Nabin Hait 2016-10-19 13:05:04 +05:30
  • afceac620c [fix] calculate variance only for submitted budgets Saurabh 2016-10-19 12:49:37 +05:30
  • 2acbb11923 [fix] print format image size Faris Ansari 2016-10-19 12:07:23 +05:30
  • 2b03d8f696 Merge pull request #6641 from JayVora-SerpentCS/develop Nabin Hait 2016-10-19 10:47:01 +05:30
  • a7a3a497d5 Fixed version conflict Nabin Hait 2016-10-18 18:35:42 +05:30
  • b33695138c Merge branch 'hotfix' Nabin Hait 2016-10-18 18:35:18 +05:30
  • 8872842edf bumped to version 7.0.61 Nabin Hait 2016-10-18 19:05:18 +06:00
  • 7791ed845f [hot] [fix] student_dashboard.py Rushabh Mehta 2016-10-18 18:32:53 +05:30
  • a943ec8ff5 Merge pull request #6642 from neilLasrado/develop Nabin Hait 2016-10-18 18:16:29 +05:30
  • 377da58378 Set Student Name in Program Enrollment Neil Trini Lasrado 2016-10-18 18:11:52 +05:30
  • 8b231f7256 Pythonic corrections Serpent Consulting Services Pvt Ltd 2016-10-18 17:30:24 +05:30
  • 6cb44133c3 Fixed version conflict Nabin Hait 2016-10-18 16:18:34 +05:30
  • 498cc1b7e1 Merge branch 'hotfix' Nabin Hait 2016-10-18 16:18:17 +05:30
  • 170b0cc83c bumped to version 7.0.60 Nabin Hait 2016-10-18 16:48:17 +06:00
  • d5c4a5c802 Hotfix Nabin Hait 2016-10-18 16:17:37 +05:30
  • fa1cdd5bf0 Fixed merge conflict Nabin Hait 2016-10-18 15:37:33 +05:30
  • a1099d28b8 Merge branch 'hotfix' Nabin Hait 2016-10-18 15:25:31 +05:30
  • 7b9e8368ea bumped to version 7.0.59 Nabin Hait 2016-10-18 15:55:31 +06:00
  • f32547a414 Merge pull request #6637 from nabinhait/cost_center_fix Nabin Hait 2016-10-18 15:18:17 +05:30
  • 17f6874450 [minor] [fix] doctype_dasboard.py files, move data to get_data Rushabh Mehta 2016-10-18 14:54:39 +05:30
  • 55a8797919 Set cost center while creating invoice from SO/PO Nabin Hait 2016-10-18 14:54:17 +05:30
  • 8b3dd8fdf2 Changed nationality in student master from link to data field Neil Trini Lasrado 2016-10-18 12:55:12 +05:30
  • 2dcee15e50 Merge pull request #6634 from KanchanChauhan/employee-patch-fixed Nabin Hait 2016-10-18 12:14:16 +05:30
  • dc86964e91 Patch fixed for Employee Kanchan Chauhan 2016-10-18 11:29:41 +05:30
  • f5be103d57 Merge branch 'RobertSchouten-pref_email' into develop Nabin Hait 2016-10-17 17:43:10 +05:30
  • b3b1219109 Fixed merge conflict Nabin Hait 2016-10-17 17:42:53 +05:30
  • fcd10f2e08 Merge pull request #6335 from RobertSchouten/stock_entry Nabin Hait 2016-10-17 17:39:57 +05:30
  • e5eed00aa5 Update stock_entry.py Nabin Hait 2016-10-17 17:37:35 +05:30
  • 1a96cc1e8d Fixes 6171 (#6417) Pawan Mehta 2016-10-17 17:02:12 +05:30
  • 81581c669f No Leave allocation for Leave Type for which Leave Without Pay is checked (#6626) KanchanChauhan 2016-10-17 17:01:29 +05:30
  • 5ea16640fe Merge branch 'RobertSchouten-unclosed_finance1' into develop Nabin Hait 2016-10-17 16:58:25 +05:30
  • 437b32d32c Added filter to show unclosed fiscal year's P&L balances in trail balance Nabin Hait 2016-10-17 16:57:52 +05:30
  • 425bdee0ec Merge branch 'unclosed_finance' of https://github.com/RobertSchouten/erpnext into RobertSchouten-unclosed_finance1 Nabin Hait 2016-10-17 16:46:54 +05:30
  • c48ad8430f Merge branch 'KanchanChauhan-process-payroll-changes' into develop Nabin Hait 2016-10-17 16:43:06 +05:30
  • 395d757c5a Fixed merge conflict Nabin Hait 2016-10-17 16:42:49 +05:30
  • 9cb69ca0e3 Posting Date cannot be future date (#6628) KanchanChauhan 2016-10-17 16:40:16 +05:30
  • 048ee48475 [fix] #6573 Material Request Required Date auto set (#6627) Saurabh 2016-10-17 16:24:20 +05:30
  • e1416c3dda Update sales-invoice.md frappe/erpnext#6507 (#6629) Faris Ansari 2016-10-17 16:22:43 +05:30
  • 401be3f49b Merge pull request #6577 from PawanMeh/fixes_6566 Nabin Hait 2016-10-16 14:28:26 +05:30
  • a9ce406c48 Merge pull request #6579 from PawanMeh/fixes_6567 Nabin Hait 2016-10-16 14:28:00 +05:30
  • 0b1b8afc3c Merge pull request #6611 from nabinhait/hotfix Nabin Hait 2016-10-16 14:25:28 +05:30
  • e040510545 Always calculate additional discount amount if percentage is mentioned Nabin Hait 2016-10-13 12:14:32 +05:30
  • b62ed7a603 [fix] install issue Rushabh Mehta 2016-10-13 11:00:00 +05:30
  • 257bbbe588 [refactor] has_website_permission parameters Rushabh Mehta 2016-10-12 10:31:08 +05:30
  • bb7308bbc1 [fix] email digest date range starting with opening balance of day one not closing (#6524) RobertSchouten 2016-10-10 19:47:39 +08:00
  • afa14fc402 [fix][minor] (#6449) Saurabh 2016-10-10 17:17:17 +05:30
  • 1765259043 Merge pull request #6591 from vrms/patch-4 Nabin Hait 2016-10-10 17:12:58 +05:30
  • efd7c3e22b Merge pull request #6592 from rohitwaghchaure/production_planning_issue Nabin Hait 2016-10-10 17:10:49 +05:30
  • 2757d8ef03 [minor] [perm] allow owner to read student applicant Rushabh Mehta 2016-10-10 16:46:10 +05:30
  • 8e881cc7b9 [Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order Rohit Waghchaure 2016-10-10 14:58:33 +05:30
  • a0608d463a [gantt] Gantt fixes (#6490) Faris Ansari 2016-10-10 14:32:35 +05:30
  • e4e8bfae9f Update managing-fixed-assets.md vrms 2016-10-10 15:33:27 +08:00
  • fc90758932 Merge pull request #6589 from rohitwaghchaure/purchase_invoice_validation_issue Nabin Hait 2016-10-10 11:51:00 +05:30
  • 1ca7a27b2f Merge pull request #6587 from rohitwaghchaure/pos_wildcard_search_issue Nabin Hait 2016-10-10 11:50:01 +05:30
  • 3485d2467a [Fix] Purchase invoice validation issue Rohit Waghchaure 2016-10-09 18:05:17 +05:30
  • 6f33dfbc56 [Fix] wildcard search for pos not working Rohit Waghchaure 2016-10-09 15:32:56 +05:30
  • ac5b193100 [minor] direct student admission to the list page Rushabh Mehta 2016-10-09 15:04:04 +05:30
  • 8d62af627a Update fiscal-year.md Pawan Mehta 2016-10-09 09:20:12 +05:30
  • 1c0ecede06 [fix] #6567 pawan 2016-10-09 09:06:49 +05:30
  • 896c731a46 [fix] #6566 pawan 2016-10-09 08:44:40 +05:30
  • 05790d1b38 [fix] #6566 pawan 2016-10-09 08:30:29 +05:30
  • 5655ce936b [fix] #6567 pawan 2016-10-08 08:01:32 +05:30
  • 361739ffb6 [fix #6566] pawan 2016-10-07 18:57:31 +05:30
  • fc2a9e64fc Fixed version conflict Nabin Hait 2016-10-07 17:09:28 +05:30
  • 8fa2a04024 Merge branch 'hotfix' Nabin Hait 2016-10-07 17:08:57 +05:30
  • 89326b366d bumped to version 7.0.58 Nabin Hait 2016-10-07 17:38:57 +06:00
  • 6aaa7d7742 Added missing file extension Nabin Hait 2016-10-07 17:07:47 +05:30
  • df61513037 Fixed merge conflict Nabin Hait 2016-10-07 17:05:00 +05:30
  • 05ba967a45 Merge branch 'hotfix' Nabin Hait 2016-10-07 17:04:36 +05:30
  • d17bbdeb4d bumped to version 7.0.57 Nabin Hait 2016-10-07 17:34:35 +06:00
  • 2f3a68b8d6 Added missing file extension Nabin Hait 2016-10-07 17:03:37 +05:30
  • cd9c45f816 Fixed merge conflict Nabin Hait 2016-10-07 16:53:07 +05:30
  • f69edb3fa3 Merge branch 'hotfix' Nabin Hait 2016-10-07 16:47:17 +05:30
  • 06195de812 bumped to version 7.0.56 Nabin Hait 2016-10-07 17:17:17 +06:00
  • ad8218e5ac minor fix Nabin Hait 2016-10-07 16:39:30 +05:30
  • 9bfef84545 Merge branch 'notification-center' of https://github.com/shreyasp/erpnext into shreyasp-notification-center Nabin Hait 2016-10-07 16:37:10 +05:30
  • cf8438d153 Delete patches.txt Nabin Hait 2016-10-07 16:11:21 +05:30
  • 81754954cb Update update_timesheet_communications Nabin Hait 2016-10-07 16:08:44 +05:30
  • 2907881dfb Update update_timesheet_communications Nabin Hait 2016-10-07 16:07:11 +05:30
  • 0799969063 Update set_portal_settings.py Nabin Hait 2016-10-07 14:55:17 +05:30
  • 20e96b77bd Update set_portal_settings.py Nabin Hait 2016-10-07 14:54:28 +05:30
  • c1b7104126 [Fix] Minor changes to logic shreyas 2016-10-07 14:20:51 +05:30
  • ee25cf7ead Merge branch 'rohitwaghchaure-sales_order_status_issue' into hotfix Nabin Hait 2016-10-07 14:16:36 +05:30
  • 2f75b7b42e Fixed merge conflict Nabin Hait 2016-10-07 14:16:17 +05:30
  • 1915214518 Merge pull request #6576 from rohitwaghchaure/item_rename_issue Nabin Hait 2016-10-07 14:11:49 +05:30
  • eb08d632b3 Merge pull request #6565 from saurabh6790/warehouse_group_account_rename_fix Nabin Hait 2016-10-07 14:11:14 +05:30
  • 770d04e633 [Fix] sales order status showing completed, while it's status was to bill Rohit Waghchaure 2016-10-05 23:02:15 +05:30
  • 022d87969d [Fix] Issue in merging duplicate item Rohit Waghchaure 2016-10-07 13:40:29 +05:30
  • a1d7646e70 [Fix] Allow user to save Notification Control without selecting transaction shreyas 2016-10-07 12:58:58 +05:30
  • bd2a1c3553 Merge pull request #6572 from RobertSchouten/patch-33 Nabin Hait 2016-10-07 12:54:54 +05:30