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

Commit Graph

  • f7a102ffe3 POS print format fixed Akhilesh Darjee 2014-01-08 19:35:01 +05:30
  • d659343541 Payment Reconciliation: Fix for outstanding voucher query Nabin Hait 2014-01-08 17:29:23 +05:30
  • dbf5e54eab Merge pull request #1290 from akhileshdarjee/price-list Nabin Hait 2014-01-07 21:49:52 -08:00
  • 5eb139a531 Merge branch 'develop' Pratik Vyas 2014-01-07 21:45:04 +05:30
  • 9e2358c544 bumped to version 3.4.9 Pratik Vyas 2014-01-07 22:15:04 +06:00
  • 8d0ef21911 pos invoice print format changes Akhilesh Darjee 2014-01-07 19:45:33 +05:30
  • 9a8f37c579 Merge pull request #1289 from pdvyas/hotfix-installer Pratik Vyas 2014-01-07 06:14:08 -08:00
  • 029f698c65 patch for item price and price list Akhilesh Darjee 2014-01-07 19:43:35 +05:30
  • 806017c92a Price List and Item Price : Validfor Buying and Selling as separate check box Akhilesh Darjee 2014-01-07 18:37:38 +05:30
  • 69951e5d1c fix installer python packages issue Pratik Vyas 2014-01-07 18:24:40 +05:30
  • 10fd91c78e Close tickets automatically through scheduler Nabin Hait 2014-01-07 16:18:41 +05:30
  • 63d71d7f2f Merge branch 'develop' Pratik Vyas 2014-01-07 13:47:44 +05:30
  • 777bff6e8d bumped to version 3.4.8 Pratik Vyas 2014-01-07 14:17:44 +06:00
  • 1e42a3d028 Merge pull request #1287 from nabinhait/hotfix Nabin Hait 2014-01-06 23:12:45 -08:00
  • da282d405f Fixes in overbilling validation against DN/PR Nabin Hait 2014-01-07 12:41:09 +05:30
  • 8f1bb82ab9 Merge pull request #1286 from nabinhait/hotfix Nabin Hait 2014-01-06 22:40:54 -08:00
  • f2b46635b5 Merge pull request #1285 from pdvyas/hotfix-installer Anand Doshi 2014-01-06 22:35:49 -08:00
  • a11e14424c fix branching, pip version and mysql-python version pinning in install_erpnext Pratik Vyas 2014-01-07 12:02:45 +05:30
  • 01441ef37f Removed unwanted debug Nabin Hait 2014-01-07 11:59:36 +05:30
  • f6cf5e0f43 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup Nabin Hait 2014-01-06 17:36:04 +05:30
  • cb665285db Merge pull request #1280 from nabinhait/hotfix Nabin Hait 2014-01-06 03:03:02 -08:00
  • 6b66c387ad Fixes in item-wise sales/purchase register Nabin Hait 2014-01-06 16:28:17 +05:30
  • 5e702de710 Merge pull request #1279 from akhileshdarjee/hotfix Nabin Hait 2014-01-05 23:01:51 -08:00
  • 7e79f300a1 accounts payable fixed Akhilesh Darjee 2014-01-06 12:23:29 +05:30
  • 955902ccad Merge branch 'develop' Pratik Vyas 2014-01-06 12:18:58 +05:30
  • b882fa14f4 bumped to version 3.4.7 Pratik Vyas 2014-01-06 12:48:58 +06:00
  • d12d7142c6 Merge pull request #1278 from nabinhait/hotfix Nabin Hait 2014-01-05 22:35:10 -08:00
  • 42db5d76a9 Fixes in overbilling validation Nabin Hait 2014-01-06 11:20:37 +05:30
  • 5dd92fd5d6 reload doc in maintenance schedule Akhilesh Darjee 2014-01-03 19:14:01 +05:30
  • bd4030bf85 Merge branch 'develop' Pratik Vyas 2014-01-03 18:40:11 +05:30
  • a83337a2dd bumped to version 3.4.6 Pratik Vyas 2014-01-03 19:10:11 +06:00
  • e51e5238ec Merge pull request #1267 from nabinhait/hotfix Nabin Hait 2014-01-03 04:59:34 -08:00
  • 5d5fe5d9d5 Cost center field added in Purchase Receipt Item table Nabin Hait 2014-01-03 18:28:53 +05:30
  • e27717261d merge conflict fixed Akhilesh Darjee 2014-01-03 18:18:31 +05:30
  • 57738a0ff3 flat discount replaced to discount amount Akhilesh Darjee 2014-01-03 18:15:07 +05:30
  • b476c989a4 Fixes test cases for date and year mismatch Nabin Hait 2014-01-03 17:43:52 +05:30
  • 7f0406f281 Chekc over billing validation considering tolerance Nabin Hait 2014-01-03 17:43:19 +05:30
  • 33f6b9d6e8 Unlinked message listing all linked entries while cancelling an accounting trandsaction Nabin Hait 2014-01-03 15:12:16 +05:30
  • c196037cb0 Merge branch 'develop' Pratik Vyas 2014-01-03 13:27:06 +05:30
  • 866103bf66 bumped to version 3.4.5 Pratik Vyas 2014-01-03 13:57:06 +06:00
  • 528eb4e4ff Merge pull request #1264 from akhileshdarjee/hotfix Nabin Hait 2014-01-02 23:53:30 -08:00
  • 481454298d Merge pull request #1265 from nabinhait/hotfix Nabin Hait 2014-01-02 23:53:15 -08:00
  • 8a0b7cece1 accounts receivable fixed Akhilesh Darjee 2014-01-03 13:21:38 +05:30
  • b4eba77f7b fixed accounts receivable Akhilesh Darjee 2014-01-03 12:58:04 +05:30
  • b0a9581e59 fixed accounts receivable for customer name Akhilesh Darjee 2014-01-03 12:44:00 +05:30
  • 6472bdace2 Fixes in general ledger report Nabin Hait 2014-01-03 12:30:24 +05:30
  • c95b9f9221 Merge pull request #1263 from nabinhait/hotfix Nabin Hait 2014-01-02 22:44:24 -08:00
  • a4db83a934 Fixes in valuation rate calculation in purchase receipt Nabin Hait 2014-01-03 12:13:18 +05:30
  • 28acaeb345 Fixes in valuation rate calculation in purchase receipt Nabin Hait 2014-01-03 11:16:16 +05:30
  • 5c96b75a68 fixed maintenance schedule Akhilesh Darjee 2013-12-31 17:45:20 +05:30
  • 064d2ba16a fixed sr no in maintenance schedule Akhilesh Darjee 2013-12-30 19:36:58 +05:30
  • 5fbb757c2c Merge branch 'develop' Pratik Vyas 2014-01-02 17:12:01 +05:30
  • df07c964f7 bumped to version 3.4.4 Pratik Vyas 2014-01-02 17:42:01 +06:00
  • 0e2a088ac4 Merge pull request #1260 from nabinhait/hotfix Nabin Hait 2014-01-02 03:02:56 -08:00
  • ffc2f8885b Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-02 16:30:38 +05:30
  • a1ffacaf0b Valuation related charges should only go to stock items Nabin Hait 2014-01-02 16:30:16 +05:30
  • b09d9dabc5 started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions Rushabh Mehta 2014-01-02 11:47:23 +05:30
  • 06720dfb90 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip Nabin Hait 2014-01-01 10:47:18 +05:30
  • a2e0a9b05f Fliend rearrangemet in tables Nabin Hait 2014-01-01 10:45:42 +05:30
  • 3f7e2729bb removed demo hooks Rushabh Mehta 2014-01-01 10:43:05 +05:30
  • 6260b58a0a Merge pull request #1253 from nabinhait/4.0.0-wip Nabin Hait 2013-12-31 21:13:45 -08:00
  • 2511aa2b14 Merge pull request #1254 from anandpdoshi/4.0.0-shopping-cart-wip Anand Doshi 2013-12-31 04:14:15 -08:00
  • 9a4a13cb73 Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes Anand Doshi 2013-12-31 17:38:21 +05:30
  • 139aa71666 Fixed conflict while merging with master Nabin Hait 2013-12-31 16:09:22 +05:30
  • d3f04d754a General ledger path fixed Nabin Hait 2013-12-31 16:04:48 +05:30
  • 432b86344e Validate account with reference voucher if against voucher mentioned Nabin Hait 2013-12-31 15:07:58 +05:30
  • 8c52258e6d Merge branch 'develop' Pratik Vyas 2013-12-31 14:12:36 +05:30
  • ffe8af3f2f bumped to version 3.4.3 Pratik Vyas 2013-12-31 14:42:36 +06:00
  • fe5728718f Merge pull request #1251 from nabinhait/hotfix Nabin Hait 2013-12-30 21:02:20 -08:00
  • 424b4a4b36 Supplier bill info in accounts payable report Nabin Hait 2013-12-31 10:24:28 +05:30
  • 2a3d7e660f Fixes in general ledger report Nabin Hait 2013-12-30 20:28:14 +05:30
  • a0a43ca4e4 Merge branch 'develop' Pratik Vyas 2013-12-30 19:34:38 +05:30
  • 9cd9836e18 bumped to version 3.4.2 Pratik Vyas 2013-12-30 20:04:38 +06:00
  • 39a3f50732 Merge branch 'develop' Pratik Vyas 2013-12-30 18:58:03 +05:30
  • ba7221c332 bumped to version 3.4.1 Pratik Vyas 2013-12-30 19:28:03 +06:00
  • 6a45588a2c Merge branch 'develop' Pratik Vyas 2013-12-30 17:48:01 +05:30
  • ab9d755e4d bumped to version 3.4.0 Pratik Vyas 2013-12-30 18:18:01 +06:00
  • 1cf8bd8767 Merge pull request #1246 from nabinhait/hotfix Nabin Hait 2013-12-30 03:44:41 -08:00
  • 829eda47a8 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount Akhilesh Darjee 2013-12-30 12:31:07 +05:30
  • 0663ec4a9c Merge fixes: removed patches, removed Warehouse User Anand Doshi 2013-12-27 17:57:28 +05:30
  • 61bf425935 deleted moves Rushabh Mehta 2013-12-27 17:58:39 +05:30
  • d203aea7c2 [flat discount] flat discount implemented on sales cycle Akhilesh Darjee 2013-12-27 17:49:57 +05:30
  • a4f99428d7 Fixes in time log batch Nabin Hait 2013-12-27 17:36:17 +05:30
  • e761fe89e2 Stock Entry catch exceptions for testcase Nabin Hait 2013-12-27 17:35:39 +05:30
  • d51f805b78 Rewritten General Ledger report with grouping functions Nabin Hait 2013-12-27 17:33:55 +05:30
  • c4a0ed63ef Moved demo to separate app, moved patches folder Rushabh Mehta 2013-12-27 17:30:24 +05:30
  • 31ccf9a80b [flat discount] fixed test cases for stock entry Akhilesh Darjee 2013-12-27 14:21:39 +05:30
  • 4ac68952e8 Moved patches and fixed method routing in pages Rushabh Mehta 2013-12-27 13:43:40 +05:30
  • e7fc25d6a8 Fixes after permissions merge Anand Doshi 2013-12-27 10:49:28 +05:30
  • 0527a393aa Merge pull request #1236 from anandpdoshi/permissions Rushabh Mehta 2013-12-26 21:07:54 -08:00
  • 2b1d8854d5 [flat discount] added flat discount in pos Akhilesh Darjee 2013-12-26 20:31:42 +05:30
  • 8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions Anand Doshi 2013-12-26 18:30:39 +05:30
  • 3ab9f24a12 Merge branch 'master' of github.com:webnotes/erpnext into flat_discount Akhilesh Darjee 2013-12-26 18:15:14 +05:30
  • 13fa595282 [flat discount] pos print format fixed Akhilesh Darjee 2013-12-26 18:14:44 +05:30
  • aebb844da9 [flat discount] added flat discount in print format and all selling doctypes Akhilesh Darjee 2013-12-26 18:05:41 +05:30
  • 7334bea3c2 fixed languages, moved framework strings to framework Rushabh Mehta 2013-12-26 14:44:08 +05:30
  • caa4380d49 Merge with 3.3.8 Rushabh Mehta 2013-12-26 11:07:58 +05:30
  • 54047780fc Merge with 3.3.8 Rushabh Mehta 2013-12-26 11:07:46 +05:30
  • c53dbc7cdf [flat discount] implemented flat discount on client side Akhilesh Darjee 2013-12-25 19:46:20 +05:30
  • 4b6b377134 Removed config.json Rushabh Mehta 2013-12-25 17:38:12 +05:30