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

Commit Graph

  • eac602304c Merge pull request #5864 from neilLasrado/rename Rushabh Mehta 2016-07-25 18:37:09 +05:30
  • ce1c63f776 [rename] Renamed Fee Amount to Fee Component Neil Trini Lasrado 2016-07-25 18:24:37 +05:30
  • 95b550dd8f Merge pull request #5862 from neilLasrado/rename Rushabh Mehta 2016-07-25 16:21:32 +05:30
  • bb78f1ac16 Merge pull request #5861 from neilLasrado/develop Rushabh Mehta 2016-07-25 16:21:18 +05:30
  • feea2e3dec [Doctype Rename] Renamed sg_creation_tool_course to Student Group Creation Tool Course Neil Trini Lasrado 2016-07-25 16:13:05 +05:30
  • 7dae3e1ed4 [Fix] fixed test cases for schools Neil Trini Lasrado 2016-07-25 15:54:32 +05:30
  • 5658fdfaed Merge branch 'develop' Rushabh Mehta 2016-07-25 15:45:46 +05:30
  • 1c93dd0591 bumped to version 7.0.3 Rushabh Mehta 2016-07-25 16:15:46 +06:00
  • c910e0c614 [translations] update icenlandic Rushabh Mehta 2016-07-25 15:03:07 +05:30
  • 6c3ac9587e [fix] quick entry Rushabh Mehta 2016-07-25 14:55:59 +05:30
  • 316f78f859 Merge pull request #5858 from bohlian/develop Rushabh Mehta 2016-07-25 14:24:16 +05:30
  • 5b2af6ad40 [Fixed] Stopping and Re-Opening of Production Order Javier Wong 2016-07-25 16:49:39 +08:00
  • 00f7741288 Merge branch 'develop' Rushabh Mehta 2016-07-25 12:58:03 +05:30
  • 3f8428e972 bumped to version 7.0.2 Rushabh Mehta 2016-07-25 13:28:03 +06:00
  • 644a04b378 [fix] translations v7.0 Rushabh Mehta 2016-07-25 12:15:30 +05:30
  • c9478fc4f1 [minor] setup website before domainify Rushabh Mehta 2016-07-25 12:03:26 +05:30
  • 7b13c11182 Merge pull request #5857 from neilLasrado/perm Rushabh Mehta 2016-07-25 11:46:50 +05:30
  • d69d961f2a Removed Administrator role from Doctypes Neil Trini Lasrado 2016-07-25 11:39:23 +05:30
  • cc887900e8 [fix] --yes for reinstall Rushabh Mehta 2016-07-24 22:45:09 +05:30
  • ead3ccfd52 [fix] more routes patch up Rushabh Mehta 2016-07-24 22:28:34 +05:30
  • 84f25b3214 Merge branch 'develop' Rushabh Mehta 2016-07-24 17:17:43 +05:30
  • 581a12c56a bumped to version 7.0.1 Rushabh Mehta 2016-07-24 17:47:43 +06:00
  • cd385c3735 [fix] [minor] email pulling error, via scheduler log Rushabh Mehta 2016-07-24 13:06:08 +05:30
  • 49e17e4590 Merge pull request #5849 from netchampfaris/ui-fixes Rushabh Mehta 2016-07-24 12:47:13 +05:30
  • 0e94785cdd Merge pull request #5846 from rohitwaghchaure/timesheet_patch_issue Rushabh Mehta 2016-07-24 11:52:09 +05:30
  • 8e282c2ed8 [mobile ui] fix pos payment layout #5780 Faris Ansari 2016-07-24 11:36:19 +05:30
  • f027fd0c66 [Fix] Timesheet patch Rohit Waghchaure 2016-07-24 00:38:10 +05:30
  • 71b6494395 Merge pull request #5845 from KanchanChauhan/quotation-fix Rushabh Mehta 2016-07-23 15:16:31 +05:30
  • 39c952a3f2 [Minor Fix] Kanchan Chauhan 2016-07-23 14:39:01 +05:30
  • fe11e71084 Removed hover tooltip Ben Cornwell-Mott 2016-07-22 10:02:41 -07:00
  • 2c76aec119 Added Google Chart to compare quotes in Print view Ben Cornwell-Mott 2016-07-22 09:56:29 -07:00
  • e7399dff2d [fix] homepage patch Rushabh Mehta 2016-07-22 21:00:12 +05:30
  • 29517d0b8c [fix] purchase order dashboard Rushabh Mehta 2016-07-22 13:25:33 +05:30
  • c96263ceb8 Merge pull request #5841 from neilLasrado/student_batch Rushabh Mehta 2016-07-22 19:16:54 +05:30
  • 6cfb60dc98 Minor fixed for Schools Neil Trini Lasrado 2016-07-22 19:05:48 +05:30
  • e8eccf1a49 Merge branch 'develop' Anand Doshi 2016-07-22 16:03:16 +05:30
  • b2e1d54fce bumped to version 7.0.0 Anand Doshi 2016-07-22 16:33:16 +06:00
  • f5c5634235 Merge pull request #5824 from rohitwaghchaure/demo_records Nabin Hait 2016-07-22 15:56:55 +05:30
  • 7d439ecc20 Demo records for Projects+Tasks+Billing, pos invoice Rohit Waghchaure 2016-07-21 14:50:59 +05:30
  • dcefd29e3f Merge pull request #5839 from saurabh6790/payment_request_demo Nabin Hait 2016-07-22 15:53:26 +05:30
  • 5340cadcf9 Merge pull request #5827 from neilLasrado/student_batch Rushabh Mehta 2016-07-22 15:47:48 +05:30
  • f521a9c601 Added Student Batch Neil Trini Lasrado 2016-07-22 01:28:41 +05:30
  • 6e0a00b537 [minor][fix] flag fix for payment entry creation via payment request Saurabh 2016-07-22 15:17:17 +05:30
  • 90c0b7fbea [fix] payment request demo Saurabh 2016-07-22 14:15:03 +05:30
  • e4e8954a19 [fix] make payment request without payment gateway Saurabh 2016-07-21 20:26:46 +05:30
  • 38035c252a Merge pull request #5840 from umairsy/15jul Nabin Hait 2016-07-22 15:36:26 +05:30
  • 6fcfc87d60 Documentation of Timesheet, Budgeting and Payment Entry Umair Sayyed 2016-07-22 15:22:07 +05:30
  • 13e248af8d Merge pull request #5833 from nabinhait/fix_108 Nabin Hait 2016-07-22 13:21:43 +05:30
  • db4aca3eaf Merge pull request #5823 from nabinhait/fix_107 Nabin Hait 2016-07-22 13:17:26 +05:30
  • 2b12a74fef Merge pull request #5822 from nabinhait/fix_106 Nabin Hait 2016-07-22 13:17:04 +05:30
  • 0953aeb731 Merge branch 'master' into develop Nabin Hait 2016-07-22 13:15:53 +05:30
  • 1adb77ee17 Merge branch 'hotfix' Nabin Hait 2016-07-22 12:58:12 +05:30
  • 368a314d48 bumped to version 6.27.26 Nabin Hait 2016-07-22 13:28:12 +06:00
  • 8ecb78ba39 Validate warehouse if update stock checked in Purchase Invoice Nabin Hait 2016-07-22 12:25:09 +05:30
  • 6207883b7c [fix] patch #5831 Rushabh Mehta 2016-07-22 12:20:52 +05:30
  • 04a64a7f48 [fix] patch #5831 Rushabh Mehta 2016-07-22 12:19:18 +05:30
  • f276b52af3 [fix] patch #5831 Rushabh Mehta 2016-07-22 11:31:31 +05:30
  • 0e3e16cda0 Merge pull request #5830 from MaxMorais/patch-6 Rushabh Mehta 2016-07-22 11:10:54 +05:30
  • 428a59f7a1 Merge pull request #5829 from bcornwellmott/quoteitemreport-1 Rushabh Mehta 2016-07-22 11:03:51 +05:30
  • 11900e8fad [fix] make grid editable for schools and fix #5831 Rushabh Mehta 2016-07-22 10:58:56 +05:30
  • 20fc7a1e1e Merge pull request #5826 from rohitwaghchaure/v7_pos_issue Rushabh Mehta 2016-07-22 10:35:06 +05:30
  • 3557261313 Extend search_fields for customer querie Maxwell Morais 2016-07-21 23:42:59 -03:00
  • 99e03f2371 Added new report for Supplier Quotation comparisons Ben Cornwell-Mott 2016-07-21 13:03:58 -07:00
  • ea278b5971 [Fix]POS and timesheet issues Rohit Waghchaure 2016-07-21 23:28:04 +05:30
  • 767cf99435 Update opening stock on creation if item, only if it is non-serialized and does maintain batch Nabin Hait 2016-07-21 18:46:01 +05:30
  • 6889d294ae Merge pull request #5812 from nabinhait/budget_demo Nabin Hait 2016-07-21 18:32:56 +05:30
  • e0cc87d2d8 Unlink payment entries on cancellation of Invoice Nabin Hait 2016-07-21 18:30:03 +05:30
  • d4f3c6b5e7 [fix] schools patch Rushabh Mehta 2016-07-21 18:22:58 +05:30
  • 7e472f898d [fix] setup wizard Rushabh Mehta 2016-07-21 18:01:42 +05:30
  • 39671e22c9 [fix] patch Rushabh Mehta 2016-07-21 17:14:27 +05:30
  • fe7d6932ee [fix] patch Rushabh Mehta 2016-07-21 17:12:47 +05:30
  • 744d77466c Merge pull request #5819 from neilLasrado/develop Rushabh Mehta 2016-07-21 17:00:12 +05:30
  • a537e43838 Fixed patch for migrating schools to erpnext again Neil Trini Lasrado 2016-07-21 16:57:04 +05:30
  • 5f7727424e Merge pull request #5818 from neilLasrado/develop Rushabh Mehta 2016-07-21 16:43:40 +05:30
  • af5e00363a Fixed patch for migrating schools to erpnext Neil Trini Lasrado 2016-07-21 16:41:05 +05:30
  • 137e722af1 Merge pull request #5817 from rmehta/neilLasrado-schools Rushabh Mehta 2016-07-21 16:04:22 +05:30
  • 20038ad2c9 [fixes] setup wizard and domainify for schools; Rushabh Mehta 2016-07-21 16:01:59 +05:30
  • 4a5cc77352 Merge pull request #5816 from rohitwaghchaure/minor_issue Rushabh Mehta 2016-07-21 14:58:49 +05:30
  • 3176bc93c1 [Fix] Timesheet to time issue Rohit Waghchaure 2016-07-21 14:56:15 +05:30
  • 40d4a8d13f Merge pull request #5806 from rohitwaghchaure/stock_entry_difference_amount_issue Nabin Hait 2016-07-21 12:28:20 +05:30
  • 47c64ec728 [Fix] Stock entry differnce amount issue. Rohit Waghchaure 2016-07-20 19:31:51 +05:30
  • 74edfff0a7 Demo data for Budget Nabin Hait 2016-07-21 11:39:46 +05:30
  • cfd9b1a24c Merge pull request #5811 from nabinhait/demo2 Nabin Hait 2016-07-21 11:33:57 +05:30
  • 1606626d29 Demo data for Payment Entry Nabin Hait 2016-07-21 11:00:28 +05:30
  • b0061c9341 Merge branch 'schools' of https://github.com/neilLasrado/erpnext into neilLasrado-schools Rushabh Mehta 2016-07-21 10:46:32 +05:30
  • 26cad30372 Demo data for Payment Entry Nabin Hait 2016-07-21 10:28:54 +05:30
  • 89d0b1b9a5 Merge pull request #5804 from nabinhait/demo1 Nabin Hait 2016-07-21 10:05:00 +05:30
  • ba33026a6b Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue Nabin Hait 2016-07-21 09:39:57 +05:30
  • 5a39d41a0c [redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792 Rushabh Mehta 2016-07-20 22:53:23 +05:30
  • 3f0a581b85 Merge ERPNext Schools into ERPNext Neil Trini Lasrado 2016-07-19 14:17:33 +05:30
  • 39077d4210 [dashboard] for quotation and sales order Rushabh Mehta 2016-07-20 18:55:42 +05:30
  • 61b4a43d84 [Fix] POS auto set paid amount with outstanding amount issue Rohit Waghchaure 2016-07-20 11:21:51 +05:30
  • 3edefb19b9 Demo data for fixed asset depreciation Nabin Hait 2016-07-20 16:13:18 +05:30
  • 649e2538e5 [fix] merge conflict? Rushabh Mehta 2016-07-20 15:30:17 +05:30
  • 2f0dbd9bd8 [fix] test Rushabh Mehta 2016-07-20 15:04:44 +05:30
  • f65b50ea6c Merge pull request #5801 from netchampfaris/ui-fixes Rushabh Mehta 2016-07-20 14:50:25 +05:30
  • 8908d19bc9 [mobile ui] fix buttons Faris Ansari 2016-07-20 13:59:19 +05:30
  • e2d0d7c5db Merge pull request #5799 from nabinhait/fix104 Nabin Hait 2016-07-20 12:38:49 +05:30
  • 430a97aeba Merge pull request #5800 from nabinhait/fix105 Nabin Hait 2016-07-20 12:17:15 +05:30
  • 9a5dc452f1 Patch fixed for expense claim type Nabin Hait 2016-07-20 12:16:35 +05:30