Neil Trini Lasrado
3fbbb71afc
Added ability to freeze Customer/Supplier
2015-07-28 12:17:02 +05:30
Nabin Hait
a2f18ba794
[fix] Contact section visibility in Warranty Claim
2015-07-28 12:00:45 +05:30
Nabin Hait
9088432f10
Fetch default expense account and cost center from item if company matches, otherwise fetch from company master
2015-07-28 11:16:22 +05:30
Nabin Hait
c80059e10e
[fix] Ignore making SLE for opening stock reco with zero qty
2015-07-28 11:16:22 +05:30
Anand Doshi
8e8e9c61ca
[minor] Show description in Sales Order
2015-07-28 10:46:14 +05:30
Rushabh Mehta
424f0c7b84
[fix] [setup wizard] ignore fiscal year
2015-07-28 10:36:33 +05:30
Rushabh Mehta
aa5fb5e50e
[fix] [setup wizard] ignore if user is the primary user
2015-07-28 10:31:09 +05:30
Rushabh Mehta
08a60653ba
[fix] [setup wizard] ignore if user is the primary user
2015-07-28 09:22:36 +05:30
Meatechsupport
8b96fdac12
Indentation Error
...
realligned
2015-07-27 16:55:54 +04:00
Meatechsupport
e319598c51
IndentationError
...
alligned code
2015-07-27 16:42:22 +04:00
Nabin Hait
0b5260acf0
bumped to version 5.3.1
2015-07-27 17:41:16 +06:00
Nabin Hait
d4be82cf9b
corrected typo
2015-07-27 17:09:54 +05:30
Nabin Hait
b71471fcb5
minor fix
2015-07-27 17:09:07 +05:30
Nabin Hait
228ff87ea2
bumped to version 5.3.0
2015-07-27 16:25:56 +06:00
Nabin Hait
8d8655e1cd
Change log added
2015-07-27 15:54:39 +05:30
Meatechsupport
5c73bafeaa
Modifying the number of leave days calculation part.
...
we don't need to exclude the Holiday list (that comes in between) from the total number of leaves applied.
Add option in the leave type
added a field in the leave type to include and exclude the holidays from
the tolal leave applied days
Added the field
Added a field Include Holiday to leave Type doctype
changed the lable
changed the lable from "Include Holiday" to "Include holidays within leaves
as leaves"
Rearranged the function
moved holidays = leave_app.get_holidays() under if
Corrected 'total_leave_days' : flt(tot_days)-flt(holidays)
Adding test case
added the test case
Added test case
Added test case to test_leave_application.py
adding default value
added default value and corrected the syntax.
IndentationError
removed extra tabs after
2015-07-27 13:46:00 +04:00
Anand Doshi
14859faf17
[minor] Accounts Payable Report Type='Script Report'
2015-07-24 17:30:39 +05:30
Nabin Hait
2b7eda8135
Merge pull request #3683 from nabinhait/return
...
Sales / Purchase Return Enhancement
2015-07-24 16:53:01 +05:30
Anand Doshi
751d7ecd85
Merge pull request #3716 from tmimori/develop
...
Removed HTML from messages
2015-07-24 14:28:59 +05:30
Nabin Hait
6a09b3f7ef
Merge pull request #3702 from neilLasrado/capacity-planning
...
Global switch to set capacity planning in manufacturing
2015-07-24 14:26:28 +05:30
Nabin Hait
21897e3c52
Merge pull request #3714 from nabinhait/fix4
...
[fix] gross profit report
2015-07-24 14:25:35 +05:30
Tsutomu Mimori
196a0bc675
Amend for frappe/erpnext/pull/3716
2015-07-24 17:06:00 +09:00
Tsutomu Mimori
7c011985f0
Merge remote-tracking branch 'frappe/develop' into develop
2015-07-24 17:02:13 +09:00
Nabin Hait
3cf67a462b
Cleanup and test cases for serialized item
2015-07-24 13:26:54 +05:30
Nabin Hait
f061877b4f
[fix] Stock Entry permissions
2015-07-24 13:26:54 +05:30
Nabin Hait
04d244a360
Credit Note print format
2015-07-24 13:26:54 +05:30
Nabin Hait
b74999da82
[testcase] Testcase for return purchase invoice
2015-07-24 13:26:53 +05:30
Nabin Hait
061f7079ed
Test case for purchase return
2015-07-24 13:26:53 +05:30
Nabin Hait
246ed3f122
Test cases for sales return
2015-07-24 13:26:53 +05:30
Nabin Hait
6b25708b7a
Minor fixes
2015-07-24 13:26:53 +05:30
Nabin Hait
623ed57663
Removed Sales/Purchase Return option from Stock Entry
2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Nabin Hait
ada485f096
Outgoing rate in Purchase Return based on reference/original Purchase Receipt rate
2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
8a9d41a92e
Modified Test Cases for Production Order
2015-07-24 13:18:45 +05:30
Neil Trini Lasrado
f965c5d203
now_datetime changed to nowdate
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
21647974c4
Test Cases Added to Production Order
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
9c3dca63fa
Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation
2015-07-24 13:14:56 +05:30
Tsutomu Mimori
c40b99be26
Merge remote-tracking branch 'frappe/develop' into develop
2015-07-23 22:10:40 +09:00
Tsutomu Mimori
982f4ae44d
Removed HTML from messages
2015-07-23 22:09:35 +09:00
Anand Doshi
9257413b68
[minor] Added 'Import Data' in sample data
2015-07-23 18:16:44 +05:30
Neil Trini Lasrado
c723c8b5aa
Disable Capacity Planning label changed to Disable Capacity Planning & Time Tracking in Manufacturing Settings
2015-07-23 17:43:27 +05:30
Neil Trini Lasrado
2771b7d828
Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings
2015-07-23 17:39:35 +05:30
Anand Doshi
75ebed815f
Merge pull request #3711 from nabinhait/budget
...
Validation on Account for assigning budget
2015-07-23 17:26:56 +05:30
Nabin Hait
975ef07c48
Merge pull request #3706 from neilLasrado/variant
...
Fetch Template Bom if no BOM is set against Item Variant in Production Order
2015-07-23 17:26:11 +05:30
Nabin Hait
f666535223
[fix] gross profit report
2015-07-23 17:08:44 +05:30
Nabin Hait
08fb19ac8c
Validation on Account for assigning budget
2015-07-23 16:59:43 +05:30
Anand Doshi
db9762be3f
Merge pull request #3712 from rmehta/setup-wizard-fix
...
[fix] contact name in setup wizard
2015-07-23 16:46:09 +05:30
Anand Doshi
03ae61afce
Merge pull request #3681 from rmehta/sample-data
...
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-23 16:45:28 +05:30
Anand Doshi
1847b705fe
Merge pull request #3704 from nabinhait/fix2
...
[fix] SMS status and log
2015-07-23 16:45:00 +05:30
Anand Doshi
4a573a7e8b
Merge pull request #3709 from nabinhait/contacts
...
[cleanup] Party Type deleted
2015-07-23 16:41:36 +05:30
Nabin Hait
f74b9b06f7
Merge pull request #3708 from neilLasrado/material-request
...
Fetch items from Packing List if Exists in Sales Order while raising …
2015-07-23 15:21:50 +05:30
Nabin Hait
2820a8749f
Merge pull request #3710 from neilLasrado/stock-report
...
Opening Balance row added to Stock Ledger Report
2015-07-23 15:21:26 +05:30
Neil Trini Lasrado
13df8a40ef
Validation added to prevent user to Manage Variants if Item Template is Unsaved. Prevented message stating variants updated while saving item template if there are no variants against that item Template
2015-07-23 12:46:59 +05:30
Rushabh Mehta
7cfa5f0508
[fix] contact name in setup wizard
2015-07-23 12:39:44 +05:30
Nabin Hait
bb274fce2e
[cleanup] Party Type deleted
2015-07-23 11:45:30 +05:30
Rushabh Mehta
fec61fe33e
[minor] fix report type for Accounts Payable
2015-07-23 10:39:13 +05:30
Neil Trini Lasrado
d0387f41df
Opening Balance row added to Stock Ledger Report
2015-07-22 18:44:59 +05:30
Neil Trini Lasrado
05d8174696
Fetch items from Packing List if Exists in Sales Order while raising Material Request against SO
2015-07-22 16:31:34 +05:30
Rushabh Mehta
ba02ce6adc
[docs] added description
2015-07-22 15:07:48 +05:30
Anand Doshi
886def0a69
[fix] convert Item and Item Grid images to absolute urls
2015-07-22 14:43:37 +05:30
Anand Doshi
7590aa2524
[minor] raise EmptyStockReconciliationItemsError when no change in any of the items
2015-07-22 14:43:36 +05:30
Neil Trini Lasrado
8b48ceab8c
Removed logic for get_item_details in Production Planning Tool, Used get_item_details function of Production Order instead
2015-07-22 12:42:21 +05:30
Nabin Hait
d900e12ae7
Change log for sms
2015-07-22 12:21:55 +05:30
Nabin Hait
098760f0e2
[fix] SMS status and log
2015-07-22 12:17:48 +05:30
Neil Trini Lasrado
cc431716ed
Fetch Template Bom if no BOM is set against Item Variant in Production Order
2015-07-22 12:13:47 +05:30
Nabin Hait
e2b8ccf1bb
[report] Letter Head option in General Ledger report
2015-07-21 12:02:36 +05:30
Anand Doshi
f447c8258a
[minor] Newsletter Message should be mandatory
2015-07-20 16:10:04 +05:30
Nabin Hait
63d345c6ab
bumped to version 5.2.1
2015-07-20 15:52:10 +06:00
Anand Doshi
d0d1af2072
Merge pull request #3696 from nabinhait/fix1
...
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 13:27:47 +05:30
Anand Doshi
83694fd180
[minor] removed is_group from search fields of Account
2015-07-20 13:26:22 +05:30
Anand Doshi
fc353efeca
Merge pull request #3670 from neilLasrado/expense-claim
...
Default Expense Account added to Expense Claim Type.
2015-07-20 13:04:33 +05:30
Anand Doshi
16edf8b478
Merge pull request #3685 from nabinhait/fix6
...
[fix] Fetch debit/credit from reference journal entry
2015-07-20 13:00:10 +05:30
Nabin Hait
c9e4fbeda0
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 12:57:48 +05:30
Anand Doshi
46ae789f2f
Merge pull request #3682 from anandpdoshi/anand-july-17
...
Remove 'Stopped' banner in Sales Order, show ERPNext icon instead of 'ERPNext'
2015-07-20 12:57:17 +05:30
Anand Doshi
a9a284a5ae
Merge pull request #3693 from rmehta/close-task
...
[minor] close button for task and item not found error fix
2015-07-20 12:56:50 +05:30
Rushabh Mehta
823e88d5bd
[minor] close button for task and item not found error fix
2015-07-20 10:56:39 +05:30
Nabin Hait
1be94efcfa
[fix] Fetch debit/credit from reference journal entry
2015-07-17 17:25:52 +05:30
Anand Doshi
a5e9c71397
[ui] changed Learn icon
2015-07-17 15:55:10 +05:30
Anand Doshi
285135da8e
[ui] Remove 'Stopped' alert banner in Sales Order
2015-07-17 15:14:40 +05:30
Anand Doshi
906c2babaa
[ui] Show ERPNext icon instead of ERPNext in navbar
2015-07-17 15:14:39 +05:30
Nabin Hait
14a394cde1
Update fields_to_be_renamed.py
2015-07-17 15:14:19 +05:30
Nabin Hait
3c821c89f2
Update rename_table_fieldnames.py
2015-07-17 15:13:29 +05:30
Nabin Hait
a041297861
Update rename_total_fields.py
2015-07-17 15:12:52 +05:30
Rushabh Mehta
856ee10dc4
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-17 15:03:18 +05:30
Nabin Hait
1401e3f679
Update rename_total_fields.py
2015-07-17 14:43:19 +05:30
Nabin Hait
dae29bf2d4
Update fields_to_be_renamed.py
2015-07-17 14:42:46 +05:30
Nabin Hait
0a3be6da27
Update rename_table_fieldnames.py
2015-07-17 14:39:41 +05:30
Nabin Hait
1c9a7d2a1b
bumped to version 5.2.0
2015-07-16 17:45:40 +06:00
Anand Doshi
972f2f9194
[change-log]
2015-07-16 16:19:30 +05:30
Anand Doshi
239296d16a
Merge pull request #3657 from nabinhait/fix4
...
Reserved warehouse should not be validated on cancellation of sales order
2015-07-16 15:57:59 +05:30
Anand Doshi
3210db9056
Merge pull request #3656 from rmehta/sms-log
...
[fix] create SMS Log
2015-07-16 15:56:08 +05:30
Neil Trini Lasrado
feda4f9bc9
Default Expense Account added to Expense Claim Type. Fetch account while making Bank Entry
2015-07-16 15:44:56 +05:30
Anand Doshi
f6954fb798
Merge pull request #3663 from neilLasrado/bom
...
Bom
2015-07-16 15:02:40 +05:30
Anand Doshi
c6656e68b8
Merge pull request #3666 from nabinhait/patch-fix
...
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
2015-07-16 14:55:35 +05:30
Rushabh Mehta
f3791797d6
[fix] [patch]
2015-07-16 14:17:59 +05:30
Rushabh Mehta
ea4d63cef3
[cleanup] removed welcome emails
2015-07-16 14:17:59 +05:30
Nabin Hait
5464ca8a73
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
2015-07-16 12:19:57 +05:30
Neil Trini Lasrado
20523c45c7
Patch for default BOM
2015-07-16 11:27:06 +05:30
Neil Trini Lasrado
0248811e53
Fixed deafault BOM problem
2015-07-16 11:26:40 +05:30
Rushabh Mehta
51e7086a08
[patch] rename roles
2015-07-15 16:30:49 +05:30
