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

Commit Graph

  • d50356dbab [docs] remove /docs/current from repo, they are re-built anyways Rushabh Mehta 2016-02-04 17:10:24 +05:30
  • d1ba86a952 Merge branch 'develop' of github.com:frappe/erpnext into develop Rushabh Mehta 2016-02-04 17:09:18 +05:30
  • 03f7aa9dab Merge pull request #4741 from ShashaQin/patch-20 Nabin Hait 2016-02-04 14:38:29 +05:30
  • 8c63697f41 Update item_wise_purchase_history.json ShashaQin 2016-02-04 16:46:46 +08:00
  • e7dccca782 Update item_wise_sales_history.json ShashaQin 2016-02-04 16:44:18 +08:00
  • 8d0ed21c04 Added From and To date to Holiday Report Changed HD to H in Monthly Attendance Report Valmik Jangla 2016-02-04 12:18:55 +05:30
  • bcc56a4557 Update gross_profit.py ShashaQin 2016-02-04 11:45:00 +08:00
  • 7bb2f3a27b [fix] newsletter priority Rushabh Mehta 2016-02-03 16:19:49 +05:30
  • 2d4cc7e71f Merge branch 'develop' Nabin Hait 2016-02-03 15:23:56 +05:30
  • fba61abd2a bumped to version 6.20.0 Nabin Hait 2016-02-03 15:53:56 +06:00
  • 94bfe8ea0d [change-log] Nabin Hait 2016-02-03 15:14:17 +05:30
  • 31619f0a83 [docs] Nabin Hait 2016-02-03 15:13:55 +05:30
  • 34037e0d88 [translations] Nabin Hait 2016-02-03 13:10:54 +05:30
  • 647102fc94 Merge pull request #4729 from vjFaLk/doc-update Nabin Hait 2016-02-03 13:01:02 +05:30
  • a533b33fc6 Merge pull request #4730 from nabinhait/ShashaQin-patch-8 Nabin Hait 2016-02-03 12:55:36 +05:30
  • 995a71c854 Update leave_application.py ShashaQin 2016-02-03 13:10:15 +08:00
  • bd7f48cfd4 [report] Financial Statements: Accumulated periodic balance based on filters Nabin Hait 2016-02-02 19:05:30 +05:30
  • 82cef59fb3 [fix] Purchase Return warehouse validation Nabin Hait 2016-02-02 19:02:58 +05:30
  • cc6ce5beac Update financial_statements.py ShashaQin 2016-02-01 09:43:45 +08:00
  • 15d7224335 Update balance_sheet.py ShashaQin 2016-02-01 09:35:53 +08:00
  • 1f51e71827 Update profit_and_loss_statement.py ShashaQin 2016-02-01 09:32:44 +08:00
  • 539a826b37 Update financial_statements.js ShashaQin 2016-02-01 09:25:10 +08:00
  • 0ec9b90113 Updated documentation Valmik Jangla 2016-02-02 18:29:09 +05:30
  • 49b275ad1d Merge pull request #4704 from chaoyee/develop Nabin Hait 2016-02-02 16:11:35 +05:30
  • 7957f0ecea Merge pull request #4726 from nabinhait/develop Nabin Hait 2016-02-02 16:08:40 +05:30
  • 3c55d89f7f [minor] Reference doctype in Item-wise price List Rate report Nabin Hait 2016-02-01 15:55:02 +05:30
  • d5fda57297 [fix] Ignore permissions and made Customer warehouse field hidden in selling cycle Nabin Hait 2016-02-01 12:55:23 +05:30
  • a85a1ff145 [fix] Validate rate with reference doc Nabin Hait 2016-02-01 12:54:19 +05:30
  • afb8ec9cb6 [fix] Validate company abbr Nabin Hait 2016-02-01 12:52:58 +05:30
  • 8b92de26f0 Merge pull request #4718 from vjFaLk/holiday-fix Nabin Hait 2016-02-01 15:49:15 +05:30
  • fcd4f2b86b Merge pull request #4706 from vrms/vrms-patch-1 Nabin Hait 2016-02-01 15:47:57 +05:30
  • 1277a61dad Merge pull request #4720 from agusputra/patch-7 Nabin Hait 2016-02-01 15:47:07 +05:30
  • 767d5e48e7 Merge pull request #4723 from ShashaQin/patch-12 Nabin Hait 2016-02-01 15:38:48 +05:30
  • ed11e93b25 Update stock_reconciliation.py ShashaQin 2016-02-01 16:54:19 +08:00
  • 1d702bf112 Update stock_reconciliation_item.json ShashaQin 2016-02-01 16:51:01 +08:00
  • 43cdf792f9 Merge pull request #4715 from agusputra/patch-6 Anand Doshi 2016-02-01 14:17:24 +05:30
  • 687888133b Merge pull request #4716 from agusputra/patch-5 Anand Doshi 2016-02-01 14:17:04 +05:30
  • e0825aaea9 Update delete-a-company-and-all-related-transactions.md Agus Syahputra 2016-02-01 08:20:36 +07:00
  • 0a76b8b29a Fixed issue where no Holidays would cause the report to break Valmik Jangla 2016-01-30 10:59:40 +05:30
  • 0277dbc6b6 Update stock-reconciliation-for-non-serialized-item.md Agus Syahputra 2016-01-30 07:28:28 +07:00
  • 93a69e9485 Update authorization-rule.md Agus Syahputra 2016-01-29 23:41:46 +07:00
  • 6e33d91443 [minor] fixes to attendance tool and employee holiday attendance Anand Doshi 2016-01-29 16:57:10 +05:30
  • 07364f5ece Feature - Employee Attendance Tool Valmik Jangla 2016-01-27 17:43:57 +05:30
  • 1890c794d7 Added Employee Report Attendance Report Made Holiday details mandatory Valmik Jangla 2016-01-27 12:11:47 +05:30
  • 71a9be8add Update material_request.py Chao-Yee Hsu 許朝益 2016-01-29 18:45:22 +08:00
  • fd131a4210 Merge pull request #4699 from neilLasrado/tl-fix Anand Doshi 2016-01-29 15:51:24 +05:30
  • 1a943151d7 [Refactor/Cleanup] Cleaned debug print statement Refactored code to use format() instead of string formatting using %s shreyas 2016-01-29 12:39:58 +05:30
  • c761f1b0a1 [Minor] Cleanup shreyas 2016-01-28 17:27:07 +05:30
  • e970ddcee9 [Fix] 1. Sales Person wise transaction report 2. Sales Person wise target variance report 3. Sales order trend report generation for selection in group by feild shreyas 2016-01-28 16:38:59 +05:30
  • 51db2ba22a [Partial]Fixed Sales person target variance report shreyas 2016-01-28 14:30:30 +05:30
  • cbc18ffdbf [Partial] Fixed the issue for Territory Item Group Variance report shreyas 2016-01-27 18:07:33 +05:30
  • 5b7d0a960e Fixed indicators & List view in Time Log, Time Log Batch Neil Trini Lasrado 2016-01-29 15:02:28 +05:30
  • 172efb1e87 Fixed error messages while making Time Log Batch from Time Log List view Neil Trini Lasrado 2016-01-27 19:11:05 +05:30
  • 95760a7db6 Merge pull request #4680 from shyjuk/patch-1 Anand Doshi 2016-01-29 12:19:14 +05:30
  • 9c24bec654 Merge branch 'nabinhait-mc_fix_5' into develop Anand Doshi 2016-01-29 12:16:35 +05:30
  • 7c0a58ac3f [fix] show formatted currency value in advance paid validation Anand Doshi 2016-01-29 12:16:24 +05:30
  • 77e4f6b774 [fix] strip item_code before autoname Anand Doshi 2016-01-29 11:29:05 +05:30
  • 5bedd649df Merge pull request #4691 from anandpdoshi/cleanup/remove-is-service-item Nabin Hait 2016-01-29 11:10:54 +05:30
  • 7207d21962 Merge pull request #4694 from umairsy/21-jan Anand Doshi 2016-01-29 11:09:35 +05:30
  • c118fc9343 Update material_request.py Chao-Yee Hsu 許朝益 2016-01-29 10:38:33 +08:00
  • bad13369d4 [minor] added abbreviate function in company Rushabh Mehta 2016-01-27 18:58:21 +05:30
  • bf225c11b4 fixed articles Umair Sayyed 2016-01-27 18:19:06 +05:30
  • 694edbc89a updated articles Umair Sayyed 2016-01-27 15:11:58 +05:30
  • 6406f8bda0 discount article Umair Sayyed 2016-01-27 12:45:30 +05:30
  • 2901e14c59 articles Umair Sayyed 2016-01-27 12:22:27 +05:30
  • 5204eeedf7 articles Umair Sayyed 2016-01-27 11:33:27 +05:30
  • ee8f88d641 [patch] Set party account currency in existing orders Nabin Hait 2016-01-27 16:01:31 +05:30
  • b2206d1155 [fix] Multi currency advance payment against Order Nabin Hait 2016-01-27 15:43:12 +05:30
  • c54e25b5c7 Merge branch 'develop' Anand Doshi 2016-01-27 14:20:19 +05:30
  • 6e36a48521 bumped to version 6.19.0 Anand Doshi 2016-01-27 14:50:19 +06:00
  • eca2e42ecb [fix] patch title field of Pricing Rule Anand Doshi 2016-01-27 12:36:21 +05:30
  • d7f7d5c9db [translations] Anand Doshi 2016-01-27 12:36:04 +05:30
  • 37b0f7ca47 [language] Added Estonian, Telugu and Urdu. Fixes frappe/translator#64 and frappe/translator#66 Anand Doshi 2016-01-27 12:35:46 +05:30
  • f4d5a66162 [change log] Anand Doshi 2016-01-27 11:29:25 +05:30
  • a84186c209 Merge pull request #4692 from agusputra/patch-3 Anand Doshi 2016-01-27 12:26:34 +05:30
  • eb4c299bdb Update terms-and-conditions.md Agus Syahputra 2016-01-27 09:34:00 +07:00
  • 5b1b2fb858 Merge branch 'shreyasp-disable_cust_supp' into develop Anand Doshi 2016-01-26 16:41:11 +05:30
  • eba9ca4d66 [Minor]Change to maintain args ordering convention shreyas 2016-01-26 14:56:52 +05:30
  • 01de945388 [cleanup] Removed 'Is Service Item' checkbox and filters Anand Doshi 2016-01-26 16:22:50 +05:30
  • 79872bf62c [Refactor]Changed variable name to avoid conflict between args and local variable shreyas 2016-01-26 13:57:06 +05:30
  • c8ac3b042b [Minor]Refactored code for better readability shreyas 2016-01-26 13:23:38 +05:30
  • f76853a8d9 [Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen shreyas 2016-01-25 21:25:11 +05:30
  • 323dc96c99 [Travis] Fixed reference failure in party.py shreyas 2016-01-25 17:59:44 +05:30
  • 2563f404d2 [Minor Change] Updated queries.py shreyas 2016-01-25 17:44:09 +05:30
  • 29b565fdf5 Added Disabled field to Supplier and Customer doctype Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO shreyas 2016-01-25 17:30:49 +05:30
  • 2ea5c6913d Merge pull request #4685 from shreyasp/supplier-credit-fix Anand Doshi 2016-01-25 17:58:21 +05:30
  • 5dcb40bc96 Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy Anand Doshi 2016-01-25 17:27:04 +05:30
  • c07489a096 [fix] Journal Entry: init debit/credit in account currency Anand Doshi 2016-01-25 17:23:36 +05:30
  • 39e2c2bb09 [fix] obey no_copy while creating recurring documents Anand Doshi 2016-01-25 17:03:50 +05:30
  • e1a1c8ac31 [minor] clean up message if no Customer from Quotation > Sales Order, fixes #3854 Rushabh Mehta 2016-01-25 13:08:21 +05:30
  • 28a6578ba2 Added the credit_days_based_on field to Supplier and Supplier Type doctype shreyas 2016-01-25 12:44:14 +05:30
  • 932cf08aee Update index.md Shyju Kanaprath 2016-01-24 10:00:29 +05:30
  • 47c2aa179b [fix] test case for get_item_details Anand Doshi 2016-01-21 23:17:47 +05:30
  • f7e9a9d786 Merge branch 'develop' Anand Doshi 2016-01-21 22:32:08 +05:30
  • 04230cb656 bumped to version 6.18.4 Anand Doshi 2016-01-21 23:02:08 +06:00
  • 54abf025b7 [hotfix] get_price_list_rate Anand Doshi 2016-01-21 22:28:47 +05:30
  • 39ac535bdb Merge branch 'develop' Anand Doshi 2016-01-21 21:06:34 +05:30
  • dd74b5d44f bumped to version 6.18.3 Anand Doshi 2016-01-21 21:36:34 +06:00
  • afe85bdd04 [hotfix] use me.frm.doc in get_item_details Anand Doshi 2016-01-21 21:04:16 +05:30
  • e4b44a86a6 Merge branch 'develop' Nabin Hait 2016-01-21 18:53:36 +05:30