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

Commit Graph

  • 29a8a93aa1 Run guardian patch only if student doctype exists and there is father_name column Nabin Hait 2016-08-01 17:31:17 +05:30
  • 53133dbd4d Merge branch 'develop' Nabin Hait 2016-08-01 16:24:53 +05:30
  • cd339b2ecf bumped to version 7.0.13 Nabin Hait 2016-08-01 16:54:53 +06:00
  • c9d04ab1fc Merge pull request #5952 from nabinhait/lcv_reference Nabin Hait 2016-08-01 16:23:33 +05:30
  • 6f84026c24 Merge pull request #5951 from nabinhait/patch_fix_104 Nabin Hait 2016-08-01 16:15:47 +05:30
  • 24f45af27e [fix] minor dont make lead for invalid email Rushabh Mehta 2016-08-01 16:06:54 +05:30
  • 3c364dd5b8 [patch] Update refdoc in Landed Cost Voucher Nabin Hait 2016-08-01 15:52:29 +05:30
  • 185110159e Merge pull request #5828 from neilLasrado/guardian Rushabh Mehta 2016-08-01 15:36:48 +05:30
  • 5940dc1a8e [patch] Reload RFQ and timesheet before removing customer/supplier roles Nabin Hait 2016-08-01 15:30:38 +05:30
  • 3e78558357 Moved Intrest to HR module Neil Trini Lasrado 2016-08-01 15:18:36 +05:30
  • 74dbd168c2 [new Feature] Added guardian master Neil Trini Lasrado 2016-07-22 01:17:39 +05:30
  • 1d7bd0efb8 Merge branch 'develop' Nabin Hait 2016-08-01 14:12:47 +05:30
  • de745e1df6 bumped to version 7.0.12 Nabin Hait 2016-08-01 14:42:47 +06:00
  • 77dd190cc8 Merge pull request #5939 from rohitwaghchaure/pos_batch_no_fixes Nabin Hait 2016-08-01 13:17:00 +05:30
  • ddde4bec39 Merge pull request #5932 from rohitwaghchaure/demo_records Nabin Hait 2016-08-01 13:11:54 +05:30
  • 9ed1891440 Merge pull request #5931 from neilLasrado/student-log Nabin Hait 2016-08-01 13:10:19 +05:30
  • dfcf55d010 Merge pull request #5948 from nabinhait/department_role Nabin Hait 2016-08-01 13:07:02 +05:30
  • 66126ffc7a Merge pull request #5938 from nabinhait/salary_renaming Nabin Hait 2016-08-01 13:06:52 +05:30
  • 7c52d09dc2 Merge pull request #5947 from nabinhait/patch_order_fix Nabin Hait 2016-08-01 13:06:13 +05:30
  • a88dec8775 [Fix] batch no searching in pos Rohit Waghchaure 2016-07-30 16:49:48 +05:30
  • 86a477d07e Assigned permissions for Academic User role in Department Nabin Hait 2016-08-01 12:51:04 +05:30
  • bc691dccba Changed the order of the patch Nabin Hait 2016-08-01 12:36:28 +05:30
  • e9674f8866 Create columns for custom fields in new table Salary Detail and Component Nabin Hait 2016-08-01 12:13:11 +05:30
  • 84306ccc4c Salary component fixtures Nabin Hait 2016-07-30 20:10:00 +05:30
  • feed313a66 Delete old salary earning and deduction doctypes Nabin Hait 2016-07-30 15:58:06 +05:30
  • 62658fde45 Merge pull request #5941 from nabinhait/link_formatter Rushabh Mehta 2016-08-01 10:28:48 +05:30
  • 981f6ea34e minor fix for item and employee link formatter Nabin Hait 2016-07-31 11:44:43 +05:30
  • ba1c34eef3 Merge pull request #5919 from bcornwellmott/timesheet_dates Nabin Hait 2016-07-29 20:31:01 +05:30
  • 3e001b5fac Merge branch 'develop' Rushabh Mehta 2016-07-29 18:55:48 +05:30
  • 6201068f8f bumped to version 7.0.11 Rushabh Mehta 2016-07-29 19:25:48 +06:00
  • 9421a109cf [fix] reports template Rushabh Mehta 2016-07-29 18:51:52 +05:30
  • 26005c25b2 [minor] fix filter for item-code Rushabh Mehta 2016-07-28 15:36:11 +05:30
  • 180e43585f [minor] formatter for item and employee Rushabh Mehta 2016-07-26 17:57:42 +05:30
  • 05cc36a864 [demo] sales and purchase returns Rohit Waghchaure 2016-07-29 18:25:40 +05:30
  • 1e5c251ce2 [new feature] Added Student Log Neil Trini Lasrado 2016-07-29 13:11:39 +05:30
  • 95c2ba9736 Merge pull request #5901 from bcornwellmott/fix_employee_lookup Nabin Hait 2016-07-29 16:28:18 +05:30
  • 69e0441041 Merge pull request #5930 from KanchanChauhan/demo-data-for-leave-attendance Nabin Hait 2016-07-29 16:20:29 +05:30
  • db0e57cdce Demo data for Leave Allocation, Leave Application and Attendance Kanchan Chauhan 2016-07-29 15:59:39 +05:30
  • 51a593b0b5 Merge pull request #5918 from revant/patch-1 Rushabh Mehta 2016-07-29 07:50:55 +05:30
  • cc8fb1a8d6 changed path to login Revant Nandgaonkar 2016-07-28 19:50:15 +05:30
  • 07e5758a94 Timesheets update on date changes in Salary Slip Ben Cornwell-Mott 2016-07-26 21:00:43 -07:00
  • 1892520324 Merge branch 'develop' Nabin Hait 2016-07-28 18:26:23 +05:30
  • 3bf486c5c6 bumped to version 7.0.10 Nabin Hait 2016-07-28 18:56:23 +06:00
  • 6b8024a834 Merge pull request #5909 from nabinhait/fix_113 Nabin Hait 2016-07-28 17:52:02 +05:30
  • 33b10a0405 Merge pull request #5908 from nabinhait/pe_precision_fix Nabin Hait 2016-07-28 17:51:57 +05:30
  • 7bae70a993 [fix] Show supplier name field if it is different from supplier id Nabin Hait 2016-07-28 17:19:35 +05:30
  • e7d0639edc Set difference amount in Payment Entry as per field precision Nabin Hait 2016-07-28 16:56:46 +05:30
  • 0d5e208f8c Merge branch 'develop' Nabin Hait 2016-07-28 16:01:00 +05:30
  • a163299991 bumped to version 7.0.9 Nabin Hait 2016-07-28 16:31:00 +06:00
  • acff41ddd2 Merge pull request #5906 from nabinhait/opportunity_status_fix Nabin Hait 2016-07-28 15:59:43 +05:30
  • e72ff9377a Added converted status in Opportunity Nabin Hait 2016-07-28 15:59:12 +05:30
  • a948407460 Merge branch 'develop' Nabin Hait 2016-07-28 15:46:36 +05:30
  • ee70f26131 bumped to version 7.0.8 Nabin Hait 2016-07-28 16:16:35 +06:00
  • 142b6187b3 Merge pull request #5902 from akshay83/develop Rushabh Mehta 2016-07-28 15:05:04 +05:30
  • 14384c2787 [fix] serial no button akshay 2016-07-28 13:53:17 +05:30
  • 7357902802 Merge pull request #5896 from nabinhait/fix_112 Nabin Hait 2016-07-27 17:34:23 +05:30
  • fa97b3cac7 [fix] repost gle only if there is any stock account without warehouse Nabin Hait 2016-07-27 17:33:22 +05:30
  • 95f53cca44 Merge pull request #5885 from nabinhait/payment_entry_fix12 Nabin Hait 2016-07-27 16:45:20 +05:30
  • 949ceb18fc Merge pull request #5894 from nabinhait/sle_fix_101 Nabin Hait 2016-07-27 16:44:54 +05:30
  • 7590b8fff1 minor fix for stock ledger entry Nabin Hait 2016-07-27 16:44:17 +05:30
  • 5a8b7ca7be Merge pull request #5888 from neilLasrado/develop Rushabh Mehta 2016-07-27 16:03:21 +05:30
  • 98151ce5b2 [Patch] Change status in Opportunity to Quotation where status is converted Neil Trini Lasrado 2016-07-27 15:58:16 +05:30
  • 380dbb044f Merge pull request #5886 from neilLasrado/develop Rushabh Mehta 2016-07-27 15:32:26 +05:30
  • ee75d41da0 [Fix] Fixed issues in Fee records Neil Trini Lasrado 2016-07-27 15:23:03 +05:30
  • 2a2346422d [fix] Set amounts only if party and bank account exists Nabin Hait 2016-07-27 13:07:52 +05:30
  • e326ae95ef Fixed typo Ben Cornwell-Mott 2016-07-26 19:55:09 -07:00
  • 5f59a0a00f Corrected SQL query bcornwellmott 2016-07-28 06:56:20 -07:00
  • 19cb34ce40 removed test variable Ben Cornwell-Mott 2016-07-26 13:48:36 -07:00
  • 5342ec5055 Added employee name to get_employee_list query Ben Cornwell-Mott 2016-07-26 13:47:55 -07:00
  • e26a42dc7a Merge branch 'develop' Rushabh Mehta 2016-07-27 15:19:58 +05:30
  • b2c9848886 bumped to version 7.0.7 Rushabh Mehta 2016-07-27 15:49:58 +06:00
  • b4bf757a15 Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py Nabin Hait 2016-07-27 15:19:12 +05:30
  • fc49c2c5f9 Merge branch 'develop' Rushabh Mehta 2016-07-27 15:09:03 +05:30
  • 384f0b18c0 bumped to version 7.0.6 Rushabh Mehta 2016-07-27 15:39:03 +06:00
  • 548ea777a9 Merge pull request #5883 from saurabh6790/maintenance_schedule_fix Rushabh Mehta 2016-07-27 12:43:41 +05:30
  • 67047fbb06 Merge branch 'rohitwaghchaure-warehouse_blank_issue_for_non_stock_account' into develop Nabin Hait 2016-07-27 12:43:25 +05:30
  • 10007ab4df [fix] reposting of gle where stock account not linked with warehouse Nabin Hait 2016-07-27 12:43:02 +05:30
  • 444bedcd20 Merge branch 'warehouse_blank_issue_for_non_stock_account' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-warehouse_blank_issue_for_non_stock_account Nabin Hait 2016-07-27 12:33:10 +05:30
  • 2af5dfa9cc Merge pull request #5884 from saurabh6790/schools_fix Rushabh Mehta 2016-07-27 12:23:22 +05:30
  • 4bc0f7d105 [minor][fix] rename attribute from amount to components Saurabh 2016-07-27 12:10:21 +05:30
  • 3642f987c7 [fix] report filter fix Saurabh 2016-07-27 11:42:38 +05:30
  • fd288f36ec Merge pull request #5880 from bcornwellmott/fixSalarySlip_TimeSheet_SQL Rushabh Mehta 2016-07-27 08:22:29 +05:30
  • 593d2e3146 Merge pull request #5877 from rohitwaghchaure/v7_fixes Rushabh Mehta 2016-07-26 21:21:45 +05:30
  • c4afd63e50 [minor] Fixes Rohit Waghchaure 2016-07-26 20:47:42 +05:30
  • 4d3e8da4a2 [Fix] Set warehouse to stock account and fixed gl entries against transactions. Rohit Waghchaure 2016-07-26 16:45:35 +05:30
  • d4d1f1b036 Added date filters for the Timesheet query in Salary Slip Ben Cornwell-Mott 2016-07-26 03:33:38 -07:00
  • 6fe4a336f1 Merge branch 'develop' Rushabh Mehta 2016-07-26 18:02:38 +05:30
  • 154be9b693 bumped to version 7.0.5 Rushabh Mehta 2016-07-26 18:32:38 +06:00
  • d46235ed83 Merge pull request #5874 from saurabh6790/maintenance_schedule_fix Rushabh Mehta 2016-07-26 17:44:42 +05:30
  • 17a9940f00 [minor][fix] end date should not be less or equal to start date Saurabh 2016-07-26 17:18:45 +05:30
  • 9b542f303c Merge pull request #5870 from saurabh6790/fee_component_patch_fix Rushabh Mehta 2016-07-26 15:06:56 +05:30
  • 21a5658fdf [fix] fee component rename patch fix Saurabh 2016-07-26 15:03:41 +05:30
  • 0540d52449 Merge pull request #5868 from rohitwaghchaure/patch_issue Rushabh Mehta 2016-07-26 12:59:00 +05:30
  • 8a9daece7e [Fix] Timesheet patch Rohit Waghchaure 2016-07-26 12:57:05 +05:30
  • c85aa3d9c5 Merge branch 'develop' Rushabh Mehta 2016-07-26 09:24:00 +05:30
  • 5662ad6d96 bumped to version 7.0.4 Rushabh Mehta 2016-07-26 09:54:00 +06:00
  • 859843687e [minor] add abbr if missing Rushabh Mehta 2016-07-26 08:23:17 +05:30
  • 40cf3db0b1 Merge pull request #5865 from rohitwaghchaure/v7_fixes_and_cleanup Rushabh Mehta 2016-07-26 07:58:03 +05:30
  • 590d2d524b Updated html file to use c3.js instead of Google Charts Ben Cornwell-Mott 2016-07-25 18:03:01 -07:00
  • 26cf01aaba [mionr] fixes and cleanups Rohit Waghchaure 2016-07-22 13:24:33 +05:30