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

Commit Graph

  • 6f0897c258 Merge branch 'hotfix' Nabin Hait 2016-10-27 19:14:54 +05:30
  • 9dcb778f17 bumped to version 7.1.1 Nabin Hait 2016-10-27 19:44:54 +06:00
  • 5ad56ef446 Merge pull request #6727 from saurabh6790/hotfix Nabin Hait 2016-10-27 19:06:32 +05:30
  • 8042ba3be3 Merge pull request #6728 from neilLasrado/develop Nabin Hait 2016-10-27 15:37:59 +05:30
  • 5f041e9665 Added naming series to Course Schedule Neil Trini Lasrado 2016-10-27 15:28:58 +05:30
  • 468e41f24f [enhance] introduce ignore_fields param for _tree and get_query Saurabh 2016-10-27 15:23:04 +05:30
  • 622c05cc60 Merge pull request #6724 from rohitwaghchaure/bank_clearance_report_issue Nabin Hait 2016-10-27 13:48:19 +05:30
  • 53a28eb39d [Fix] No permission to read report Bank Clearance Summary for account user Rohit Waghchaure 2016-10-27 11:46:10 +05:30
  • be81442c82 [minor] link formatter fixes for Item and Employee mbauskar 2016-10-27 09:49:22 +05:30
  • 7ef2c0fc34 Fix calendar view for Timesheet bcornwellmott 2016-10-26 11:02:48 -07:00
  • 38c1732304 Merge branch 'develop' Nabin Hait 2016-10-26 17:56:16 +05:30
  • 62616a03b3 bumped to version 7.1.0 Nabin Hait 2016-10-26 18:26:16 +06:00
  • afa3697c7f Merge pull request #6717 from frappe/nabinhait-patch-1 Nabin Hait 2016-10-26 17:54:58 +05:30
  • 6d1eda812d Update __init__.py Nabin Hait 2016-10-26 17:54:47 +05:30
  • 72cee33b3a [translations] Nabin Hait 2016-10-26 17:45:06 +05:30
  • 72a1943c8e Fixed version conflict Nabin Hait 2016-10-26 16:41:21 +05:30
  • 4c0a9f420f Merge branch 'hotfix' Nabin Hait 2016-10-26 16:40:45 +05:30
  • f3882d2699 bumped to version 7.0.63 Nabin Hait 2016-10-26 17:10:44 +06:00
  • 2e12a76d18 Merge pull request #6716 from nabinhait/develop Nabin Hait 2016-10-26 16:37:10 +05:30
  • 7f19a24e5e Merge pull request #6705 from KanchanChauhan/get-serial-no Nabin Hait 2016-10-26 16:31:11 +05:30
  • c5cbde273f Change Logs for v7.1 Nabin Hait 2016-10-26 16:28:48 +05:30
  • 0a3f2c818a Fetch serial no by default Kanchan Chauhan 2016-10-25 23:15:39 +05:30
  • 683c4798b5 Merge pull request #6714 from KanchanChauhan/balance-sheet-error Nabin Hait 2016-10-26 14:27:33 +05:30
  • a3c24385cf Merge pull request #6710 from frappe/bcornwellmott-patch-1 Nabin Hait 2016-10-26 13:06:22 +05:30
  • e0aaea20af Merge pull request #6701 from shreyasp/modify-submit-docs Nabin Hait 2016-10-26 13:05:11 +05:30
  • dc3198a11c [Fix] Error in Balance Sheet Report Kanchan Chauhan 2016-10-26 13:05:08 +05:30
  • 6c7d6e095b Update purchase_order_item.json Shreyas Patil 2016-10-26 12:47:35 +05:30
  • fd04d62c2e [Minor] Added expected_delivery_date to purchase order item doctype shreyas 2016-10-26 12:38:31 +05:30
  • 821331b3c0 Merge pull request #6712 from neilLasrado/develop Nabin Hait 2016-10-26 12:32:20 +05:30
  • a3f2a47020 Allow rename of student doctype Neil Trini Lasrado 2016-10-26 12:24:27 +05:30
  • 0bb92ab7a0 [docs] Email and Phone validation on Custom Fields (#6703) Revant Nandgaonkar 2016-10-26 11:05:12 +05:30
  • 30df3cd3dc Add description, stock UOM and Min Order Qty to MRs bcornwellmott 2016-10-25 14:21:26 -07:00
  • 99e063f831 [Fix] Make purchase order item reqd_date modifiable after submit shreyas 2016-10-25 12:44:01 +05:30
  • ffd2fc5101 [fix] Validate if warehouse is not linked to any account Nabin Hait 2016-10-24 18:17:57 +05:30
  • d662502f3c [fix] Validate if warehouse is not linked to any account Nabin Hait 2016-10-24 18:17:57 +05:30
  • c00b17a6e0 Update project.json Nabin Hait 2016-10-24 17:53:06 +05:30
  • fe86debf5d [fix] Duplicate salary components Nabin Hait 2016-10-24 17:47:02 +05:30
  • 7d977a243a Merge pull request #6690 from rohitwaghchaure/v7_pricing_rule_issue Nabin Hait 2016-10-24 16:47:33 +05:30
  • 0f9d60099d Merge pull request #6692 from neilLasrado/develop Nabin Hait 2016-10-24 16:46:27 +05:30
  • a02fb1541a Merge pull request #6553 from saurabh6790/scrap_management Nabin Hait 2016-10-24 16:46:13 +05:30
  • 1f3771cdf1 Merge pull request #6687 from KanchanChauhan/lead-changes Nabin Hait 2016-10-24 16:44:08 +05:30
  • 43b508089e [Fix] Pricing rule discount issue Rohit Waghchaure 2016-10-24 14:04:46 +05:30
  • 5ddd7acdbd Typo fix Neil Trini Lasrado 2016-10-24 15:25:33 +05:30
  • 8c3764a6ef test case for scrap item Saurabh 2016-10-05 20:41:29 +05:30
  • 4ae4eb0eb9 added get_scrap_items param to get_bom_items_as_dict Saurabh 2016-10-05 17:11:16 +05:30
  • 5a2fa8aac7 [enhance] scrap management Saurabh 2016-09-28 12:24:42 +05:30
  • 464c27e189 [feature] scrap management Saurabh 2016-09-26 14:29:17 +05:30
  • a1cedbc7b2 Contact by and contact date validations Kanchan Chauhan 2016-10-24 12:41:45 +05:30
  • cf397d3190 Merge pull request #6688 from frappe/umairsy-patch-5 Nabin Hait 2016-10-24 13:43:57 +05:30
  • a56775ce9a Update domainify.py Umair Sayed 2016-10-24 13:00:17 +05:30
  • f430d73daf Merge pull request #6662 from PawanMeh/fixes_6363 Nabin Hait 2016-10-24 11:56:43 +05:30
  • 00b3443b61 Merge pull request #6653 from shreyasp/cust-credit-limit Nabin Hait 2016-10-24 11:55:24 +05:30
  • a221f7ec5d Update test_customer.py Nabin Hait 2016-10-24 11:27:56 +05:30
  • 297e725727 Update project.json Pawan Mehta 2016-10-24 11:24:38 +05:30
  • df366a6e9c Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio Nabin Hait 2016-10-24 11:23:57 +05:30
  • a964db7821 Add multiple emoloyee in salary structure (#6621) Mainul Islam 2016-10-24 11:52:00 +06:00
  • 1db35ce79a Merge pull request #6651 from shreyasp/del-company-txn Nabin Hait 2016-10-24 11:20:29 +05:30
  • 6ef8ede280 Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip Nabin Hait 2016-10-24 11:19:43 +05:30
  • 5ced4dfe34 Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix Nabin Hait 2016-10-24 11:18:44 +05:30
  • 03a77b1b65 [fix] 6363 pawan 2016-10-23 10:45:21 +05:30
  • 46ead70be8 [fix] fixes_6363 pawan 2016-10-23 10:51:47 +05:30
  • 9a43a2a97b [fix] #6363 pawan 2016-10-21 13:52:19 +05:30
  • 28ad58905d [fix] #6363 pawan 2016-10-21 09:40:45 +05:30
  • 8d187def12 [fix] #6363 pawan 2016-10-20 16:45:21 +05:30
  • 8918dcf54e Merge pull request #6678 from KanchanChauhan/total-leave-days-updated Nabin Hait 2016-10-24 11:13:31 +05:30
  • 988f850fe2 Merge pull request #6682 from KanchanChauhan/makebankentry-button-fix Nabin Hait 2016-10-24 11:12:17 +05:30
  • 0e75956f81 Merge pull request #6684 from KanchanChauhan/warehouse-based-on-company-MR Nabin Hait 2016-10-24 11:09:42 +05:30
  • f09929ea92 [Fix] Updated test cases to handle negative or zero outstanding amount against customer shreyas 2016-10-24 10:35:30 +05:30
  • 17f43da2a6 [Test] Added test cases to evaluate customer credit limit shreyas 2016-10-20 15:56:18 +05:30
  • e05656963a [Minor] Do not allow change in credit limit shreyas 2016-10-19 15:59:21 +05:30
  • c48eb45410 [Fix] Use company_fieldname as parameter to the query shreyas 2016-10-24 10:04:13 +05:30
  • 0f4cb55c3c [Fix] Delete communications before deleting the docs shreyas 2016-10-19 14:41:48 +05:30
  • 54d8590064 [Fix] Delete communications when user deletes company transactions shreyas 2016-10-17 14:25:20 +05:30
  • 55106ab66b Warehouse based on selected Company Kanchan Chauhan 2016-10-22 21:42:28 +05:30
  • 29ce0aab28 Warning if there are mutliple active salary structures Kanchan Chauhan 2016-10-22 20:48:44 +05:30
  • c4c966691f [Fix] Make Bank Entry button depends_on fixed Kanchan Chauhan 2016-10-22 18:04:48 +05:30
  • a084405bca Total leave days gets updated on date change Kanchan Chauhan 2016-10-22 11:55:51 +05:30
  • a1006c0549 include_holiday being taken into consideration while calculating lwp Kanchan Chauhan 2016-10-21 17:53:15 +05:30
  • 24d580206a [Fix] leave application days should be less than max days leave allowed Kanchan Chauhan 2016-10-21 13:01:33 +05:30
  • 44e9195378 Merge branch 'DigiThinkIT-develop' into develop Nabin Hait 2016-10-20 17:01:44 +05:30
  • db88bd66b0 Merge branch 'develop' of https://github.com/DigiThinkIT/erpnext into DigiThinkIT-develop Nabin Hait 2016-10-20 16:59:40 +05:30
  • 376449ff41 Merge pull request #6659 from shreyasp/selling-price-validation Nabin Hait 2016-10-20 16:46:35 +05:30
  • 9f26bc16b7 Update selling_controller.py Nabin Hait 2016-10-20 16:45:53 +05:30
  • 05aa1712ff Merge branch 'rohitwaghchaure-stock_entry_total_amount_issue' into develop Nabin Hait 2016-10-20 16:39:35 +05:30
  • 69be01aa1b [Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer Rohit Waghchaure 2016-10-19 16:20:59 +05:30
  • 725b547641 Merge pull request #6657 from rohitwaghchaure/invoice_unlink_feature Nabin Hait 2016-10-20 16:36:57 +05:30
  • 18fa0d8691 patch to set default value as 1 Rohit Waghchaure 2016-10-20 16:16:28 +05:30
  • 938c858720 Merge pull request #6513 from KanchanChauhan/group-similar-item-in-po Nabin Hait 2016-10-20 16:11:24 +05:30
  • 7917ff6936 Test cases Rohit Waghchaure 2016-10-20 15:29:21 +05:30
  • 8055bd39ba [Feature] Provision to allow unlink the payment against the invoice Rohit Waghchaure 2016-10-19 17:03:23 +05:30
  • 05245d6328 Merge pull request #6661 from KanchanChauhan/demo-fixed-processpayroll-ss Nabin Hait 2016-10-20 16:05:08 +05:30
  • 1c1e2e9cbe Demo fixed for Process Payroll and Salary Structure Kanchan Chauhan 2016-10-20 14:53:10 +05:30
  • e8aaa92816 [Minor] Some more fixes to the code shreyas 2016-10-20 14:03:59 +05:30
  • edcba51c8b [Fix] Added check to validate selling price against valuation rate shreyas 2016-10-20 11:50:00 +05:30
  • 1cfe2d7b45 [Minor] Validate purchase price against selling price shreyas 2016-10-19 18:36:12 +05:30
  • 6fb7b162e8 Create tax template based on country Nabin Hait 2016-10-20 15:49:39 +05:30
  • d23835be84 [Feature] Countrywise sales tax template Rohit Waghchaure 2016-09-23 20:43:23 +05:30
  • cce16b29b0 Group similar items in PO Kanchan Chauhan 2016-09-30 17:19:10 +05:30
  • bc0783b527 [fix] duplicate columns in monthly salary report #6623 Saurabh 2016-10-19 15:17:08 +05:30
  • 025fbd8f14 Customer group added to Gross Profit report Kanchan Chauhan 2016-10-18 16:27:07 +05:30