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

Commit Graph

  • 64e0d16e6d Merge pull request #6141 from frappe/revert-6140-timesheet_patch_fix Nabin Hait 2016-08-22 14:36:55 +05:30
  • 5c9a2b39bc Revert "Ignore validating mandatory fields on converting timelogs to timesheets" Nabin Hait 2016-08-22 14:36:33 +05:30
  • 1b9f8006c2 Merge pull request #6140 from nabinhait/timesheet_patch_fix Nabin Hait 2016-08-22 14:36:08 +05:30
  • 9239ed5c44 Ignore validating mandatory fields on converting timelogs to timesheets Nabin Hait 2016-08-22 12:59:28 +05:30
  • 851e05672c [fix] #6089 pawan 2016-08-22 14:14:52 +05:30
  • 17824c74cf Merge pull request #6135 from KanchanChauhan/minor-salary-fixes Nabin Hait 2016-08-22 12:12:02 +05:30
  • 681a86d70e [Minor]Fixes Kanchan Chauhan 2016-08-22 00:28:20 +05:30
  • 26b646f8a3 Added validation for fiscal year Rohit Waghchaure 2016-08-21 17:14:12 +05:30
  • db197d593a Demo updated for new salary structure Kanchan Chauhan 2016-08-20 00:30:59 +05:30
  • 713e2b7b62 [POS] Fixed issue of paid amount, write off account Rohit Waghchaure 2016-08-19 15:11:36 +05:30
  • 4275c30059 [Enhancement] Multi year financial statements Rohit Waghchaure 2016-08-19 11:48:58 +05:30
  • 3b6dc141c6 [fix] Repost only distinct purchase receipts and invoices Nabin Hait 2016-08-19 16:39:33 +05:30
  • 4cda566139 Merge pull request #6120 from KanchanChauhan/images-for-salary-doc Nabin Hait 2016-08-19 12:50:25 +05:30
  • 3769996dfd Images for redesigned salary docs Kanchan Chauhan 2016-08-18 23:06:16 +05:30
  • 6b3706aef8 Update move_employee_parent_to_child_in_salary_structure.py Nabin Hait 2016-08-18 17:32:53 +05:30
  • 69349f2672 [fix] [patch] column conversion before item reload Rushabh Mehta 2016-08-18 17:06:36 +05:30
  • b5951b72f3 Merge pull request #5924 from KanchanChauhan/salary-structure-changes Nabin Hait 2016-08-18 16:39:58 +05:30
  • e4fb7b1b2f Merge branch 'hotfix' Nabin Hait 2016-08-18 16:15:49 +05:30
  • 9a1bcac576 bumped to version 7.0.31 Nabin Hait 2016-08-18 16:45:49 +06:00
  • e68b089187 Query for warehouse in delivery note Nabin Hait 2016-08-18 16:13:59 +05:30
  • d8a372587d [fix] Legend in support analytics chart Nabin Hait 2016-08-18 15:25:47 +05:30
  • f04ce3c5a6 [fix] check expense agaist budget Nabin Hait 2016-08-18 15:08:22 +05:30
  • 50f8262ac7 Currency fix in reports Nabin Hait 2016-08-17 18:24:30 +05:30
  • e30fadc661 Merge branch 'develop' Nabin Hait 2016-08-18 16:13:15 +05:30
  • f0937bf722 bumped to version 7.0.30 Nabin Hait 2016-08-18 16:43:15 +06:00
  • 4810831678 Merge pull request #6107 from neilLasrado/develop Nabin Hait 2016-08-18 14:21:11 +05:30
  • 7cdc6fd789 Merge pull request #6115 from rohitwaghchaure/pos_stock_update_issue Nabin Hait 2016-08-18 14:20:26 +05:30
  • 03e5ea3a0d Merge pull request #6114 from hereabdulla/patch-1 Rushabh Mehta 2016-08-18 14:05:58 +05:30
  • 9d5a07d101 [POS] Fixed stock update issue Rohit Waghchaure 2016-08-18 13:25:12 +05:30
  • bccf0fa041 [WIP] Formula based Salary Structure and multiple employees for same Salary Structure Kanchan Chauhan 2016-07-29 12:56:30 +05:30
  • b7bc6bd75d [fix] better message for cost center, fixes #6109 Rushabh Mehta 2016-08-18 12:50:58 +05:30
  • 23a6d05622 Update employee_list.js Abdulla P I 2016-08-18 12:43:19 +05:30
  • b969c2cb60 [minor] budget link in cost center, fixes #6093 Rushabh Mehta 2016-08-18 12:35:58 +05:30
  • a7c98ba0fe More formatting adjustments Ben Cornwell-Mott 2016-08-17 05:56:00 -07:00
  • d5a9d475e7 Adjusted formatting Ben Cornwell-Mott 2016-08-17 05:45:43 -07:00
  • 06bfecea73 Fixed formatting of code and repositioned checkboxes in PPT. Ben Cornwell-Mott 2016-08-17 05:42:25 -07:00
  • c4e71fcc51 [Fix] Enroll Students from Student Applicants in Program Enrollment Tool. Neil Trini Lasrado 2016-08-17 17:36:53 +05:30
  • b8a8fb5877 Merge branch 'develop' Nabin Hait 2016-08-17 17:11:09 +05:30
  • 734cf70b43 bumped to version 7.0.29 Nabin Hait 2016-08-17 17:41:09 +06:00
  • 6fe3ac49cf Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount Nabin Hait 2016-08-17 17:08:54 +05:30
  • e4e69ec027 changed field name, validation for change amount account, validation for serial no qty Rohit Waghchaure 2016-08-17 16:20:13 +05:30
  • 386d9e1613 Merge pull request #6106 from nabinhait/item_reload Nabin Hait 2016-08-17 16:16:28 +05:30
  • 40c60b6182 Default material request type field restored Nabin Hait 2016-08-17 16:14:24 +05:30
  • 95c998109d Merge pull request #6043 from aruizramon/purchase-taxes-client-validation Nabin Hait 2016-08-17 12:12:14 +05:30
  • 33bcaa8a07 Merge pull request #6080 from bcornwellmott/quoteditem_picksupplier Nabin Hait 2016-08-17 11:36:55 +05:30
  • 4da2c81641 Merge pull request #6094 from rmehta/sales-purchase-items Nabin Hait 2016-08-17 11:30:37 +05:30
  • c2595aa902 Merge pull request #6099 from nabinhait/patch_fix_for_v6_to_v7_migration Nabin Hait 2016-08-17 11:28:29 +05:30
  • e977fc5dee Upgraded PPT for more variety of MR creation options. Added tests Ben Cornwell-Mott 2016-08-16 06:01:52 -07:00
  • 613ef344f3 Patch fixed for v6 to v7 migration Nabin Hait 2016-08-16 18:31:09 +05:30
  • 0c1be8df35 Merge pull request #6096 from rohitwaghchaure/minor_fix Nabin Hait 2016-08-16 18:17:14 +05:30
  • 815ebafa7b Merge pull request #6092 from umairsy/9aug Nabin Hait 2016-08-16 18:16:28 +05:30
  • 8f7708ed5b docs updated Umair Sayyed 2016-08-16 18:13:12 +05:30
  • 1bd9f22add updated docsgd Umair Sayyed 2016-08-16 17:54:40 +05:30
  • f369b5951e updated docs Umair Sayyed 2016-08-11 17:26:47 +05:30
  • 81995389ac updated docs Umair Sayyed 2016-08-10 19:04:15 +05:30
  • 999f34a568 Updated Docs for Schools Module Neil Trini Lasrado 2016-08-11 11:54:51 +05:30
  • fe913c9969 [Fix] lwp salary structure Rohit Waghchaure 2016-08-16 15:43:50 +05:30
  • 18d6162935 Merge branch 'develop' Nabin Hait 2016-08-16 15:25:34 +05:30
  • 91d6544958 bumped to version 7.0.28 Nabin Hait 2016-08-16 15:55:33 +06:00
  • f640ad4389 Merge pull request #6095 from nabinhait/timesheet_patch Nabin Hait 2016-08-16 15:19:56 +05:30
  • 39bc4b2a4c Ignore overlap validation while creating timesheet from existing time logs Nabin Hait 2016-08-16 15:18:20 +05:30
  • d973c1606a [revert] is_sales_item, is_purchase_item back Rushabh Mehta 2016-08-16 11:32:08 +05:30
  • df9cf2ef8e Merge pull request #6068 from neilLasrado/develop Nabin Hait 2016-08-16 11:01:58 +05:30
  • 528ab53b3a Merge pull request #6067 from rohitwaghchaure/pos_fixes Nabin Hait 2016-08-16 11:00:31 +05:30
  • 9cd356c7f0 [POS] Fixed print qty decimal issue Rohit Waghchaure 2016-08-11 16:54:30 +05:30
  • de08639d49 [minor] fixes to patches while moving from v5 Rushabh Mehta 2016-08-16 10:01:38 +05:30
  • 987009bf35 Update quotation.json Neil Trini Lasrado 2016-08-12 16:44:00 +05:30
  • b739dd24b2 Added a button to assist in setting the default_supplier Ben Cornwell-Mott 2016-08-11 19:45:55 -07:00
  • c833cc8432 Merge branch 'develop' Rushabh Mehta 2016-08-12 11:53:08 +05:30
  • 3f22ec9536 bumped to version 7.0.27 Rushabh Mehta 2016-08-12 12:23:08 +06:00
  • d643f2b249 [minor] fixes #6074; Rushabh Mehta 2016-08-12 10:36:59 +05:30
  • c917423b01 Fixed typo in quotation, added image feild in Program Enrollment Neil Trini Lasrado 2016-08-11 18:22:45 +05:30
  • 6a23016f90 Added image feild to guardian Neil Trini Lasrado 2016-08-11 17:28:21 +05:30
  • 730f3e7aba [minor] remove validation #4904 Rushabh Mehta 2016-08-11 17:17:16 +05:30
  • 033ed00c56 [POS] fixed issue of negative stock Rohit Waghchaure 2016-08-11 16:37:29 +05:30
  • 6c0d9579d2 Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue Rushabh Mehta 2016-08-11 10:55:10 +05:30
  • 09fc241d59 Merge pull request #6054 from rohitwaghchaure/purchase_invoice_accounting_issue_for_auto_stock Rushabh Mehta 2016-08-11 10:54:40 +05:30
  • e78ef5f8c8 [Fix] No permission to read DocType for account user in bank reconciliation statement report Rohit Waghchaure 2016-08-11 00:46:15 +05:30
  • 315a5e1b4d [Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined Rohit Waghchaure 2016-08-11 00:35:00 +05:30
  • 7909a30008 Merge branch 'develop' Rushabh Mehta 2016-08-10 19:47:24 +05:30
  • cf80f850bd bumped to version 7.0.26 Rushabh Mehta 2016-08-10 20:17:23 +06:00
  • 36f2d4f81e [fix] patch for schools; Rushabh Mehta 2016-08-10 19:45:59 +05:30
  • a7d92bc8f6 Merge pull request #6050 from rohitwaghchaure/pos_serial_no_search_issue Rushabh Mehta 2016-08-10 18:52:17 +05:30
  • 332729e99e Merge branch 'develop' Rushabh Mehta 2016-08-10 18:19:14 +05:30
  • 18480bdc23 bumped to version 7.0.25 Rushabh Mehta 2016-08-10 18:49:14 +06:00
  • 4b08f9ad1f [fix] patch Rushabh Mehta 2016-08-10 18:17:53 +05:30
  • ea5a32d304 [Fix] Searial no search issue, if serial no is similar with item code Rohit Waghchaure 2016-08-10 17:18:52 +05:30
  • c9501eb460 Merge branch 'develop' Rushabh Mehta 2016-08-10 14:34:39 +05:30
  • d908b99b00 bumped to version 7.0.24 Rushabh Mehta 2016-08-10 15:04:39 +06:00
  • 6646960e31 Merge pull request #6045 from bcornwellmott/quotereportcurrency Rushabh Mehta 2016-08-10 14:26:25 +05:30
  • 185c247286 Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue Rushabh Mehta 2016-08-10 14:25:42 +05:30
  • a56121a342 Merge pull request #6034 from netchampfaris/ui-fixes Rushabh Mehta 2016-08-10 14:24:58 +05:30
  • cc054a5bbc [minor] fix reload for school migrate patch Rushabh Mehta 2016-08-10 14:21:45 +05:30
  • aa12d30d5a Merge pull request #6048 from PawanMeh/fixes_5723 Rushabh Mehta 2016-08-10 14:12:56 +05:30
  • 399a4bf201 [fix] #5723 pawan mehta 2016-08-10 13:17:50 +05:30
  • 70be24d6f0 [Fix] Get account of the mode of payment on sales invoice and pos profile Rohit Waghchaure 2016-08-08 22:54:38 +05:30
  • 6ddbb8820a Merge pull request #6047 from revant/develop Rushabh Mehta 2016-08-10 12:57:53 +05:30
  • 6252e935a0 Merge pull request #5844 from bcornwellmott/quoteditemplot-1 Rushabh Mehta 2016-08-10 12:50:36 +05:30
  • 5bbc68df8b [fix] Issue #6046 group_name replaced with name Revant Nandgaonkar 2016-08-10 11:06:31 +05:30
  • 8bd2487533 semicolon aruizramon 2016-08-09 16:04:45 -04:00