Commit Graph

  • 2d65a298ef Merge pull request #5607 from rohitwaghchaure/v7_rfq_fixes Rushabh Mehta 2016-06-30 13:37:12 +05:30
  • a314872cb5 [RFQ] Enhancement and minor fixes Rohit Waghchaure 2016-06-30 00:00:42 +05:30
  • 65256ed8cb Merge pull request #5526 from KanchanChauhan/shopping-cart-dropdown-update Rushabh Mehta 2016-06-29 21:59:29 +05:30
  • 5b681666a0 Merge pull request #5605 from saurabh6790/warehouse_tree_fix_1 Rushabh Mehta 2016-06-29 21:58:31 +05:30
  • a11839307f Merge pull request #5553 from saurabh6790/pos_fixes Rushabh Mehta 2016-06-29 21:56:20 +05:30
  • cb862c6683 Merge pull request #5604 from rohitwaghchaure/time_sheet_wages Rushabh Mehta 2016-06-29 21:55:58 +05:30
  • 1301b3b3d1 [fix] set default value for is_group to 0 Saurabh 2016-06-29 19:48:44 +05:30
  • 3fa0b51e5e [Fixes] Time sheet fixes and changed timesheets to time_logs Rohit Waghchaure 2016-06-29 17:57:39 +05:30
  • 028bbee317 [fix] nestedset warehouse fix Saurabh 2016-06-29 19:03:40 +05:30
  • b8a57a4b4d [fix] wareehouse nestedset fix if company not associated with warehouse Saurabh 2016-06-29 18:48:07 +05:30
  • d7d878b6db [fix] label fix Saurabh 2016-06-28 20:04:09 +05:30
  • e6920f6a58 Merge pull request #5603 from KanchanChauhan/Maintenance-Module Rushabh Mehta 2016-06-29 16:08:46 +05:30
  • fb3eb13ca4 New Maintenance Module Kanchan Chauhan 2016-06-29 15:04:08 +05:30
  • 5b9c6e7fa6 [fix] [patch] remove default activity type "Planning" Anand Doshi 2016-06-29 15:32:36 +05:30
  • da43539c53 Merge pull request #5558 from saurabh6790/doc_flow_fix Rushabh Mehta 2016-06-29 12:19:54 +05:30
  • 26a76fb2d9 Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe Rushabh Mehta 2016-06-29 12:11:25 +05:30
  • 67cf8af5f8 Merge pull request #5592 from rohitwaghchaure/time_sheet_wages Rushabh Mehta 2016-06-29 12:11:16 +05:30
  • a62dcce46a [Fix] make_for field removed Rohit Waghchaure 2016-06-29 01:03:38 +05:30
  • 0e4119b2de [fix] use get_domains to prevent mutation of nested dictionary Anand Doshi 2016-06-28 21:37:28 +05:30
  • c8d86cb948 Merge pull request #5572 from saurabh6790/warehouse_tree_fix Nabin Hait 2016-06-28 17:52:10 +05:30
  • 65c8b5a216 Newsletter moved to Frappe Kanchan Chauhan 2016-06-28 11:17:02 +05:30
  • ee17e2f277 [fix] patch fix Saurabh 2016-06-28 15:43:02 +05:30
  • a756e3f765 Reverted changes Kanchan Chauhan 2016-06-22 15:51:42 +05:30
  • 52c2affc9c [fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts Saurabh 2016-06-28 14:41:48 +05:30
  • c8d47da6bc Shopping cart and dropdown cart update Kanchan Chauhan 2016-06-22 15:46:38 +05:30
  • 9a6c6663c1 [minor][fix] throw if payment modes are not set Saurabh 2016-06-27 16:51:44 +05:30
  • 82b8b38b3d [fix] fix filter in previous link mapper Saurabh 2016-06-27 17:51:29 +05:30
  • 4803376da8 Merge pull request #5507 from neilLasrado/develop Rushabh Mehta 2016-06-27 17:48:45 +05:30
  • db53a15bc3 Merge pull request #5557 from saurabh6790/timesheet_fix Rushabh Mehta 2016-06-27 17:48:17 +05:30
  • b7ff027937 Added Safety Stock to Item Master Neil Trini Lasrado 2016-06-17 15:16:54 +05:30
  • 2f788a909f [fixes] time sheet patch fix Saurabh 2016-06-27 17:44:12 +05:30
  • bff0cacd69 Merge pull request #5556 from rohitwaghchaure/time_sheet_wages Rushabh Mehta 2016-06-27 17:31:43 +05:30
  • e95ee43d51 [Fixes] Timesheet Rohit Waghchaure 2016-06-27 17:28:48 +05:30
  • d362b734a2 Merge pull request #5529 from saurabh6790/module_flow Rushabh Mehta 2016-06-27 17:23:46 +05:30
  • 846f2a4989 Merge pull request #5545 from saurabh6790/convert_to_group_or_ledger Rushabh Mehta 2016-06-27 17:23:30 +05:30
  • 93d68ac0c2 [fixes] change is group to check box Saurabh 2016-06-26 22:50:11 +05:30
  • 99892c7ce7 [fix] provision to convert group to ledger and vice versa Saurabh 2016-06-26 22:32:05 +05:30
  • 822209cb03 Merge pull request #5538 from rohitwaghchaure/time_sheet_wages Rushabh Mehta 2016-06-27 17:13:48 +05:30
  • 3be51643cc [fix] ignore setup wizard updates Rushabh Mehta 2016-06-27 17:15:39 +05:30
  • 689130cf9b [minor] fix holiday_list validation Rushabh Mehta 2016-06-27 17:09:59 +05:30
  • 35796683c1 Merge pull request #5555 from saurabh6790/stock_projected_qty Rushabh Mehta 2016-06-27 17:08:39 +05:30
  • ce22d34fcf [fix] report Stock Projected Qty Saurabh 2016-06-27 17:04:07 +05:30
  • d6c986da8f [Enhancement] Time log wages and multiple active salary structure Rohit Waghchaure 2016-06-03 14:44:35 +05:30
  • 18357664cb [fix] routing for item group Rushabh Mehta 2016-06-27 15:42:48 +05:30
  • a2c4dad90e [fix] product search Rushabh Mehta 2016-06-27 14:54:46 +05:30
  • b6d6b8420d [fix] add filters and child doc name in previous link mapper Saurabh 2016-06-27 14:48:26 +05:30
  • 2a0b111726 [fix] mark completed docuemts on document flow Saurabh 2016-06-17 15:43:42 +05:30
  • 8f24ecb173 [fix] set previous doc links for document flow Saurabh 2016-06-16 18:01:58 +05:30
  • 20bedc004e Merge pull request #5548 from saurabh6790/after_rename_for_item_and_item_grp Rushabh Mehta 2016-06-27 12:28:23 +05:30
  • d9131ec4ff [minor][fix] remove website generator call on after rename Saurabh 2016-06-27 12:24:55 +05:30
  • 771ab0c8c3 [fix] [patch] re-route Anand Doshi 2016-06-27 12:04:13 +05:30
  • ee3204373c Merge branch 'develop' of github.com:frappe/erpnext into develop Rushabh Mehta 2016-06-27 10:14:39 +05:30
  • d6b734e2e3 [fix] DuplicateEntryError for Warehouse Account Creation Anand Doshi 2016-06-26 17:43:14 +05:30
  • 110855e572 Merge pull request #5539 from saurabh6790/merge_acc_type_warehouse_and_stock_to_stock Nabin Hait 2016-06-26 14:42:15 +05:30
  • 78333c7e07 [fixes] check group condition Saurabh 2016-06-25 14:18:28 +05:30
  • 7fecb50360 [enhance] rename warehouse account type to stock Saurabh 2016-06-24 13:11:29 +05:30
  • 2ee4d79609 Merge pull request #5540 from KanchanChauhan/customize-retirement-age Nabin Hait 2016-06-26 14:25:45 +05:30
  • 68f5ae5cbf Changes done Kanchan Chauhan 2016-06-26 14:10:24 +05:30
  • 14f0a6fa89 Merge pull request #5534 from KanchanChauhan/itemprice-update-in-pricelist Nabin Hait 2016-06-26 13:07:35 +05:30
  • d454fb0f52 Merge pull request #5544 from saurabh6790/authorization_rule_fix Rushabh Mehta 2016-06-26 13:04:15 +05:30
  • dad5140eac [minor] add task status Rushabh Mehta 2016-06-26 12:20:49 +05:30
  • 520fb73676 [fix] authorization rule fix for sales order Saurabh 2016-06-26 12:09:39 +05:30
  • 494f0e279c Merge pull request #5543 from nabinhait/warehouse_fix Nabin Hait 2016-06-26 08:26:50 +05:30
  • c65f160776 [fix] Identify account group for warehouse based on account type Nabin Hait 2016-06-26 08:25:03 +05:30
  • f576f3b17b implemented get_site_info for erpnext and patch to move setup complete to system settings Anand Doshi 2016-06-25 19:51:48 +05:30
  • 5cba40b74f [fix] [bug] task deletion from project fixes #5470 Rushabh Mehta 2016-06-25 18:44:54 +05:30
  • 723cd64249 [fix] tree view hooks and patch fix Rushabh Mehta 2016-06-25 18:30:03 +05:30
  • 2ff7d2aade Fixed Kanchan Chauhan 2016-06-25 17:54:25 +05:30
  • 4c0df04db0 Retirement Age option in HR Settings Kanchan Chauhan 2016-06-25 17:45:16 +05:30
  • 8942d1782c Merge pull request #5481 from bcornwellmott/patch-2 Nabin Hait 2016-06-25 14:01:32 +05:30
  • 4cc7bcc412 Merge pull request #5495 from bcornwellmott/patch-3 Nabin Hait 2016-06-25 13:58:50 +05:30
  • 2efecac823 Merge pull request #5522 from cgpurbaugh/patch-2 Nabin Hait 2016-06-25 13:54:19 +05:30
  • 173b328380 Merge pull request #5527 from bcornwellmott/patch-4 Nabin Hait 2016-06-25 13:53:55 +05:30
  • 7b6cdf4a63 Merge pull request #5518 from saurabh6790/warehouse_tree Nabin Hait 2016-06-25 13:49:15 +05:30
  • 0420833a59 Merge pull request #5531 from saurabh6790/cheque_print_fixes Nabin Hait 2016-06-25 13:43:56 +05:30
  • dc2fa86222 [fixes] rename ctype to doctype Saurabh 2016-06-24 11:36:31 +05:30
  • 001d4d74fa [fix] in set_valuation_method check for is group condition Saurabh 2016-06-23 17:46:15 +05:30
  • 3a0f96bd00 [patch] patch to move all warehouses under all warehouse group Saurabh 2016-06-23 12:50:09 +05:30
  • 4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account Saurabh 2016-06-23 12:44:06 +05:30
  • ec8babe7ac [minor][fix] Saurabh 2016-06-21 15:55:54 +05:30
  • 1702273968 [fix] rename account browser and sales browser to tree/doctype for view Saurabh 2016-06-21 13:19:17 +05:30
  • ac53357f53 [fixes] renamed _treeview to _tree Saurabh 2016-06-21 12:51:18 +05:30
  • a9ba7343c4 [fix] deprecate browser pages for accounts, cost_center, sales , bom, item group Saurabh 2016-06-21 12:33:12 +05:30
  • 9c7b0079c5 [fixes] warehose group wise stock report and test cases for warehouse hierarchy and warehouse group wise reorder level Saurabh 2016-06-21 11:56:08 +05:30
  • 3d6aecd618 [fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin Saurabh 2016-06-20 17:25:45 +05:30
  • 554f6f70aa [fixes] nested set fix for warehouse, tree for accounts and cost center Saurabh 2016-06-06 14:22:37 +05:30
  • 0e47bfeb16 [enhance] treeview to BOM, sales person, Cost Center and Chart of acounts Saurabh 2016-05-30 17:54:16 +05:30
  • 5f48cb6128 [enhancement] BOM treeview Saurabh 2016-05-27 17:06:27 +05:30
  • d647945102 [fixes] Saurabh 2016-05-26 16:56:14 +05:30
  • eda1afb4eb [fixes] comnify tree view Saurabh 2016-05-25 11:54:54 +05:30
  • 091ca75fa3 [enhance] warehouse browser page for warehouse tree Saurabh 2016-05-24 12:04:45 +05:30
  • dfbcdeb8a0 [enhancement] warehouse tree structure Saurabh 2016-05-24 07:49:00 +05:30
  • b72a2955ac Merge pull request #5537 from saurabh6790/make_route_fix Rushabh Mehta 2016-06-25 10:55:30 +05:30
  • a4a3b022ee [fix] return route from make_route of child class Saurabh 2016-06-25 10:41:03 +05:30
  • 5ee8fccb1a Item Price update in Price List Kanchan Chauhan 2016-06-24 17:11:15 +05:30
  • 994fa8dcef Merge pull request #5530 from rmehta/website-route-fixes Rushabh Mehta 2016-06-24 16:37:43 +05:30
  • bd9680f82e [added] web-forms Rushabh Mehta 2016-06-24 16:16:07 +05:30
  • a334062b03 [redesign] website routing system Rushabh Mehta 2016-06-23 18:25:50 +05:30
  • 438565f678 Merge branch 'master' into develop Nabin Hait 2016-06-24 16:12:26 +05:30
  • 4dd6b7e671 Merge branch 'hotfix' Nabin Hait 2016-06-24 16:11:59 +05:30