22556 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rohitwaghchaure	4444430200	Merge pull request #14108 from ESS-LLP/tax_deduction ... Variable tax deduction	2018-05-17 13:55:52 +05:30
rohitwaghchaure	4c82ede9e1	Merge pull request #14112 from vjFaLk/item-uom ... Add UOM to POS Item Template	2018-05-17 12:51:10 +05:30
Valmik Jangla	b52d5b21a1	Add UOM to Item View with Price	2018-05-17 00:09:21 -07:00
rohitwaghchaure	d2f0d08234	Merge pull request #14105 from Zlash65/fix-dept ... [Minor] Typo in Employee Transfer	2018-05-17 11:23:52 +05:30
rohitwaghchaure	509847a674	Merge pull request #14109 from rohitwaghchaure/asset_adjustment_fixes ... [Fix] Asset adjustment issues	2018-05-17 11:23:26 +05:30
Rohit Waghchaure	992fb34c95	[Fix] Asset adjustment issues	2018-05-17 11:22:59 +05:30
Ranjith	fcfb5a3769	Merge remote-tracking branch 'frappe/develop' into develop	2018-05-17 10:07:23 +05:30
Ranjith	58363e6bbd	get_payroll_period return name, fix hard coded leave period	2018-05-17 10:00:33 +05:30
Zlash65	e3f7e8b101	typo in frappe.throw in employee_transfer	2018-05-17 01:34:35 +05:30
rohitwaghchaure	de6ce587d0	Merge pull request #14104 from rohitwaghchaure/asset_wrong_account_linking_issue ... Allow to select Asset Received But Not Billed in expense account head	2018-05-17 00:24:46 +05:30
Rohit Waghchaure	585945e65d	Allow to select Asset Received But Not Billed in expense account head	2018-05-17 00:23:27 +05:30
rohitwaghchaure	e8ef69ec33	Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty ... [Fix] Validation issue	2018-05-16 23:58:09 +05:30
Rohit Waghchaure	2868840e6b	[Fix] Validation issue	2018-05-16 23:57:28 +05:30
rohitwaghchaure	627c0a3acb	Merge pull request #14102 from rohitwaghchaure/company_not_found_issue_v11 ... [Fix] Company mandatory issue	2018-05-16 23:32:33 +05:30
Rohit Waghchaure	44fda65b1d	[Fix] Company mandatory issue	2018-05-16 23:31:09 +05:30
Ranjith	31eeff00f7	merge frappe/develop	2018-05-16 23:24:34 +05:30
rohitwaghchaure	39223e0341	Merge pull request #14100 from rohitwaghchaure/tds_issue ... [Fix] TDS issue	2018-05-16 23:13:41 +05:30
Rohit Waghchaure	a91765707a	[Fix] TDS issue	2018-05-16 23:13:02 +05:30
Ranjith	b485b1ef80	Salary Slip calc tax, except for flexi benefits	2018-05-16 23:01:40 +05:30
Ranjith	c6b2575a9c	fields in salary detail, copy data from salary component on change	2018-05-16 22:59:21 +05:30
rohitwaghchaure	274f890246	Merge pull request #14099 from rohitwaghchaure/fixed_asset_date ... Multiple fixes in asset	2018-05-16 22:13:15 +05:30
Rohit Waghchaure	e6acd4c57a	Multiple fixes in asset	2018-05-16 22:12:39 +05:30
rohitwaghchaure	64e81b436e	Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing ... [Fix] Custom buttons not showing	2018-05-16 21:45:12 +05:30
Rohit Waghchaure	976af6b422	[Fix] Cystom buttons not showing	2018-05-16 21:43:16 +05:30
rohitwaghchaure	660ca9b6c0	Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue ... [Fix] Gl Enrty issue	2018-05-16 21:34:44 +05:30
Rohit Waghchaure	1a328d02d2	[Fix] Gl Enrty issue	2018-05-16 21:34:06 +05:30
rohitwaghchaure	513cd189f0	Merge pull request #14095 from rohitwaghchaure/leave_application_issue_v11 ... [Fix] onload set default employee, leave approver, company	2018-05-16 19:57:09 +05:30
Rohit Waghchaure	8e4f676c8c	[Fix] onload set default employee, leave approver, company	2018-05-16 19:55:52 +05:30
Ranjith	29e0ed3da1	Exemption Declaration - field total_amount	2018-05-16 19:10:35 +05:30
Manas Solanki	df0ffab16c	Merge pull request #14093 from manassolanki/poc-fixes-1 ... [ui] more fields in the list view of assets	2018-05-16 18:25:37 +05:30
Manas Solanki	f3f1ba37b9	[ui] more fields in the list view of assets	2018-05-16 18:24:35 +05:30
rohitwaghchaure	4ea97c84ac	Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual ... [Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:21:20 +05:30
Rohit Waghchaure	421697250b	[Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:20:52 +05:30
Manas Solanki	2684593af0	Merge pull request #14091 from manassolanki/poc-fixes-1 ... Added the travel request on the config page	2018-05-16 18:10:57 +05:30
Manas Solanki	5b34c00ba6	Added the travel request on the config page	2018-05-16 18:09:43 +05:30
Manas Solanki	fa57cdd86d	Merge pull request #14090 from manassolanki/poc-fixes ... create item default on making of invoice	2018-05-16 17:46:53 +05:30
Manas Solanki	5b93562ce3	create default on making of invoice	2018-05-16 17:44:51 +05:30
rohitwaghchaure	19a2260ce7	Merge pull request #14089 from shreyashah115/fixes ... [Fix] General Ledger report filters error	2018-05-16 17:41:19 +05:30
Shreya	63d14cfac8	Instead of throwing error, just return	2018-05-16 17:30:58 +05:30
Shreya	df9516e906	Add Finance Book to route options	2018-05-16 17:30:35 +05:30
Manas Solanki	efae732370	Merge pull request #14088 from manassolanki/item-fixes ... more fixes for the item defaults	2018-05-16 17:16:25 +05:30
Manas Solanki	e3bb1d0e3b	more fixes for the item defaults	2018-05-16 17:14:59 +05:30
rohitwaghchaure	64076730a1	Merge pull request #14087 from manassolanki/item-fixes ... return defaults according to the company	2018-05-16 17:02:32 +05:30
Manas Solanki	38667ab8da	return defaults according to the company	2018-05-16 17:00:05 +05:30
rohitwaghchaure	adc5b128b6	Merge pull request #14086 from rohitwaghchaure/multiple_fixes ... Multiple fixes	2018-05-16 16:42:25 +05:30
Rohit Waghchaure	b233e9d643	[Fix] Multiple fixes	2018-05-16 16:41:34 +05:30
Manas Solanki	028e2ad246	Merge pull request #14083 from frappe/codingCoffee-patch-3 ... spaces to tabs	2018-05-16 16:25:25 +05:30
rohitwaghchaure	de796266f2	Merge pull request #14084 from shreyashah115/fixes ... [minor] Fix error	2018-05-16 16:21:14 +05:30
rohitwaghchaure	9c0a87e804	Merge pull request #14082 from manassolanki/item-fixes ... [fixes] fix in the item defaults	2018-05-16 16:19:39 +05:30
Manas Solanki	e3910fb2a6	[fixes] fix in the item defaults	2018-05-16 16:16:34 +05:30