Rushabh Mehta
|
da43539c53
|
Merge pull request #5558 from saurabh6790/doc_flow_fix
[minor][fix] fix filter in previous link mapper
|
2016-06-29 12:19:54 +05:30 |
|
Rushabh Mehta
|
26a76fb2d9
|
Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe
Newsletter moved to Frappe
|
2016-06-29 12:11:25 +05:30 |
|
Rohit Waghchaure
|
a62dcce46a
|
[Fix] make_for field removed
|
2016-06-29 01:42:52 +05:30 |
|
Anand Doshi
|
0e4119b2de
|
[fix] use get_domains to prevent mutation of nested dictionary
|
2016-06-28 21:37:28 +05:30 |
|
Kanchan Chauhan
|
65c8b5a216
|
Newsletter moved to Frappe
|
2016-06-28 17:28:40 +05:30 |
|
Saurabh
|
ee17e2f277
|
[fix] patch fix
|
2016-06-28 15:43:02 +05:30 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
Nabin Hait
|
173b328380
|
Merge pull request #5527 from bcornwellmott/patch-4
Fix Percent Billed to show Percentage
|
2016-06-25 13:53:55 +05:30 |
|
Nabin Hait
|
7b6cdf4a63
|
Merge pull request #5518 from saurabh6790/warehouse_tree
Warehouse tree
|
2016-06-25 13:49:15 +05:30 |
|
Nabin Hait
|
0420833a59
|
Merge pull request #5531 from saurabh6790/cheque_print_fixes
[fixes] set default values to cheque print and set background image o…
|
2016-06-25 13:43:56 +05:30 |
|
Saurabh
|
dc2fa86222
|
[fixes] rename ctype to doctype
|
2016-06-25 11:16:55 +05:30 |
|
Saurabh
|
001d4d74fa
|
[fix] in set_valuation_method check for is group condition
|
2016-06-25 11:06:15 +05:30 |
|
Saurabh
|
3a0f96bd00
|
[patch] patch to move all warehouses under all warehouse group
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
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
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
ec8babe7ac
|
[minor][fix]
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
1702273968
|
[fix] rename account browser and sales browser to tree/doctype for view
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
ac53357f53
|
[fixes] renamed _treeview to _tree
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
a9ba7343c4
|
[fix] deprecate browser pages for accounts, cost_center, sales , bom, item group
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
9c7b0079c5
|
[fixes] warehose group wise stock report and test cases for warehouse hierarchy and warehouse group wise reorder level
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
3d6aecd618
|
[fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
554f6f70aa
|
[fixes] nested set fix for warehouse, tree for accounts and cost center
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
0e47bfeb16
|
[enhance] treeview to BOM, sales person, Cost Center and Chart of acounts
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
5f48cb6128
|
[enhancement] BOM treeview
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
d647945102
|
[fixes]
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
eda1afb4eb
|
[fixes] comnify tree view
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
091ca75fa3
|
[enhance] warehouse browser page for warehouse tree
|
2016-06-25 11:06:12 +05:30 |
|
Saurabh
|
dfbcdeb8a0
|
[enhancement] warehouse tree structure
|
2016-06-25 11:06:12 +05:30 |
|
Saurabh
|
a4a3b022ee
|
[fix] return route from make_route of child class
|
2016-06-25 10:43:02 +05:30 |
|
Kanchan Chauhan
|
5ee8fccb1a
|
Item Price update in Price List
|
2016-06-24 17:11:15 +05:30 |
|
Rushabh Mehta
|
994fa8dcef
|
Merge pull request #5530 from rmehta/website-route-fixes
[redesign] website routing system
|
2016-06-24 16:37:43 +05:30 |
|
Rushabh Mehta
|
bd9680f82e
|
[added] web-forms
|
2016-06-24 16:41:33 +05:30 |
|
Rushabh Mehta
|
a334062b03
|
[redesign] website routing system
|
2016-06-24 16:18:07 +05:30 |
|
Nabin Hait
|
438565f678
|
Merge branch 'master' into develop
|
2016-06-24 16:12:26 +05:30 |
|
Nabin Hait
|
23b190414c
|
bumped to version 6.27.25
|
2016-06-24 16:41:59 +06:00 |
|
Nabin Hait
|
0bfd4849ca
|
minot fix
|
2016-06-24 16:04:31 +05:30 |
|
Nabin Hait
|
2effad33d0
|
Merge branch 'master' into develop
|
2016-06-24 12:48:24 +05:30 |
|
Nabin Hait
|
0e19e72a5d
|
bumped to version 6.27.24
|
2016-06-24 13:16:27 +06:00 |
|
Nabin Hait
|
6dfc78b12a
|
Item Valuation Rate in case of negative inventory
|
2016-06-24 12:28:55 +05:30 |
|
Saurabh
|
777f556b14
|
[fixes] set default values to cheque print and set background image only if attachment exist
|
2016-06-23 20:25:37 +05:30 |
|
bcornwellmott
|
813dddeb10
|
Fix Percent Billed to show Percentage
Previously was showing Currency
|
2016-06-22 14:49:31 -07:00 |
|
Rushabh Mehta
|
8a065e0028
|
[rename] Bulk Email to Email Queue
|
2016-06-22 12:58:39 +05:30 |
|
Rushabh Mehta
|
4d54fb258c
|
Merge pull request #5514 from cgpurbaugh/patch-1
Update tasks.md
|
2016-06-22 12:09:21 +05:30 |
|
Rushabh Mehta
|
6e7dc12fde
|
Merge pull request #5476 from umairsy/14-jun
In the Setup Wizard, changed field label from Bank Account to Bank Name
|
2016-06-22 12:09:01 +05:30 |
|
Rushabh Mehta
|
560ee7bb12
|
Merge pull request #5480 from vjFaLk/restrict-newsletter-list
Added code to Restrict Newsletter List Recipients
|
2016-06-22 12:08:41 +05:30 |
|
Rushabh Mehta
|
4cf914d902
|
[minor] added mins to first response for opportunity
|
2016-06-22 11:22:12 +05:30 |
|
Christopher G. Purbaugh
|
01d4d30e8a
|
Some minor grammatical and spelling changes
|
2016-06-21 15:42:20 -04:00 |
|
Nabin Hait
|
a531ebea8a
|
Merge branch 'master' into develop
|
2016-06-21 16:44:05 +05:30 |
|
Nabin Hait
|
a5162b7529
|
Merge branch 'hotfix'
|
2016-06-21 16:42:40 +05:30 |
|
Nabin Hait
|
2eb9b34ff2
|
bumped to version 6.27.23
|
2016-06-21 17:11:34 +06:00 |
|
Nabin Hait
|
5db108116a
|
Merge pull request #5446 from rohitwaghchaure/purchase_register_total_amount_issue
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
|
2016-06-21 16:29:27 +05:30 |
|
Nabin Hait
|
bf3e26dd2d
|
Merge pull request #5466 from rohitwaghchaure/shipping_address_autocomplete_issue
[Fix] Shipping address's get_query not working on autocomplete.
|
2016-06-21 16:28:12 +05:30 |
|
Christopher G. Purbaugh
|
55990efe29
|
Update index.md
Removed some repetitive text, changed some of the wording.
|
2016-06-20 15:08:08 -04:00 |
|
Christopher G. Purbaugh
|
22e0489ac7
|
Update tasks.md
|
2016-06-20 14:36:28 -04:00 |
|
Christopher G. Purbaugh
|
7f89c1aec0
|
Update tasks.md
Just some small grammatical corrections
|
2016-06-20 14:28:44 -04:00 |
|
Umair Sayyed
|
5918dc87f3
|
small fixes
|
2016-06-17 12:28:21 +05:30 |
|
bcornwellmott
|
9af68078f6
|
Add "Get items from Material Request"
Allows users to pull items from multiple Material Requests into a Request for Quotation
|
2016-06-16 14:10:57 -07:00 |
|
Rohit Waghchaure
|
c65c38d293
|
[POS] Minor fixes
|
2016-06-16 11:49:37 +05:30 |
|
bcornwellmott
|
c0a3311836
|
Create Manufacture MRs for BOM Items
Corrects an issue where items with BOMs have Purchase material request submitted instead of Manufacture material requests.
|
2016-06-15 11:16:12 -07:00 |
|
Rushabh Mehta
|
2cb7a9f235
|
[ux] taxes table editable
|
2016-06-15 16:45:03 +05:30 |
|
Valmik Jangla
|
2225decb2b
|
Restrict Newsletter lists
|
2016-06-15 16:04:17 +05:30 |
|
Rushabh Mehta
|
b5f2c78f8f
|
[list] reports for item list
|
2016-06-15 12:57:22 +05:30 |
|
Rushabh Mehta
|
dc1758b36e
|
[report] minutes to first response for issues
|
2016-06-14 18:26:09 +05:30 |
|
Rushabh Mehta
|
f7e6ec0654
|
[report] minutes to first response for issues
|
2016-06-14 18:08:51 +05:30 |
|
Rushabh Mehta
|
57f35ddb4a
|
[minor] fix update_mins_to_first_response patch
|
2016-06-14 16:29:33 +05:30 |
|
Rushabh Mehta
|
1d1bc27a57
|
[minor] fix update_mins_to_first_response patch
|
2016-06-14 16:27:50 +05:30 |
|
Rushabh Mehta
|
a55fb6426c
|
[patch] mins_to_first_response in opporutnity and issue
|
2016-06-14 15:54:54 +05:30 |
|
Maxwell Morais
|
f8122646ba
|
Set get_contact_details and get_address_display to the right standard!
|
2016-06-14 15:19:00 +05:30 |
|
Umair Sayyed
|
9a0ff298ce
|
Changed field label from Bank Account to Bank Name
|
2016-06-14 12:25:34 +05:30 |
|
Nabin Hait
|
1df75c930f
|
Merge pull request #5390 from MaxMorais/patch-5
get_address_display cannot be called directly
|
2016-06-14 11:32:06 +05:30 |
|
Rohit Waghchaure
|
9fe40d557f
|
[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.
|
2016-06-14 01:11:09 +05:30 |
|
Rushabh Mehta
|
d1eba515e9
|
[cleanup] fixes to v7
|
2016-06-13 17:47:13 +05:30 |
|
Anand Doshi
|
7f8142d30d
|
[fix] reuse user.reset_password in RFQ
|
2016-06-13 17:23:18 +05:30 |
|
Rushabh Mehta
|
dd7524f844
|
[minor] msgprint as alert
|
2016-06-12 11:16:23 +05:30 |
|
Rushabh Mehta
|
538607e6b6
|
[cleanup] a better message for insufficient stock
|
2016-06-12 11:03:00 +05:30 |
|
Rohit Waghchaure
|
2dd26055c9
|
[Fix] Shipping address's get_query not working on autocomplete.
|
2016-06-11 01:48:00 +05:30 |
|
Rushabh Mehta
|
e0686b32f3
|
[minor] cleanups
|
2016-06-10 12:38:52 +05:30 |
|
Rohit Waghchaure
|
28c02fe51d
|
[Fix] POS page loading issue, if system has only one item
|
2016-06-10 00:48:03 +05:30 |
|
Anand Doshi
|
51ad436e16
|
[fix] sales and accounts browser name
|
2016-06-09 19:37:35 +05:30 |
|
Anand Doshi
|
34482788f4
|
[fix] removed bad import
|
2016-06-09 16:57:16 +05:30 |
|
Anand Doshi
|
8f6e6ff543
|
[fix] removed bad import
|
2016-06-09 16:57:08 +05:30 |
|
Anand Doshi
|
d492b675a7
|
[fix] removed bad import
|
2016-06-09 16:56:54 +05:30 |
|
Anand Doshi
|
754f8b42f5
|
[version] changed to 7.0.0-beta
|
2016-06-09 16:31:57 +05:30 |
|
Anand Doshi
|
227b238fb1
|
[fix] change in versioning: store __version__ in __init__.py
|
2016-06-09 16:31:01 +05:30 |
|
Anand Doshi
|
36a0c5c564
|
[fix] change in versioning: store __version__ in __init__.py
|
2016-06-09 16:29:46 +05:30 |
|
Anand Doshi
|
db6b832302
|
[fix] change in versioning: store __version__ in __init__.py
|
2016-06-09 16:29:12 +05:30 |
|
Rushabh Mehta
|
d56306add0
|
[minor] [fix] quotation cancelled status issue, fixes #5221
|
2016-06-09 15:56:48 +05:30 |
|
Rushabh Mehta
|
743de9b306
|
[minor] website field in customer and allow_import for purchase receipt, fixes #5227
|
2016-06-09 15:11:45 +05:30 |
|
Rushabh Mehta
|
cb29d9886c
|
[minor] fixes #5252
|
2016-06-08 17:31:11 +05:30 |
|
Rushabh Mehta
|
e9d2c3d46e
|
[fix] report requested items to be transferred, fixes #5295
|
2016-06-08 16:41:09 +05:30 |
|
Rushabh Mehta
|
6e837599b1
|
[minor] added cost center to item wise sales register, fixes #5301
|
2016-06-08 16:35:10 +05:30 |
|
Rushabh Mehta
|
e778e59e4c
|
[minor] always show issues in sidebar
|
2016-06-08 15:34:54 +05:30 |
|
Rushabh Mehta
|
7ce345a827
|
[minor] re-organize issue
|
2016-06-08 11:10:34 +05:30 |
|
Rushabh Mehta
|
0b955e6c33
|
[minor] production planning, fix description
|
2016-06-08 11:10:34 +05:30 |
|
Anand Doshi
|
16e2442278
|
[cleanup] document flow
|
2016-06-07 18:55:23 +05:30 |
|
Saurabh
|
a8217dc7e9
|
[fixes] build json fixes
|
2016-06-07 17:19:36 +05:30 |
|
Saurabh
|
7d0e78d399
|
[fixes] this.frm instead of cur_frm
|
2016-06-07 17:19:36 +05:30 |
|
Saurabh
|
2966d89e2a
|
[fixes] create module flow list
|
2016-06-07 17:19:36 +05:30 |
|
Saurabh
|
9df3d0fb8a
|
[enhance] show module flow on top of document
|
2016-06-07 17:19:36 +05:30 |
|
RobertSchouten
|
f28a5da952
|
[fix] show company in list view
allows address and contact to only contain company not customer or supplier or sales partner
|
2016-06-07 17:03:41 +08:00 |
|
Maxwell Morais
|
1ea13f1f49
|
Set get_contact_details and get_address_display to the right standard!
|
2016-06-07 02:35:11 -03:00 |
|
Maxwell Morais
|
57b6b1dc85
|
Set get_contact_details to the right standard!
|
2016-06-07 02:32:47 -03:00 |
|
Rushabh Mehta
|
6125abc495
|
Merge pull request #5430 from shreyasp/issue/prod-order-qty
[Fix] Allow user to quantity in fraction while transferring material using production order
|
2016-06-07 10:58:20 +05:30 |
|
Rohit Waghchaure
|
690a0805f6
|
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
|
2016-06-07 10:46:59 +05:30 |
|
ShashaQin
|
6cac50b52e
|
Update bom.py
|
2016-06-07 09:38:57 +08:00 |
|
Nabin Hait
|
3bc300a207
|
Merge branch 'master' into develop
|
2016-06-03 11:57:30 +05:30 |
|
Nabin Hait
|
ef7b6ab8ef
|
bumped to version 6.27.22
|
2016-06-03 12:20:19 +06:00 |
|
Rushabh Mehta
|
eb1e0673e2
|
Merge pull request #5354 from saurabh6790/cheque_print
Cheque print
|
2016-06-02 17:48:58 +05:30 |
|
Rushabh Mehta
|
c5c0d96064
|
Merge pull request #5395 from saurabh6790/payment_request_ux
[enhance] ux fixes for payment request, added jinja for payment reque…
|
2016-06-02 17:48:36 +05:30 |
|