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

Commit Graph

  • df200f305b Redesigned templates. Now all templates must be inside templates/pages templates/generators Rushabh Mehta 2013-12-25 15:19:22 +05:30
  • 9a064e9ced Merge pull request #1233 from nabinhait/hotfix Nabin Hait 2013-12-25 01:01:17 -08:00
  • 9dc1b00d87 Removed country field from Search Fields Nabin Hait 2013-12-25 12:28:54 +05:30
  • 63aa5fd673 [flat discount] implemented flat discount on server side Akhilesh Darjee 2013-12-24 20:30:03 +05:30
  • 3c68488873 Fixes to setup wizard Rushabh Mehta 2013-12-24 18:51:32 +05:30
  • 30fb30cffb Merge pull request #1 from pdvyas/testing Rushabh Mehta 2013-12-24 05:21:21 -08:00
  • 9373ba96d5 Merge branch 'develop' Pratik Vyas 2013-12-24 13:12:21 +05:30
  • a402079cd4 bumped to version 3.3.8 Pratik Vyas 2013-12-24 13:42:21 +06:00
  • 2ca388b0a5 Merge pull request #1232 from nabinhait/hotfix Nabin Hait 2013-12-23 23:29:00 -08:00
  • f437e867fd add travis ci Pratik Vyas 2013-12-24 12:17:59 +05:30
  • 6ebcc5c006 Change parent account of warehouse from inside the warehouse Nabin Hait 2013-12-24 12:14:12 +05:30
  • 6a2edee914 Fixes in general ledger report Nabin Hait 2013-12-24 11:58:05 +05:30
  • de69ad0a48 Merge pull request #1230 from akhileshdarjee/hotfix Nabin Hait 2013-12-23 22:09:13 -08:00
  • 25a4bd02f4 [fix] [minor] update item_name and description in item price Akhilesh Darjee 2013-12-24 11:32:57 +05:30
  • a3d058938e Company mandatory validation while enabling perpetual inventory Nabin Hait 2013-12-24 11:03:04 +05:30
  • 4cae8a0d54 Fixes in stock ledger report Nabin Hait 2013-12-24 10:47:34 +05:30
  • 454b6f9f8a Merge pull request #1229 from nabinhait/hotfix Nabin Hait 2013-12-23 07:05:08 -08:00
  • 9f1b59dfc6 Fixes in sales return validation Nabin Hait 2013-12-23 20:34:09 +05:30
  • 2926651e1c Restrict Employee and Leave Approver to relevant Employee and Leave Application records Anand Doshi 2013-12-23 19:59:29 +05:30
  • 9b67f4344b Patch to migrate allow_print and allow_email to print and email rights of DocPerm Anand Doshi 2013-12-20 19:33:11 +05:30
  • 68852f25b5 Added rights for print and email in DocPerm Anand Doshi 2013-12-20 19:32:25 +05:30
  • 8a436500f0 [refactor] Client-side permission handling Anand Doshi 2013-12-19 19:11:30 +05:30
  • 2298d59b8b [patch] new permission system Anand Doshi 2013-12-17 19:04:08 +05:30
  • 620145c59a [minor] patches for restriction Anand Doshi 2013-12-16 19:28:11 +05:30
  • bcf2422848 [minor] user properties and leave application Anand Doshi 2013-12-13 11:51:50 +05:30
  • 83638b5f05 [minor] move warehouse user to restrictions Anand Doshi 2013-12-09 12:04:49 +05:30
  • 57518fc5f1 [cleanup] [minor] default+cache related Rushabh Mehta 2013-11-27 15:05:52 +05:30
  • fea93d0f65 [cleanup] [minor] added webnotes.model.delete_doc (module) Rushabh Mehta 2013-11-27 14:34:02 +05:30
  • b1ea6b1f66 [permissions] Added Test Cases Rushabh Mehta 2013-11-27 12:39:15 +05:30
  • 497d363fc1 [permission model] Redesign Rushabh Mehta 2013-11-26 17:54:53 +05:30
  • 74f64b67db Merge branch 'develop' Pratik Vyas 2013-12-23 17:31:22 +05:30
  • 2117afba07 bumped to version 3.3.7 Pratik Vyas 2013-12-23 18:01:22 +06:00
  • e409d0d70b Merge pull request #1227 from akhileshdarjee/hotfix Nabin Hait 2013-12-23 03:42:08 -08:00
  • 50125b35d2 Merge pull request #1228 from nabinhait/hotfix Nabin Hait 2013-12-23 03:41:13 -08:00
  • c38527ef5f Show general/stock ledger button links to new query reports Nabin Hait 2013-12-23 17:07:57 +05:30
  • facde47c6c Stock ledger report filter by item and brand Nabin Hait 2013-12-23 17:06:46 +05:30
  • 20dc79ac99 General ledger filter by account group Nabin Hait 2013-12-23 17:06:10 +05:30
  • 61da43f793 [fix] [minor] update modified date and time to item price when updating item and price list Akhilesh Darjee 2013-12-23 16:24:33 +05:30
  • af30c3fdfd [fix] [minor] update item price on change of item details Akhilesh Darjee 2013-12-23 16:13:42 +05:30
  • b63d550a70 Added Applications page and fixed issues in translations and hooks Rushabh Mehta 2013-12-23 16:09:00 +05:30
  • b09dc46e68 [flat discount] first commit Akhilesh Darjee 2013-12-23 15:49:08 +05:30
  • 68888a21ec Merge branch 'develop' Pratik Vyas 2013-12-23 14:41:05 +05:30
  • 7d7661c9ed bumped to version 3.3.6 Pratik Vyas 2013-12-23 15:11:05 +06:00
  • fbda00eef0 Merge pull request #1225 from nabinhait/hotfix Nabin Hait 2013-12-22 22:53:13 -08:00
  • a0212d8014 Fixes in Stock ageing report Nabin Hait 2013-12-23 12:21:14 +05:30
  • c8d2604afc Merge pull request #1224 from nabinhait/hotfix Nabin Hait 2013-12-22 22:50:41 -08:00
  • 861453279d Incoming rate for stock ledger entry should not be rounded Nabin Hait 2013-12-23 12:14:45 +05:30
  • be96600c1c Merge branch 'develop' Pratik Vyas 2013-12-20 15:15:45 +05:30
  • 8709c51e84 bumped to version 3.3.5 Pratik Vyas 2013-12-20 15:45:45 +06:00
  • 6fc0262cb6 Merge pull request #1220 from nabinhait/hotfix Pratik Vyas 2013-12-20 01:36:27 -08:00
  • 4b5ced03ec Fixes in merge functions Nabin Hait 2013-12-20 12:26:48 +05:30
  • a888e29b0a Fixes in stock projected qty report Nabin Hait 2013-12-20 12:18:37 +05:30
  • ae2e8996b0 Merge branch 'develop' Pratik Vyas 2013-12-19 19:18:57 +05:30
  • 1c2bbd77a0 bumped to version 3.3.4 Pratik Vyas 2013-12-19 19:48:56 +06:00
  • 2ffba327ac Merge pull request #1218 from nabinhait/hotfix Nabin Hait 2013-12-19 05:48:07 -08:00
  • 4764f3ea1d Merge pull request #1217 from pdvyas/patch-reload-packed_item Pratik Vyas 2013-12-19 05:46:52 -08:00
  • 104deeebb5 reload packed item in patch, for migration from slow branch Pratik Vyas 2013-12-19 19:16:00 +05:30
  • 2a9e4e9a32 Opening and closing balance in general ledger report Nabin Hait 2013-12-19 19:11:53 +05:30
  • 2b08985e16 Translations redesigned webnotes/wnframework#351 Rushabh Mehta 2013-12-19 18:27:48 +05:30
  • a38a7b8e76 Merge pull request #1214 from anandpdoshi/hotfix-scheduler-errors Pratik Vyas 2013-12-19 01:12:17 -08:00
  • 88eedb7397 Send Email Digest, only if there is atleast one update for selected categories Anand Doshi 2013-12-19 14:07:39 +05:30
  • 605cc93c90 Merge branch 'develop' Pratik Vyas 2013-12-19 11:42:38 +05:30
  • 1644fce273 bumped to version 3.3.3 Pratik Vyas 2013-12-19 12:12:38 +06:00
  • 8cc2bf7fcf Merge pull request #1213 from pdvyas/email-digest-error Pratik Vyas 2013-12-18 22:12:03 -08:00
  • fe6409debf fix company email digest patch Pratik Vyas 2013-12-19 11:41:10 +05:30
  • edc58619d1 Merge pull request #1211 from nabinhait/hotfix Nabin Hait 2013-12-18 21:28:25 -08:00
  • 85800fa929 fixes in item validation Nabin Hait 2013-12-19 10:57:43 +05:30
  • 60ec0128a2 Merge pull request #1205 from akhileshdarjee/master Nabin Hait 2013-12-18 20:03:36 -08:00
  • 90e0700e24 Merge pull request #1208 from nabinhait/hotfix Nabin Hait 2013-12-18 05:46:03 -08:00
  • 48156e3d8b fixes in stock projected qty report Nabin Hait 2013-12-18 18:51:20 +05:30
  • 8b353e5e15 Merge pull request #1207 from nabinhait/hotfix Nabin Hait 2013-12-18 01:24:02 -08:00
  • fcbd4d7638 Removed sales_order_no from no_copy in material request item Nabin Hait 2013-12-18 14:53:36 +05:30
  • 9409efe02a Merge branch 'develop' Pratik Vyas 2013-12-18 14:40:36 +05:30
  • b645a217fd bumped to version 3.3.2 Pratik Vyas 2013-12-18 15:10:36 +06:00
  • ef295d2977 Merge pull request #1203 from anandpdoshi/hotfix-scheduler-errors Pratik Vyas 2013-12-18 01:10:12 -08:00
  • 2d0e31b479 [fix] [minor] merge conflict fixed Akhilesh Darjee 2013-12-18 13:32:37 +05:30
  • 2678ed181a [fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order Akhilesh Darjee 2013-12-18 13:28:40 +05:30
  • 1fce0b1f79 [fix] scheduler error email digest Anand Doshi 2013-12-18 13:22:18 +05:30
  • 649660d9f0 Merge branch 'develop' Pratik Vyas 2013-12-18 12:19:28 +05:30
  • 797e0713ea bumped to version 3.3.1 Pratik Vyas 2013-12-18 12:49:28 +06:00
  • 6a0ffabbd0 Merge pull request #1201 from nabinhait/hotfix Nabin Hait 2013-12-17 21:48:18 -08:00
  • 56f58cfa68 Merge pull request #1202 from anandpdoshi/hotfix-backup-manager Nabin Hait 2013-12-17 21:48:03 -08:00
  • 677ef0c3cf [fix] backup manager Anand Doshi 2013-12-18 10:56:43 +05:30
  • 64367a905a Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2013-12-18 10:42:04 +05:30
  • c565de2c12 Removed schedule_date from no_copy in purchase receipt item Nabin Hait 2013-12-18 10:41:29 +05:30
  • 908f2dc0fd Merge pull request #1200 from anandpdoshi/hotfix-scheduler-errors Nabin Hait 2013-12-17 20:13:56 -08:00
  • 0b1a8e13fd [patch] Email Digest Anand Doshi 2013-12-18 07:53:49 +05:30
  • a1ae0270e3 Merge branch 'develop' Pratik Vyas 2013-12-17 18:03:05 +05:30
  • 4d806c5fcb bumped to version 3.3.0 Pratik Vyas 2013-12-17 18:33:05 +06:00
  • cf6e13d2fe Merge pull request #1148 from nabinhait/reports Anand Doshi 2013-12-17 04:26:36 -08:00
  • ceb940ec17 [reports] [minor] patch to delete old report files Nabin Hait 2013-12-17 17:53:05 +05:30
  • a4080eb840 [fix] [minor] item validation Nabin Hait 2013-12-17 17:45:50 +05:30
  • 90f33c3249 Merge pull request #1196 from nabinhait/hotfix Nabin Hait 2013-12-17 03:20:02 -08:00
  • 592d27e7f1 [reports] general ledger: grid report to script report Nabin Hait 2013-12-17 16:20:11 +05:30
  • 8b7da55617 Merge branch 'develop' of github.com:webnotes/erpnext into reports Nabin Hait 2013-12-17 16:10:06 +05:30
  • 57e89ff6f1 [reports] general ledger: grid report to script report Nabin Hait 2013-12-17 16:09:21 +05:30
  • 8a98fc7e79 Merge pull request #1194 from akhileshdarjee/master Nabin Hait 2013-12-17 01:39:19 -08:00
  • d94bab0e1d [fix] [minor] sql query related changes in purchase common Akhilesh Darjee 2013-12-17 15:05:37 +05:30
  • 9d6e10c910 [fix] [minor] precision in gl entry based on currency format Nabin Hait 2013-12-17 14:45:55 +05:30
  • 9ee20e8f5a [fix] [minor] material request sales order wise through production planning tool Akhilesh Darjee 2013-12-17 13:07:00 +05:30