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

Commit Graph

  • c819fd4ee8 [translations] for #4461 Rushabh Mehta 2015-12-10 10:34:32 +05:30
  • 2af44ffd06 [fix] setup wizard is_private Anand Doshi 2015-12-09 17:28:51 +05:30
  • cff91abd8d Merge pull request #4456 from nabinhait/drop_ship_fix1 Nabin Hait 2015-12-09 17:06:54 +05:30
  • 5d39a9594d [fix] Reload SO Item in patch Nabin Hait 2015-12-09 17:06:09 +05:30
  • b1caeba0b4 Merge branch 'develop' Nabin Hait 2015-12-09 15:32:30 +05:30
  • 7290c79fdf bumped to version 6.12.8 Nabin Hait 2015-12-09 16:02:30 +06:00
  • 547e916b00 Merge pull request #4452 from saurabh6790/drop-ship-fixes-3 Nabin Hait 2015-12-09 15:31:49 +05:30
  • e4c0388b68 Merge pull request #4453 from nabinhait/translation_fix Nabin Hait 2015-12-09 15:30:11 +05:30
  • 783e63a8e6 suomalainen translation fixed for Extra Small and Large Nabin Hait 2015-12-09 15:29:13 +05:30
  • f6891975d5 [fixes] pull customer details only if drop shipping is marked Saurabh 2015-12-09 15:03:49 +05:30
  • 45a8f9d006 Merge branch 'develop' Nabin Hait 2015-12-09 14:59:44 +05:30
  • 1b0c797817 bumped to version 6.12.7 Nabin Hait 2015-12-09 15:29:44 +06:00
  • c119cbcb50 Merge pull request #4449 from nabinhait/coa_fix Nabin Hait 2015-12-09 13:58:09 +05:30
  • d595534431 Merge pull request #4450 from venetanji/develop Nabin Hait 2015-12-09 13:57:45 +05:30
  • 5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english Giovanni Lion 2015-12-09 15:45:40 +08:00
  • 5ccaf6f9d7 Merge remote-tracking branch 'frappe/develop' into develop Giovanni Lion 2015-12-09 15:25:47 +08:00
  • 29fe53f63c [fix] use pip parse requirements in setup.py Anand Doshi 2015-12-09 12:15:20 +05:30
  • 49fe7af6de [fix] Stock account identified in COA of Guatamala Nabin Hait 2015-12-09 11:27:01 +05:30
  • a68a3b5cc1 Merge branch 'develop' Nabin Hait 2015-12-08 18:06:25 +05:30
  • 3931a35e27 bumped to version 6.12.6 Nabin Hait 2015-12-08 18:36:25 +06:00
  • 56595ecda0 Merge pull request #4445 from nabinhait/patch_fix1 Nabin Hait 2015-12-08 18:05:33 +05:30
  • 466ff3d31b Merge pull request #4446 from nabinhait/translation_fix Nabin Hait 2015-12-08 18:05:12 +05:30
  • 61c6552434 [fix] Hungary translation for chart of accounts Nabin Hait 2015-12-08 18:03:23 +05:30
  • 4ad0963ee8 [patch][fix] Fixed drop ship status and tax rule patch Nabin Hait 2015-12-08 16:50:20 +05:30
  • aa99fe2c4e Merge branch 'develop' Nabin Hait 2015-12-08 15:40:17 +05:30
  • d56ec92682 bumped to version 6.12.5 Nabin Hait 2015-12-08 16:10:17 +06:00
  • 90852d334f Merge branch 'nabinhait-tax_rule_patch' into develop Nabin Hait 2015-12-08 15:30:32 +05:30
  • 694373d022 Fixed conflict Nabin Hait 2015-12-08 15:30:15 +05:30
  • 40d49ccf98 Merge pull request #4444 from nabinhait/get_incoming_rate_fix Nabin Hait 2015-12-08 15:17:32 +05:30
  • 4372ac559a Merge pull request #4443 from nabinhait/bank_reco_print Nabin Hait 2015-12-08 15:17:24 +05:30
  • 01478b3fc1 Merge pull request #4439 from saurabh6790/drop-ship-fixes-3 Nabin Hait 2015-12-08 15:16:38 +05:30
  • 41c8cf645a [fix] Get incoming rate if args as json Nabin Hait 2015-12-08 14:50:24 +05:30
  • 70ed6ede5c [fixes] patch to update delivery status for drop ship item Saurabh 2015-12-08 14:02:53 +05:30
  • 7af5c4aefc [fix] Print format for bank reco statement Nabin Hait 2015-12-08 14:25:10 +05:30
  • 01ca354d52 [fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status Saurabh 2015-12-08 10:09:51 +05:30
  • a974ab3dc5 [fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier Nabin Hait 2015-12-08 12:56:14 +05:30
  • cc24d28ddc [fix] address creation for new user Anand Doshi 2015-12-08 12:34:01 +05:30
  • 441b2c7657 [minor] limit pos search to 24 items at a time Rushabh Mehta 2015-12-08 12:16:22 +05:30
  • 51d07dfca2 [docs] rename perm level error article Anand Doshi 2015-12-07 16:22:00 +05:30
  • 5e6757f197 Merge branch 'develop' Nabin Hait 2015-12-07 14:25:00 +05:30
  • 6a8ff42a5a bumped to version 6.12.4 Nabin Hait 2015-12-07 14:54:59 +06:00
  • 06db236aa0 [fix] Allow Production Order, by default unchecked in item Nabin Hait 2015-12-07 14:19:13 +05:30
  • 733680bc3f [translations] Nabin Hait 2015-12-07 14:12:41 +05:30
  • 14a0441b4b [fix] removed temp_highlight Rushabh Mehta 2015-12-07 12:28:03 +05:30
  • a311e706b0 [docs] home.png Rushabh Mehta 2015-12-07 12:13:17 +05:30
  • e6a16c29df [docs] index fix Rushabh Mehta 2015-12-07 12:06:44 +05:30
  • 92bb480fc3 Merge pull request #4432 from bohlian/develop Nabin Hait 2015-12-07 11:12:11 +05:30
  • 7dc0da18b5 Merge pull request #4433 from nabinhait/expense_allow_import Nabin Hait 2015-12-07 11:11:35 +05:30
  • c8a2b94200 Merge pull request #4434 from nabinhait/whitelist_fix Nabin Hait 2015-12-07 11:11:21 +05:30
  • 203d4088fa Merge pull request #4435 from saurabh6790/drop-ship-fixes-3 Nabin Hait 2015-12-07 11:10:11 +05:30
  • 5eefff13a1 [fix] get_incoming_rate function whitelisted Nabin Hait 2015-12-07 10:44:56 +05:30
  • 9421e9873a [fix] Allowed import for Expense Claim Nabin Hait 2015-12-07 10:40:13 +05:30
  • 5e4c8a52ee Payment To Be Shown When Outstanding Amount != 0 bohlian 2015-12-07 12:06:08 +08:00
  • 41f62f7250 Merge pull request #1 from frappe/develop bohlian 2015-12-07 12:04:34 +08:00
  • 4f39fd243e [fixes] recreate print format, shipping address on po for drop ship, validate update stock Saurabh 2015-12-06 10:08:52 +05:30
  • c43a11a313 Merge pull request #4431 from nabinhait/leave_fix Nabin Hait 2015-12-05 12:43:38 +05:30
  • 1bffb42809 Merge pull request #4428 from nabinhait/get_exchange_rate Nabin Hait 2015-12-05 12:43:13 +05:30
  • 4660f820da Merge pull request #4427 from nabinhait/offer_letter_fix Nabin Hait 2015-12-05 12:42:39 +05:30
  • 1a19c05ef0 Merge pull request #4425 from nabinhait/bank_reco_fix Nabin Hait 2015-12-05 12:42:20 +05:30
  • d53e780fb8 [fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period Nabin Hait 2015-12-05 12:15:49 +05:30
  • 0f5d97a156 [fix] Get exchange rate as 1 if same currency Nabin Hait 2015-12-04 16:47:34 +05:30
  • 2f273674e9 [docs] fixed links Rushabh Mehta 2015-12-04 16:00:38 +05:30
  • 734a40ad62 [fix] Offer letter print format fixed Nabin Hait 2015-12-04 12:19:21 +05:30
  • 9547b774f7 [fix] Fixed amounts not reflected in bank Nabin Hait 2015-12-04 11:03:07 +05:30
  • e1f8b1d695 [minor] [production planning tool] include non production items without default BOM in multi-level BOM Rushabh Mehta 2015-12-04 10:53:15 +05:30
  • 7be2e985b0 [docs] updated generated docs Rushabh Mehta 2015-12-03 18:28:19 +05:30
  • 3b6287d849 [docs] updated generated docs Rushabh Mehta 2015-12-03 18:27:13 +05:30
  • ab7021ce64 [docs] merged kb and cleanup. warning: don't see the commit Rushabh Mehta 2015-12-03 17:52:46 +05:30
  • ca4c663e07 Merge branch 'develop' Rushabh Mehta 2015-12-03 17:58:58 +05:30
  • 275b3eec0d bumped to version 6.12.3 Rushabh Mehta 2015-12-03 18:28:57 +06:00
  • acaef538c2 Merge pull request #4420 from rmehta/stock-entry-fix Rushabh Mehta 2015-12-03 17:58:07 +05:30
  • 041b062014 Merge pull request #4419 from nabinhait/salary_payment_days Rushabh Mehta 2015-12-03 17:57:24 +05:30
  • 39e603a154 Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate Rushabh Mehta 2015-12-03 17:56:03 +05:30
  • a4eeb919e6 [fix] Set payment days considering joinging date, reliving date and applicable holidays Nabin Hait 2015-12-03 15:10:20 +05:30
  • c4d9554a05 [fix] Payment Days and holidays considering joining and relieving dates Nabin Hait 2015-12-03 10:44:21 +05:30
  • 2e1c8f27c4 Merge pull request #4421 from nabinhait/tax_rule_fix Rushabh Mehta 2015-12-03 11:50:09 +05:30
  • 4c7a32e446 [fix] Toggle required for sales and purchase tax template based on tax type Nabin Hait 2015-12-03 11:47:38 +05:30
  • 2c069a418a [minor] allow stock entry for manufacture without production order Rushabh Mehta 2015-12-03 11:10:23 +05:30
  • ba2596a7e0 [minor] validate email id before inviting user Rushabh Mehta 2015-12-03 10:35:11 +05:30
  • f7911687a0 [minor] fixes to patch Rushabh Mehta 2015-12-03 08:09:27 +05:30
  • ceb82324ad Merge branch 'develop' Rushabh Mehta 2015-12-02 14:54:45 +05:30
  • 5dd1aa9f31 bumped to version 6.12.2 Rushabh Mehta 2015-12-02 15:24:45 +06:00
  • 80ada3eddd Merge pull request #4415 from nabinhait/salary_slip_fix Rushabh Mehta 2015-12-02 14:52:11 +05:30
  • 8df5900f98 [fix] Inactive salary structure validation Nabin Hait 2015-12-02 14:50:08 +05:30
  • f58a3726a7 Balance in chart of accounts in both company and account currency Nabin Hait 2015-12-02 11:13:20 +05:30
  • 1c77506e80 [fix] Don't overwrite exchange rate on saving for bank transfer Nabin Hait 2015-12-01 18:59:34 +05:30
  • f1f556c0ac Merge pull request #4409 from nabinhait/reorder_level Rushabh Mehta 2015-12-02 12:25:09 +05:30
  • 4a1b9ac793 Merge pull request #4407 from nabinhait/develop Rushabh Mehta 2015-12-02 12:24:49 +05:30
  • 20abc2d0e8 [fix] Reorder Qty mandatory if reorder level entered Nabin Hait 2015-12-01 18:07:28 +05:30
  • 4f9fe9c856 Merge branch 'develop' Rushabh Mehta 2015-12-01 18:18:28 +05:30
  • 4496cc1e80 bumped to version 6.12.1 Rushabh Mehta 2015-12-01 18:48:28 +06:00
  • 29cca2352c [hot] [fix] trial balance report Rushabh Mehta 2015-12-01 18:17:18 +05:30
  • d793fc9446 [fix] Mapping allowed for negative quantity Nabin Hait 2015-12-01 17:26:35 +05:30
  • 84f44ad5eb Merge pull request #4345 from nabinhait/stock_reco Rushabh Mehta 2015-12-01 16:50:32 +05:30
  • 5b73dea9f6 [fix] Get items in stock reconciliation based on default warehouse or existing bin Nabin Hait 2015-11-20 15:42:32 +05:30
  • cd90478c6d Merge pull request #4406 from nabinhait/recurring_test_fix Rushabh Mehta 2015-12-01 16:43:27 +05:30
  • c4edcf1532 [fix] Recurring test case fixed for the 1st day of the month Nabin Hait 2015-12-01 16:27:42 +05:30
  • 70885f63a5 Merge branch 'develop' Rushabh Mehta 2015-12-01 16:24:13 +05:30
  • 48b1633ff5 bumped to version 6.12.0 Rushabh Mehta 2015-12-01 16:54:13 +06:00
  • 4140fa59c5 [translations] Rushabh Mehta 2015-12-01 16:02:15 +05:30