Kanchan Chauhan
|
a756e3f765
|
Reverted changes
|
2016-06-28 15:02:35 +05:30 |
|
Saurabh
|
52c2affc9c
|
[fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts
|
2016-06-28 14:41:48 +05:30 |
|
Kanchan Chauhan
|
c8d47da6bc
|
Shopping cart and dropdown cart update
|
2016-06-28 11:29:43 +05:30 |
|
Saurabh
|
9a6c6663c1
|
[minor][fix] throw if payment modes are not set
|
2016-06-27 18:16:07 +05:30 |
|
Saurabh
|
82b8b38b3d
|
[fix] fix filter in previous link mapper
|
2016-06-27 17:51:29 +05:30 |
|
Rushabh Mehta
|
4803376da8
|
Merge pull request #5507 from neilLasrado/develop
Added Minimum Inventory level to Item Master
|
2016-06-27 17:48:45 +05:30 |
|
Rushabh Mehta
|
db53a15bc3
|
Merge pull request #5557 from saurabh6790/timesheet_fix
[fixes] time sheet patch fix
|
2016-06-27 17:48:17 +05:30 |
|
Neil Trini Lasrado
|
b7ff027937
|
Added Safety Stock to Item Master
|
2016-06-27 17:45:08 +05:30 |
|
Saurabh
|
2f788a909f
|
[fixes] time sheet patch fix
|
2016-06-27 17:44:12 +05:30 |
|
Rushabh Mehta
|
bff0cacd69
|
Merge pull request #5556 from rohitwaghchaure/time_sheet_wages
[Fixes] Timesheet
|
2016-06-27 17:31:43 +05:30 |
|
Rohit Waghchaure
|
e95ee43d51
|
[Fixes] Timesheet
|
2016-06-27 17:28:48 +05:30 |
|
Rushabh Mehta
|
d362b734a2
|
Merge pull request #5529 from saurabh6790/module_flow
[fix] previous document links
|
2016-06-27 17:23:46 +05:30 |
|
Rushabh Mehta
|
846f2a4989
|
Merge pull request #5545 from saurabh6790/convert_to_group_or_ledger
warehouse group to ledger conversion
|
2016-06-27 17:23:30 +05:30 |
|
Saurabh
|
93d68ac0c2
|
[fixes] change is group to check box
|
2016-06-27 17:16:56 +05:30 |
|
Saurabh
|
99892c7ce7
|
[fix] provision to convert group to ledger and vice versa
|
2016-06-27 17:16:56 +05:30 |
|
Rushabh Mehta
|
822209cb03
|
Merge pull request #5538 from rohitwaghchaure/time_sheet_wages
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 17:13:48 +05:30 |
|
Rushabh Mehta
|
3be51643cc
|
[fix] ignore setup wizard updates
|
2016-06-27 17:16:00 +05:30 |
|
Rushabh Mehta
|
689130cf9b
|
[minor] fix holiday_list validation
|
2016-06-27 17:16:00 +05:30 |
|
Rushabh Mehta
|
35796683c1
|
Merge pull request #5555 from saurabh6790/stock_projected_qty
[fix] report Stock Projected Qty
|
2016-06-27 17:08:39 +05:30 |
|
Saurabh
|
ce22d34fcf
|
[fix] report Stock Projected Qty
|
2016-06-27 17:05:13 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|
Rushabh Mehta
|
18357664cb
|
[fix] routing for item group
|
2016-06-27 15:42:48 +05:30 |
|
Rushabh Mehta
|
a2c4dad90e
|
[fix] product search
|
2016-06-27 14:55:01 +05:30 |
|
Saurabh
|
b6d6b8420d
|
[fix] add filters and child doc name in previous link mapper
|
2016-06-27 14:48:26 +05:30 |
|
Saurabh
|
2a0b111726
|
[fix] mark completed docuemts on document flow
|
2016-06-27 12:28:55 +05:30 |
|
Saurabh
|
8f24ecb173
|
[fix] set previous doc links for document flow
|
2016-06-27 12:28:55 +05:30 |
|
Rushabh Mehta
|
20bedc004e
|
Merge pull request #5548 from saurabh6790/after_rename_for_item_and_item_grp
[minor][fix] remove website generator call on after rename
|
2016-06-27 12:28:23 +05:30 |
|
Saurabh
|
d9131ec4ff
|
[minor][fix] remove website generator call on after rename
|
2016-06-27 12:25:05 +05:30 |
|
Anand Doshi
|
771ab0c8c3
|
[fix] [patch] re-route
|
2016-06-27 12:04:48 +05:30 |
|
Rushabh Mehta
|
ee3204373c
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2016-06-27 10:14:39 +05:30 |
|
Anand Doshi
|
d6b734e2e3
|
[fix] DuplicateEntryError for Warehouse Account Creation
|
2016-06-26 17:43:14 +05:30 |
|
Nabin Hait
|
110855e572
|
Merge pull request #5539 from saurabh6790/merge_acc_type_warehouse_and_stock_to_stock
Merge acc type warehouse and stock to stock
|
2016-06-26 14:42:15 +05:30 |
|
Saurabh
|
78333c7e07
|
[fixes] check group condition
|
2016-06-26 14:27:46 +05:30 |
|
Saurabh
|
7fecb50360
|
[enhance] rename warehouse account type to stock
|
2016-06-26 14:27:46 +05:30 |
|
Nabin Hait
|
2ee4d79609
|
Merge pull request #5540 from KanchanChauhan/customize-retirement-age
Retirement Age option in HR Settings
|
2016-06-26 14:25:45 +05:30 |
|
Kanchan Chauhan
|
68f5ae5cbf
|
Changes done
|
2016-06-26 14:10:24 +05:30 |
|
Nabin Hait
|
14f0a6fa89
|
Merge pull request #5534 from KanchanChauhan/itemprice-update-in-pricelist
Item Price update in Price List
|
2016-06-26 13:07:35 +05:30 |
|
Rushabh Mehta
|
d454fb0f52
|
Merge pull request #5544 from saurabh6790/authorization_rule_fix
[fix] authorization rule fix for sales order
|
2016-06-26 13:04:15 +05:30 |
|
Rushabh Mehta
|
dad5140eac
|
[minor] add task status
|
2016-06-26 12:21:20 +05:30 |
|
Saurabh
|
520fb73676
|
[fix] authorization rule fix for sales order
|
2016-06-26 12:09:49 +05:30 |
|
Nabin Hait
|
494f0e279c
|
Merge pull request #5543 from nabinhait/warehouse_fix
[fix] Identify account group for warehouse based on account type
|
2016-06-26 08:26:50 +05:30 |
|
Nabin Hait
|
c65f160776
|
[fix] Identify account group for warehouse based on account type
|
2016-06-26 08:25:51 +05:30 |
|
Anand Doshi
|
f576f3b17b
|
implemented get_site_info for erpnext and patch to move setup complete to system settings
|
2016-06-25 19:52:26 +05:30 |
|
Rushabh Mehta
|
5cba40b74f
|
[fix] [bug] task deletion from project fixes #5470
|
2016-06-25 18:44:59 +05:30 |
|
Rushabh Mehta
|
723cd64249
|
[fix] tree view hooks and patch fix
|
2016-06-25 18:30:03 +05:30 |
|
Kanchan Chauhan
|
2ff7d2aade
|
Fixed
|
2016-06-25 17:54:25 +05:30 |
|
Kanchan Chauhan
|
4c0df04db0
|
Retirement Age option in HR Settings
|
2016-06-25 17:45:16 +05:30 |
|
Nabin Hait
|
8942d1782c
|
Merge pull request #5481 from bcornwellmott/patch-2
Create Manufacture MRs for BOM Items
|
2016-06-25 14:01:32 +05:30 |
|
Nabin Hait
|
4cc7bcc412
|
Merge pull request #5495 from bcornwellmott/patch-3
Add "Get items from Material Request"
|
2016-06-25 13:58:50 +05:30 |
|
Nabin Hait
|
2efecac823
|
Merge pull request #5522 from cgpurbaugh/patch-2
Some minor grammatical and spelling changes
|
2016-06-25 13:54:19 +05:30 |
|