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

Commit Graph

  • 08fb39f1ba Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct' Alec Ruiz-Ramon 2016-08-09 15:38:34 -04:00
  • baef2624a2 Given provision to enter write off and change amount on POS Rohit Waghchaure 2016-08-05 15:41:36 +05:30
  • d217387400 [ui] fix thumbnail for long images in image view Faris Ansari 2016-08-09 14:15:31 +05:30
  • c41ab8d15b Added change amount account Rohit Waghchaure 2016-08-04 15:06:28 +05:30
  • 7127a8f522 Allow user to edit change amount from sales invoice form for is pos Rohit Waghchaure 2016-08-04 14:56:15 +05:30
  • 44f85fed26 Converted to a common currency (company) Ben Cornwell-Mott 2016-08-07 10:29:51 -07:00
  • 88fff46ab4 Merge pull request #6038 from nabinhait/portal_settings_schools Nabin Hait 2016-08-09 17:20:56 +05:30
  • f44b5152d2 Portal settings for schools Nabin Hait 2016-08-09 17:07:59 +05:30
  • ec2d09c557 [minor] setting up website optional in setup wizard Rushabh Mehta 2016-08-09 16:43:15 +05:30
  • 722b22a834 Merge branch 'develop' Nabin Hait 2016-08-09 15:30:32 +05:30
  • 08e2105b09 bumped to version 7.0.23 Nabin Hait 2016-08-09 16:00:31 +06:00
  • 11d565b07c Update migrate_schools_to_erpnext.py Nabin Hait 2016-08-09 15:23:01 +05:30
  • a2c9d13f68 Merge branch 'develop' Nabin Hait 2016-08-09 15:00:16 +05:30
  • 508542d4d9 bumped to version 7.0.22 Nabin Hait 2016-08-09 15:30:16 +06:00
  • 50ff8471e0 Merge pull request #6023 from neilLasrado/docs Nabin Hait 2016-08-09 14:23:48 +05:30
  • 78b8cdc3c1 Merge pull request #6033 from nabinhait/patch_fix_10 Nabin Hait 2016-08-09 14:22:40 +05:30
  • 2275cd15e6 [patch] Reload Purchase Invoice in patch Nabin Hait 2016-08-09 14:21:22 +05:30
  • b9376641af Merge pull request #6031 from nabinhait/patch_fix_9 Nabin Hait 2016-08-09 11:28:48 +05:30
  • ee018b5ae1 [fix]Patch order changed. Fixed #6026 Nabin Hait 2016-08-09 11:27:28 +05:30
  • acf85dffc5 Merged docs for schools to erpnext docs Neil Trini Lasrado 2016-08-08 18:49:49 +05:30
  • 660f3ed0d6 Merge branch 'develop' Nabin Hait 2016-08-08 15:50:00 +05:30
  • d5c83122f2 bumped to version 7.0.21 Nabin Hait 2016-08-08 16:20:00 +06:00
  • 2777f23ace Merge pull request #6019 from nabinhait/pcv_test_case Nabin Hait 2016-08-08 15:45:19 +05:30
  • ae65172dca Added 'Ledger' button to show accounting entries against PCV Nabin Hait 2016-08-08 15:44:35 +05:30
  • d261d40c7e Fixed test cases for period closing voucher Nabin Hait 2016-08-08 14:44:42 +05:30
  • 4b231c2692 Merge pull request #6018 from rohitwaghchaure/add_calendar_to_timesheets Nabin Hait 2016-08-08 14:46:18 +05:30
  • 7e27e32e92 Merge pull request #6017 from nabinhait/repost_future_stock_transactions Nabin Hait 2016-08-08 14:45:17 +05:30
  • ed1b8cfe3f Added a Calendar view for timesheet logs Ben Cornwell-Mott 2016-07-26 06:11:03 -07:00
  • 99d4ff4a29 Repost gle for future transactions if update stock checked in back dated purchase invoice Nabin Hait 2016-08-08 14:12:16 +05:30
  • 595dbd6dea Merge pull request #5963 from neilLasrado/assessment Nabin Hait 2016-08-08 12:50:10 +05:30
  • f979b18ddb Merge pull request #6003 from neilLasrado/bug-fix Nabin Hait 2016-08-08 12:44:27 +05:30
  • 3ef6e7847e Merge pull request #6010 from rohitwaghchaure/minor_fix_pos Nabin Hait 2016-08-08 12:40:28 +05:30
  • 2dba3b5e25 Merge pull request #6012 from bohlian/develop Nabin Hait 2016-08-08 12:40:00 +05:30
  • 2cb8c6a867 Merge pull request #6015 from nabinhait/ar_ap_cols Nabin Hait 2016-08-08 12:37:19 +05:30
  • be3aee973c Merge pull request #6011 from saurabh6790/get_acount_balance_fix Nabin Hait 2016-08-08 12:36:40 +05:30
  • c30c342bdf [fix] Label for ageing cols in AR/AP report Nabin Hait 2016-08-08 11:47:13 +05:30
  • f02a0d4d24 [bug fix] Fixed bug in fee caclulation, renamed functions Neil Trini Lasrado 2016-08-05 15:50:52 +05:30
  • cd6c00d505 [Fix] pos ambiguous issue Rohit Waghchaure 2016-08-07 02:37:10 +05:30
  • e6cd228288 [Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order Javier Wong 2016-08-07 16:01:49 +08:00
  • ec14c81ebd [minor][fix] return if account details not found Saurabh 2016-08-07 08:52:45 +05:30
  • 8793b823af Merge branch 'develop' Nabin Hait 2016-08-06 14:15:34 +05:30
  • 537301a210 bumped to version 7.0.20 Nabin Hait 2016-08-06 14:45:34 +06:00
  • f1d8fc3d51 Merge pull request #6008 from KanchanChauhan/leave-application-validation Nabin Hait 2016-08-06 14:13:46 +05:30
  • 20b4666e89 Merge pull request #5958 from rohitwaghchaure/minor_fixes_and_cleanups Nabin Hait 2016-08-06 14:11:24 +05:30
  • 84969bdb2d Merge pull request #6007 from KanchanChauhan/task-json-fixed Rushabh Mehta 2016-08-06 13:42:50 +05:30
  • 705384d8fe Leave Application Validation for processed salary Kanchan Chauhan 2016-08-06 13:42:18 +05:30
  • 2123e02eda Merge pull request #6005 from revant/patch-2 Rushabh Mehta 2016-08-06 13:40:02 +05:30
  • b77a1057ce fixes and cleanups. Rohit Waghchaure 2016-08-01 18:35:18 +05:30
  • 93b1f2ad72 [Minor] Removed hard coded success URL Kanchan Chauhan 2016-08-06 12:09:08 +05:30
  • 9a433ffca1 [fix] success_url Issue #6004 Revant Nandgaonkar 2016-08-05 21:44:34 +05:30
  • c1162796c5 Merge branch 'develop' Nabin Hait 2016-08-05 16:45:14 +05:30
  • 82446bf83e bumped to version 7.0.19 Nabin Hait 2016-08-05 17:15:14 +06:00
  • c72f8976aa Merge pull request #5989 from umairsy/2aug Nabin Hait 2016-08-05 15:50:34 +05:30
  • c49a3425ef Merge pull request #6002 from nabinhait/pe_fix_101 Nabin Hait 2016-08-05 15:44:44 +05:30
  • 50b2278eda Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch Neil Trini Lasrado 2016-08-01 23:45:33 +05:30
  • e1d85f2467 Payment Entry fix: Unallocated amount in payment entry considering deductions Nabin Hait 2016-08-05 14:51:36 +05:30
  • 3962cded76 updated docs Umair Sayyed 2016-08-04 18:59:08 +05:30
  • 66360f694e updated docs Umair Sayyed 2016-08-04 10:11:29 +05:30
  • 5dba950afa docs update Umair Sayyed 2016-08-03 18:14:52 +05:30
  • 6a3f51bee2 updated docs Umair Sayyed 2016-08-03 17:07:26 +05:30
  • efe1ab742f [minor] fixes for demo Rushabh Mehta 2016-08-04 17:29:35 +05:30
  • 4d32d5301a Merge pull request #5996 from KanchanChauhan/users-selection-for-project Rushabh Mehta 2016-08-04 14:25:52 +05:30
  • 58bc00f954 Project Users role not required to add user to the project Kanchan Chauhan 2016-08-04 14:21:20 +05:30
  • 155074479b Merge pull request #5986 from nabinhait/pe_fix_101 Nabin Hait 2016-08-03 17:54:01 +05:30
  • fa1775b6a6 Merge pull request #5988 from nabinhait/item_route Nabin Hait 2016-08-03 17:53:11 +05:30
  • 764e6ef210 default material request type field restored in item Nabin Hait 2016-08-03 17:32:26 +05:30
  • f2d89987f5 [minor] ignore email validation if comes from email; Rushabh Mehta 2016-08-03 16:42:29 +05:30
  • 06c92a782a [fix] small text for route Rushabh Mehta 2016-08-03 16:27:11 +05:30
  • f43e49f378 Set received amount based on paid amount if currency is same Nabin Hait 2016-08-03 14:16:54 +05:30
  • ea5ad84c5e [minor] fix image for demo Rushabh Mehta 2016-08-02 21:25:45 +05:30
  • 46f328cbda Merge branch 'develop' Nabin Hait 2016-08-02 18:07:53 +05:30
  • 1b9a01b6c3 bumped to version 7.0.18 Nabin Hait 2016-08-02 18:37:52 +06:00
  • e8ab7b8898 Merge pull request #5976 from nabinhait/patch_fix_109 Nabin Hait 2016-08-02 18:05:03 +05:30
  • ae921ce2c8 [patch] Set default material request type in Item based on default bom Nabin Hait 2016-08-02 18:02:31 +05:30
  • b77ad7c31d Merge branch 'develop' Nabin Hait 2016-08-02 17:16:46 +05:30
  • cc13a9f2f6 bumped to version 7.0.17 Nabin Hait 2016-08-02 17:46:46 +06:00
  • 97c74f9f8f Merge pull request #5925 from rohitwaghchaure/bcornwellmott-1 Nabin Hait 2016-08-02 17:15:02 +05:30
  • e1e6468b33 Merge pull request #5974 from nabinhait/pos_change_amount Nabin Hait 2016-08-02 17:14:50 +05:30
  • 6620e2a494 Test case fixed for pos gl entry Nabin Hait 2016-08-02 17:14:28 +05:30
  • 08aadb853c PPT looks at default MR type in Item to set MR type. Rohit Waghchaure 2016-07-29 13:23:30 +05:30
  • 3bb1a421f0 Change amount calcualtion in POS if there is write off amount and gl entries in this scenario Nabin Hait 2016-08-02 16:41:10 +05:30
  • afc0bbc8ff Merge pull request #5964 from frappe/neilLasrado-patch-1-1 Nabin Hait 2016-08-02 11:30:45 +05:30
  • 8869430a81 Merge pull request #5967 from rohitwaghchaure/minor_fix Nabin Hait 2016-08-02 11:29:48 +05:30
  • 7f031d1bfd minor fix in payment entry Rohit Waghchaure 2016-08-02 11:07:40 +05:30
  • 5b1ebc5c54 Merge pull request #5933 from shreyasp/erpnext/update-travis Rushabh Mehta 2016-08-02 10:44:39 +05:30
  • 5bb2f56b47 Update make_guardian.py Neil Trini Lasrado 2016-08-02 00:01:00 +05:30
  • 1e3e6865ce Merge branch 'develop' Nabin Hait 2016-08-01 18:07:21 +05:30
  • 94542e104c bumped to version 7.0.16 Nabin Hait 2016-08-01 18:37:20 +06:00
  • 90bf69aa52 Merge pull request #5957 from nabinhait/guardian_patch_fix Nabin Hait 2016-08-01 18:05:33 +05:30
  • 3b8109780f [patch] reload guardian interest Nabin Hait 2016-08-01 17:59:00 +05:30
  • f863055b91 Merge pull request #5955 from umairsy/28jul Nabin Hait 2016-08-01 17:53:26 +05:30
  • 3aac12d56b Merge branch 'develop' Nabin Hait 2016-08-01 17:48:28 +05:30
  • ed75667f64 bumped to version 7.0.15 Nabin Hait 2016-08-01 18:18:27 +06:00
  • 16a0fef759 Merge pull request #5956 from nabinhait/guardian_patch_fix Nabin Hait 2016-08-01 17:47:48 +05:30
  • 08aec855c4 [patch] fixed reload doc and permission issue in guardian patch Nabin Hait 2016-08-01 17:46:44 +05:30
  • e96b3ce725 added documentation for the new features Umair Sayyed 2016-08-01 17:41:43 +05:30
  • 60e9f84c8a [Minor] Updated the travis.yml to use new installer for erpnext shreyas 2016-07-29 19:39:49 +05:30
  • 1ffa76ba5c Merge branch 'develop' Nabin Hait 2016-08-01 17:35:02 +05:30
  • 798f3897a3 bumped to version 7.0.14 Nabin Hait 2016-08-01 18:05:02 +06:00
  • e810ea3a2f Merge pull request #5954 from nabinhait/guardian_patch_fix Nabin Hait 2016-08-01 17:33:51 +05:30