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

Commit Graph

  • 6a23cfa5cd Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip Nabin Hait 2014-01-22 15:57:32 +05:30
  • d39bc09e62 Merge pull request #1341 from nabinhait/hotfix Nabin Hait 2014-01-22 02:21:17 -08:00
  • c7676797e1 Dont display old fraction outstanding in AR report Nabin Hait 2014-01-22 15:36:44 +05:30
  • 7460dcf406 updated Bootstrap Rushabh Mehta 2014-01-22 12:44:46 +05:30
  • 423932fab2 Fixes in general ledger opening Nabin Hait 2014-01-22 11:52:54 +05:30
  • efda5b0d36 Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-21 20:58:10 +05:30
  • 13a9e27320 Fixes in warehouse merge function Nabin Hait 2014-01-21 20:57:39 +05:30
  • b0433d96a3 Merge branch 'develop' Pratik Vyas 2014-01-21 12:09:31 +05:30
  • f3aba2e536 bumped to version 3.6.5 Pratik Vyas 2014-01-21 12:39:31 +06:00
  • 1594f102fd Merge pull request #1340 from nabinhait/hotfix Nabin Hait 2014-01-20 22:29:33 -08:00
  • b2f2df4c64 General ledger: opening balance issue fixed Nabin Hait 2014-01-21 11:58:17 +05:30
  • 9f6c48d82e Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-21 10:44:16 +05:30
  • f0307dc75e Merge branch 'develop' Pratik Vyas 2014-01-20 19:21:25 +05:30
  • 872e4d1f3d bumped to version 3.6.4 Pratik Vyas 2014-01-20 19:51:25 +06:00
  • b164e606f9 Merge pull request #1337 from nabinhait/hotfix Nabin Hait 2014-01-20 05:00:43 -08:00
  • 806343395a Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-20 18:29:48 +05:30
  • afe93d633c Increased remarks width in general ledger Nabin Hait 2014-01-20 18:28:48 +05:30
  • cd20717c3d Merge pull request #1336 from akhileshdarjee/disable-price-list Nabin Hait 2014-01-20 04:47:10 -08:00
  • f96bcf943b added explicit delete perimssions Rushabh Mehta 2014-01-20 17:52:13 +05:30
  • 9e056ec1ce Auto closing of tickets through schedulers Nabin Hait 2014-01-20 17:46:37 +05:30
  • cef681942f merge fix Rushabh Mehta 2014-01-20 17:41:13 +05:30
  • 5c6d13a0df Fixed conflict while merging with develop branch Nabin Hait 2014-01-20 17:18:16 +05:30
  • 719f2803b3 Fixed conflict while merging with develop branch Nabin Hait 2014-01-20 17:01:28 +05:30
  • dc15b4fa8a Fixed conflict while merging with develop brnach Nabin Hait 2014-01-20 16:48:49 +05:30
  • 529709e08b patch for enabling all price list Akhilesh Darjee 2014-01-20 16:39:03 +05:30
  • e82eee512b Enabled feature in Price List Akhilesh Darjee 2014-01-20 16:09:45 +05:30
  • ee0c623760 Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-20 10:57:12 +05:30
  • dbb4955483 Merge pull request #1332 from akhileshdarjee/hotfix Nabin Hait 2014-01-17 20:18:30 -08:00
  • ed87335513 decimal places fix in item prices report Akhilesh Darjee 2014-01-17 18:57:21 +05:30
  • 8a4111fe0e decimal places fixed in item prices report Akhilesh Darjee 2014-01-17 18:50:44 +05:30
  • 4bfa8d560b Merge branch 'develop' Pratik Vyas 2014-01-17 16:56:31 +05:30
  • 96db41d996 bumped to version 3.6.3 Pratik Vyas 2014-01-17 17:26:31 +06:00
  • 9a74330d6f Merge pull request #1330 from pdvyas/fix-mysql-installer Nabin Hait 2014-01-17 02:37:25 -08:00
  • 1951baca57 Merge pull request #1319 from pdvyas/about-version Nabin Hait 2014-01-17 02:36:11 -08:00
  • da08124df2 remove mysql-python pinning to 1.2.4 Pratik Vyas 2014-01-17 15:27:19 +05:30
  • 2aecc5a717 Merge pull request #1329 from nabinhait/hotfix Nabin Hait 2014-01-17 01:41:40 -08:00
  • a37ffe162b Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-17 12:05:06 +05:30
  • bc99c9d6e0 Priority to user's deafult price list over customer's default price list Nabin Hait 2014-01-17 12:04:24 +05:30
  • f32314dd0b Do not set income/expense account automatically in company master Nabin Hait 2014-01-17 11:53:25 +05:30
  • 7e73f35916 Merge pull request #1327 from akhileshdarjee/hotfix Nabin Hait 2014-01-16 21:48:10 -08:00
  • e1e63a91d6 Allow renaming of campaign Akhilesh Darjee 2014-01-17 11:12:20 +05:30
  • 9a05aad8ea Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-17 10:31:43 +05:30
  • f6b77479d7 Patch: Update billing status for zero value order Nabin Hait 2014-01-16 18:18:49 +05:30
  • 3c279163fc Merge branch 'develop' Pratik Vyas 2014-01-16 16:29:22 +05:30
  • 6933617538 bumped to version 3.6.2 Pratik Vyas 2014-01-16 16:59:22 +06:00
  • 2648661757 Merge pull request #1326 from nabinhait/hotfix Nabin Hait 2014-01-16 01:28:33 -08:00
  • e31a97f355 Calculate taxes and charges total in server side Nabin Hait 2014-01-16 14:24:32 +05:30
  • 6bdb73c392 Merge pull request #1324 from nabinhait/hotfix Nabin Hait 2014-01-15 22:44:25 -08:00
  • deda7e2c75 Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-16 12:08:36 +05:30
  • 5cdb8cea13 Reset filters in Item Price report on each route Nabin Hait 2014-01-16 12:08:12 +05:30
  • 90a8c9e636 Merge pull request #1323 from nabinhait/hotfix Nabin Hait 2014-01-15 05:20:51 -08:00
  • c0c951b6a9 Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-15 17:36:34 +05:30
  • 39eb7faeb9 Update billing percentage and status from SI/PI in SO/PO, when net total is zero Nabin Hait 2014-01-15 17:36:18 +05:30
  • 4829ad3eb8 Merge pull request #1321 from akhileshdarjee/hotfix Nabin Hait 2014-01-15 03:17:23 -08:00
  • a682d45846 webnotes/erpnext # 1320 - hide fields fix Akhilesh Darjee 2014-01-15 16:39:01 +05:30
  • 76dd468f0e update about erpnext with version number Pratik Vyas 2014-01-15 14:23:38 +05:30
  • a6df26839d Higher priority to user's default price list over customer's default price list Nabin Hait 2014-01-15 12:21:14 +05:30
  • 2a79b00700 minor fix Akhilesh Darjee 2014-01-15 11:54:05 +05:30
  • 6a749e3a8e removed while loop Akhilesh Darjee 2014-01-15 11:43:47 +05:30
  • c5d4fc38aa Fixes in monthly salary register Nabin Hait 2014-01-15 10:54:07 +05:30
  • 02f7e83bd1 Merge branch 'develop' Pratik Vyas 2014-01-14 18:49:14 +05:30
  • f55d9414cd bumped to version 3.6.1 Pratik Vyas 2014-01-14 19:19:14 +06:00
  • 5644ed37a4 Merge pull request #1316 from nabinhait/hotfix Nabin Hait 2014-01-14 05:05:33 -08:00
  • ee6200576a Highest priority to user properties while fetching warehouse from item Nabin Hait 2014-01-14 18:34:10 +05:30
  • eeb8ba18cd Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-14 17:44:47 +05:30
  • 3a19370892 Rounding issue and divisional loss adjustment Nabin Hait 2014-01-14 17:44:34 +05:30
  • 6dc1ba6f7f Merge pull request #1314 from nabinhait/hotfix Nabin Hait 2014-01-14 02:29:39 -08:00
  • d91af2853e Allowed import for customer issue Nabin Hait 2014-01-14 15:56:52 +05:30
  • d23ae108ae Fixes in Comment, if comment by not mentioned, consider owner Nabin Hait 2014-01-14 15:52:09 +05:30
  • b9b6a6cea5 Moved webnotes scheduler event hooks Anand Doshi 2014-01-13 21:21:56 +05:30
  • 72f8ae2d5a Merge branch 'develop' Pratik Vyas 2014-01-13 18:37:07 +05:30
  • 1e347910d5 bumped to version 3.6.0 Pratik Vyas 2014-01-13 19:07:07 +06:00
  • 25cfb700bb Merge pull request #1311 from akhileshdarjee/hotfix Nabin Hait 2014-01-13 04:33:50 -08:00
  • 8d2d4e82fd Merge pull request #1302 from nabinhait/hotfix Nabin Hait 2014-01-13 04:33:18 -08:00
  • c43d58ac79 Delete Property Setters for Custom Fields, and set them inside Custom Field Nabin Hait 2014-01-13 17:55:24 +05:30
  • 0b3c10601c Increase and decrease quantity buttons in POS Akhilesh Darjee 2014-01-13 13:34:34 +05:30
  • 14bf711d04 Fixes in frozen accounts validation Nabin Hait 2014-01-13 13:28:07 +05:30
  • 35a9d585b4 Bank Reconciliation Statement: Show balance in debit or credit column based on account type Nabin Hait 2014-01-13 12:24:27 +05:30
  • 38e56eeb45 Merge branch 'develop' of github.com:webnotes/erpnext into hotfix Nabin Hait 2014-01-13 12:23:29 +05:30
  • 3dd1043d5e Merge pull request #1301 from akhileshdarjee/hotfix Nabin Hait 2014-01-10 03:09:12 -08:00
  • 55387aa931 Fixed conflict Nabin Hait 2014-01-10 16:31:48 +05:30
  • 03463ef73b Move related property setters to custom field property Nabin Hait 2014-01-10 16:28:41 +05:30
  • 371663169c pos view showing inclusive taxes Akhilesh Darjee 2014-01-10 15:05:44 +05:30
  • f3ded044e0 Monthly Salary Register: Month is now optional Nabin Hait 2014-01-09 17:38:50 +05:30
  • 68b0d54b4b Set default accounts in company related to perpetual inventory, only it is enabled Nabin Hait 2014-01-09 17:25:55 +05:30
  • 95e45574cb Merge pull request #1239 from akhileshdarjee/flat-discount Nabin Hait 2014-01-09 03:43:35 -08:00
  • e4a71935eb Merge branch 'develop' Pratik Vyas 2014-01-09 15:56:53 +05:30
  • 3e846d19d4 bumped to version 3.5.1 Pratik Vyas 2014-01-09 16:26:53 +06:00
  • 5411ece766 Merge pull request #1299 from nabinhait/hotfix Nabin Hait 2014-01-09 02:25:12 -08:00
  • aeb68b2899 Accounts Receivable fix for partial payment in pos Nabin Hait 2014-01-09 15:54:18 +05:30
  • 0064dc6f4a Merge branch 'develop' Pratik Vyas 2014-01-09 15:52:09 +05:30
  • 11bf06ad76 bumped to version 3.5.0 Pratik Vyas 2014-01-09 16:22:09 +06:00
  • 5c6a2acff7 Merge pull request #1298 from nabinhait/hotfix Nabin Hait 2014-01-09 02:20:06 -08:00
  • cdbd4218a8 Accounts Receivable fix for partial payment in pos Nabin Hait 2014-01-09 15:49:26 +05:30
  • 701cddfb15 Merge pull request #1297 from nabinhait/hotfix Nabin Hait 2014-01-08 23:18:54 -08:00
  • 4bbf91bea1 Added match condition in general ledger report Nabin Hait 2014-01-09 12:44:44 +05:30
  • e481e81e67 Merge pull request #1296 from akhileshdarjee/hotfix Nabin Hait 2014-01-08 22:23:56 -08:00
  • 102b417b52 Fix: Typo on patch Anand Doshi 2014-01-09 11:39:06 +05:30
  • efc2a45835 merge conflict fixed Akhilesh Darjee 2014-01-08 19:42:17 +05:30
  • 5c119a7e95 Merge branch 'master' of github.com:webnotes/erpnext into hotfix Akhilesh Darjee 2014-01-08 19:36:26 +05:30