brotherton-erpnext

Author	SHA1	Message	Date
Manas Solanki	e5e87f7137	[feature] Blanket Order - Creaete Sales or Purchase order from the blanket order - If there is any blanket order for the customer/supplier rates will be fetched from that order - Manually selecting the Blanket order will change the rates accordingly - Upon submission of the order, the ordered qty will be updated in the Blanket Order	2018-06-14 15:55:38 +05:30
Zarrar	6ffdf94003	[Fixes] Defaults and User-Permission based fixes in treeview (#14501 ) * utility function added for treeview function to distinguish defaults from user permission and return appropriate data * make use of utility function for treeview	2018-06-14 12:24:16 +05:30
Zarrar	17089eeac3	[Minor] Fetching and appending items in Stock Reconciliation fix (#14509 ) * minor fix in get_list of items in stock reconciliation * reload doc fails because of backdated modified date * item and item defaults should load prior to shopify refactor * attribute value should't be none or empty, could be zero though * Update item.py	2018-06-14 11:54:18 +05:30
Shreya Shah	dd8fba6783	Do not check for batch on cancellation (#14506 )	2018-06-14 11:49:45 +05:30
rohitwaghchaure	fb997d6539	[Fix] Woocommerce test cases (#14513 )	2018-06-14 09:13:39 +05:30
Rohit Waghchaure	80d4477d1e	[Fix] Travis for test_material_consumption	2018-06-13 18:37:03 +05:30
Rohit Waghchaure	0eef3f665d	[Fix] Travis for stock entry	2018-06-13 13:06:25 +05:30
Manas Solanki	176e7c5ce2	fix the test case for the payroll (#14480 ) * fix the test case for the payroll * fix the shopify and stock entry * more structured test cases for payroll	2018-06-13 11:13:01 +05:30
Rohit Waghchaure	b6381c66d8	[Fix] Purchase receipt test cases	2018-06-12 13:54:40 +05:30
Rohit Waghchaure	f270567c45	[Fix] Test cases for asset	2018-06-12 12:20:52 +05:30
Rohit Waghchaure	647d595158	Code cleanup and fixes for the asset	2018-06-11 19:15:08 +05:30
Rohit Waghchaure	86026d31cf	[Fix] Alternative item, transferred qty issue for backflush method	2018-06-11 14:11:00 +05:30
rohitwaghchaure	7048925016	[Enhance] Standalone debit/credit note (#14269 ) * [Enhance] Standalone debit/credit note * Test cases * Test cases and documentation * Removed credit, debit note links from accounts module	2018-06-11 12:02:14 +05:30
Manas Solanki	3639b85663	Merge pull request #14363 from frappe/manassolanki-patch-10 PR to check the current state of Travis	2018-06-11 11:40:40 +05:30
rohitwaghchaure	8fc64a9717	[Fix] Travis data (#14422 )	2018-06-08 14:43:50 +05:30
rohitwaghchaure	2704bef0b3	Merge pull request #14368 from shreyashah115/fix-trav Some more travis fixes	2018-06-07 14:14:33 +05:30
Shreya	4638d1ab97	Fix POS Profile test	2018-06-06 16:23:16 +05:30
Zarrar	32a118d68c	fix precision in stock entry (#14366 )	2018-06-06 15:06:52 +05:30
Shreya	90bdfed3db	Modify all asset test cases	2018-06-06 14:27:55 +05:30
Manas Solanki	3504a2342e	PR to check the current state of Travis	2018-06-06 12:46:06 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
Shreya Shah	59af3a0296	[Enhancement] UOM Conversion Factors (#13853 ) * new doctype UOM category * new doctype UOM Conversion Factor * bootstrap json data for uom conversions * uom conversion in item * Patch to add all conversions and categories * Fetch conversions multi-way * fix codacy * Rebase with develop * [minor] Fix * Add a test case * Improvise as per review comment * Add json data for UOMs * Commonify function and call from patch * Update uom_conversion_data.py	2018-06-06 09:44:46 +05:30
Shreya Shah	c37fd050c5	Remove unnecessary variable (#14352 ) * Remove unnecessary variable * Replace cur_frm with frm * Update material_request.js	2018-06-06 09:19:48 +05:30
Shreya	9c801b976d	Fix share transfer test	2018-06-06 02:58:23 +05:30
Shreya	8f692f9a27	Fix batch test	2018-06-06 02:09:17 +05:30
Shreya	2ad81726d5	Fix utils.py	2018-06-06 02:09:17 +05:30
rohitwaghchaure	2da6b3d628	[enhance] Provision to backflush raw materials based on stock entries for subcontracted items (#14296 )	2018-06-05 13:06:52 +05:30
Shreya Shah	630721aacc	Travis (#14354 ) * Fix Purchase Receipt tests * Fix Item test * Fix daily work summary test * Modify currency exchange test cases * Fix Leave Application test * Update working hours when making salary slip from timesheet * Replace fixer.io with exchangeratesapi * Fix codacy	2018-06-05 12:56:10 +05:30
Nabin Hait	81d12cc9c8	Get default income account from Item	2018-06-05 12:49:03 +05:30
Sushant Nadkar	ebf76163ad	show uom in list view of material request (#14338 )	2018-06-04 14:23:25 +05:30
Zarrar	7e0e85912b	item_name not fetched in packing slip (#14310 )	2018-06-01 15:10:33 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
AMS Fauzi	f3a6d95634	Develop: Batch Number Series (#14251 )	2018-05-31 09:31:57 +05:30
rohitwaghchaure	31a96d2a3f	[Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item (#14287 )	2018-05-30 18:13:47 +05:30
Shreya Shah	47335e5e60	Stocking out items with expired batches (#14249 ) * Add dropdown in Stock Entry to get expired batch items * Fetch all the items with expired batches * Add the fetched item details to stock entry details * Modify as per the review comments	2018-05-30 15:44:41 +05:30
rohitwaghchaure	05152dad0b	[Enhance] Provision to set overproduction percentage for work order (#14248 )	2018-05-30 15:28:09 +05:30
Shreya Shah	ae95a8aa15	Update status in Purchase Receipt (#14257 ) * Update status on submission if per_billed = 100 * Add patch to update existing records	2018-05-28 18:24:28 +05:30
Zarrar	b9f54ca946	[Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250 ) * add doctypes allowed to group items, average the rate * add check field to group items during print * call common before_print in delivery note * fix precision issue while calculating average	2018-05-28 17:41:09 +05:30
Saurabh	3c1b153cdb	Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix [fix] Stock Ledger report item filter	2018-05-28 15:23:21 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114 ) * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
Suraj Shetty	084b0b3a67	Treeview permission (#14232 ) * Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) * Replace frappe.db.sql to frappe.get_list to apply permission - All get_children method had frappe.db.sql in them which had no permission check, now its replaced with frappe.get_list which will check permission based on the user. * Fix codacy - Remove trailing whitespace * Add parent filter * Add ifnull checks	2018-05-26 09:12:59 +05:30
Nabin Hait	33df0b4fbf	Test case fixes (#14219 ) * Test case fixes * fetch_from fixes	2018-05-26 09:09:02 +05:30
Nabin Hait	f87ec61043	Test case fixes for item defaults	2018-05-24 18:19:21 +05:30
Nabin Hait	b903fc4e71	Item defaults query fixes	2018-05-24 17:07:51 +05:30
Ameya Shenoy	95e60927b4	Merge branch 'master' into develop	2018-05-24 08:45:14 +00:00
Manas Solanki	f7713ebfa7	[optimize] introduce two filter in the report in order to handle large item master data (#14193 )	2018-05-23 19:43:04 +05:30
Nabin Hait	5f861756a2	Item Default fixes	2018-05-23 19:37:06 +05:30
Achilles Rasquinha	efb731941d	ran 2to3, evaluation (#13499 ) * ran 2to3, evaluation * Update update_gstin.py * Update accounts_receivable_summary.py	2018-05-23 11:31:24 +05:30
Zarrar	c141eb00ee	[Enhance] Department added wherever applicable (#14121 ) * set All Department as default parent_department * add department field in employee_transfer * copied data from options to fetch_from * add department field wherever employee's link field present * empty options field where fetch_from is added	2018-05-23 11:11:36 +05:30
Ameya Shenoy	1cc7500be9	Merge branch 'master' into develop	2018-05-22 09:18:38 +00:00
Manas Solanki	a96421279d	Remove the debugger from the material_request.js	2018-05-21 17:27:01 +05:30
rohitwaghchaure	22619a8e0c	Merge pull request #14164 from rohitwaghchaure/fixed_alias_issue [Fix] Unknown column 'i.stock_uom' in 'field list'	2018-05-21 16:22:23 +05:30
Rohit Waghchaure	abc6cf0aa5	[Fix] Unknown column 'i.stock_uom' in 'field list'	2018-05-21 16:18:37 +05:30
Manas Solanki	b5d9b38dee	don't update the modified of the item price	2018-05-21 15:40:51 +05:30
Manas Solanki	f87762887a	fetch defualt supplier from the item table (#14113 )	2018-05-20 10:58:26 +05:30
Zarrar	42231df33a	[Minor] Supplier Group test fix & default supplier in item fix (#14150 ) * fix supplier group test * item - default_supplier fix	2018-05-20 10:46:10 +05:30
Gaurav Naik	8f17281011	Initialized dynamic link on Warehouse (#14135 ) * Initialized dynamic link for Warehouse * Codacy Fixes	2018-05-20 10:39:14 +05:30
rohitwaghchaure	d08ac1fe79	Merge pull request #14136 from rohitwaghchaure/multiple_fixes_for_v11 Fixes in material request, asset maintenance	2018-05-18 16:39:48 +05:30
Rohit Waghchaure	73a99441ca	Fixed get_query for default data in item	2018-05-18 16:39:08 +05:30
Rohit Waghchaure	6cdaa6e861	Fixes in material request, asset maintenance	2018-05-18 16:30:14 +05:30
Rohit Waghchaure	f61e94e162	Changed condition of finance book in reports	2018-05-18 09:10:07 +05:30
Faris Ansari	9e4889d756	[fix] Stock Ledger report item filter - breaks when Item Code contains % symbol	2018-05-17 12:18:28 +05:30
Rohit Waghchaure	421697250b	[Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:20:52 +05:30
Manas Solanki	38667ab8da	return defaults according to the company	2018-05-16 17:00:05 +05:30
Rohit Waghchaure	b233e9d643	[Fix] Multiple fixes	2018-05-16 16:41:34 +05:30
Manas Solanki	e3910fb2a6	[fixes] fix in the item defaults	2018-05-16 16:16:34 +05:30
Manas Solanki	8e184569a1	Update item.json	2018-05-16 15:11:52 +05:30
rohitwaghchaure	eff678d2d6	Merge pull request #13918 from manassolanki/item-level-defualts [enhancement] add the item defaults in the child-table for multi-company	2018-05-16 14:04:47 +05:30
Suraj Shetty	fbb6b3da5f	Undo replace of frappe.db.sql with frappe.get_list (#14074 )	2018-05-16 13:53:31 +05:30
lasalesi	265005d30d	apply sorting for make multiple variant attributes (#14073 )	2018-05-16 13:10:25 +05:30
Manas Solanki	64614374d8	fix codacy	2018-05-16 13:00:56 +05:30
Manas Solanki	b16a4ec79e	changes for the default cost center	2018-05-16 13:00:56 +05:30
Rushabh Mehta	0b628386de	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
Manas Solanki	087a2259d9	update for default warehouse	2018-05-16 12:44:07 +05:30
Manas Solanki	c760222a6c	add the item defaults in the childtable for multicompany	2018-05-16 12:44:06 +05:30
Suraj Shetty	8501010f12	Replace frappe.db.sql to frappe.get_list to apply permissions (#14037 ) * Replace frappe.db.sql to frappe.get_list to apply permission - All get_children method had frappe.db.sql in them which had no permission check, now its replaced with frappe.get_list which will check permission based on the user. * Fix codacy - Remove trailing whitespace	2018-05-16 10:44:38 +05:30
rohitwaghchaure	f9fa588ddc	Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po [Enhance] Budget validation on material request, purchase order	2018-05-15 22:18:17 +05:30
Rohit Waghchaure	4d4fb6dcbc	[Enhance] Budget validation on material request, purchase order	2018-05-15 22:12:44 +05:30
rohitwaghchaure	c3b9eabe5e	Merge pull request #14048 from shreyashah115/exchange-rate [Enhancement] Buying and Selling checkboxes in Currency Exchange	2018-05-15 17:55:09 +05:30
Shreya	3f77852e93	Pass buying or selling as filter parameters Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.	2018-05-15 17:22:06 +05:30
Manas Solanki	1879f08c7c	Merge branch 'develop' into deferred-account	2018-05-15 15:20:44 +05:30
Manas Solanki	0393848f60	deferred account in the item and company master	2018-05-15 13:04:01 +05:30
Saurabh	99400bd958	remove duplicate fields occured due to merge conflicts	2018-05-14 22:11:17 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
rohitwaghchaure	7c6bef4905	Merge branch 'enterprise_sprint' into supplier-group	2018-05-14 20:39:01 +05:30
Rohit Waghchaure	aa7b434270	Create asset adjustment doctype, post gl entry for the asset	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	f2684ae83a	Commonify get_asset_category_account and get_fixed_asset_account method	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	f41e1ed191	Added default asset accounts in COA, CWIP account in asset category	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	af05995418	Asset accounting	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	c6deb13fb4	Added account fields in the company, fixes in auto creation of the asset from PR	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	ab84254188	Asset linked to purchase receipt and serial no	2018-05-14 19:07:39 +05:30
Suraj Shetty	f93cc57e8a	Ignore user permission for 'variant Of' in Item (#14013 ) - Since mostly variant of is null it gets filtered out if user permission is applied. And since variant is a link to item itself there is no need to check user permission for it as user permission gets applied on Item anyways.	2018-05-14 14:07:20 +05:30
Rohit Waghchaure	ebe1ebead2	[Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations'	2018-05-14 13:21:45 +05:30
Manas Solanki	a27d29b349	enable deferred revenue in the item master	2018-05-14 12:07:14 +05:30
Zlash65	0a50554417	doctype level changes	2018-05-14 11:45:38 +05:30
Kanchan Chauhan	d560da950d	[Minor] Show only active driver in Delivery Trip	2018-05-10 10:42:56 +05:30
Nabin Hait	9d215c2d9b	Set operations on production order while making from Material Request	2018-05-09 18:32:54 +05:30
Nabin Hait	b2800eeb2a	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-05-08 16:34:35 +05:30
Nabin Hait	9036b9ee85	Merge branch 'master' into develop	2018-05-08 16:31:42 +05:30
Zarrar	f2df7f32fa	update subscription to auto_repeat across dashboards (#13956 )	2018-05-08 16:06:36 +05:30
Saurabh	40349f4b00	[fix] add stock entry link on Material Request Dashboard (#13950 )	2018-05-08 15:23:51 +05:30
Nabin Hait	4bbe5fbefc	Fixes related to auto repeat	2018-05-05 12:32:59 +05:30
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +05:30
Shreya Shah	764b9bfeba	cint for Item field has_variants (#13916 ) * convert none type value to int * Fix typo	2018-05-04 17:58:36 +05:30
Suraj Shetty	dcc90e3312	Add fix to support changes in user permission (#13923 ) https://github.com/frappe/frappe/pull/5494	2018-05-04 17:52:57 +05:30
Nabin Hait	62b985d405	[fix] Update show_in_website in template	2018-05-04 12:21:15 +05:30
Suraj Shetty	00cced12a0	Success Action (#13666 ) * success action config for sales invoice * remove "Notification Control" doctype and its usage * add default success action after_install or while migration (patch) * rename for_doctype to ref_doctype * case change * minor fix * Remove unnecessary code * Replace message with translatable message * Fix 'cannot import error'	2018-05-03 19:06:32 +05:30
Nabin Hait	ed376cacc8	Set Qty in transactions based on serial no via Stock Settings (#13897 )	2018-05-03 16:24:52 +05:30
rohitwaghchaure	125c0caf12	Added brand in item price doctype, item prices report (#13900 )	2018-05-03 16:23:57 +05:30
Prateeksha Singh	a7c6ff8f3e	Merge pull request #13837 from shreyashah115/serial-batch-linking Serial No. and Batch No. linking	2018-05-02 15:11:19 +05:30
Zarrar	284de4c15a	updated modified time - reload issue in patch (#13881 )	2018-05-02 12:14:59 +05:30
Shreya	0456ced796	remove unused code	2018-05-01 19:00:06 +05:30
Nabin Hait	3652a62b55	minor fixes	2018-04-30 19:32:29 +05:30
Nabin Hait	d39386bd55	Renamed some salary related fields	2018-04-30 16:21:37 +05:30
Shreya	96e45902fd	codacy	2018-04-30 15:54:34 +05:30
Shreya	14bd43d5eb	minor changes	2018-04-30 15:30:42 +05:30
Faris Ansari	9f739fe87d	Handle item_wise_tax_detail invalid value while item renaming (#13778 )	2018-04-26 18:48:01 +05:30
rohitwaghchaure	7e8a7ac6ee	Provision to select opening stock in stock reconciliation (#13802 )	2018-04-26 16:30:35 +05:30
Shreya	a20157af17	on item, warehouse and batch triggers, fetch serial nos based on batch	2018-04-26 14:39:21 +05:30
Shreya	7461d28ae0	add batch when creating serial nos	2018-04-26 14:39:21 +05:30
Shreya	4a2fe605b3	batch no field in serial no doctype	2018-04-26 14:39:21 +05:30
Saurabh	9738d52d5f	Merge branch 'master' into develop	2018-04-24 12:09:40 +05:30
Saurabh	d2065ce3bf	typo fix	2018-04-24 12:07:37 +05:30
Saurabh	2e7a45dbb4	resolved merge conflicts	2018-04-24 11:16:13 +05:30
tundebabzy	dbdf462e56	fix conflict	2018-04-22 23:49:26 +01:00
Shreya Shah	44e719d64c	[Enhancement] Leave Application and Expense Claim (#13645 ) * child table employee expense approver * set query in department * mandatory approver check in hr settings * triggers on leave and expense approver * fetch all parent approvers from department hierarchy * fixes * patch to move employee approvers from employee to department * removed hard coding of roles * modify approvers list query * commonified functions * patch * renamed standard reply occurrences * removed leave approvers table from Employee master * email templates for leave application notification * set default email templates for leave in hr settings * notify by email template * approval status in expense claim * render template in patch * removed unused code * Single child table department approver * read instead of render template	2018-04-19 20:58:52 -08:00
Saurabh	2476a8aab9	a[fix] check content before making in condition	2018-04-17 20:45:06 +05:30
tundebabzy	caae0f4dcc	Merge branch 'develop' into new-subscription	2018-04-17 09:34:04 +01:00
Saurabh	46743d00d6	Merge branch 'master' into develop	2018-04-17 12:00:21 +05:30
Saurabh	9fbb8192e1	[fix] do not escape % while using clause (#13677 )	2018-04-17 11:56:46 +05:30
Sanjay Kumar	bc83daf0fa	#13478 : Default Accounts in Item from Item Group (#13635 ) * remove external app reference and update get_warehouse_list * resolve #13478 : Default Accounts in Item from Item Group	2018-04-15 21:36:37 -08:00
Nabin Hait	642d39098a	Fixed merge conflict	2018-04-13 14:38:57 +05:30
rohitwaghchaure	2ea593bdd8	[Fix] POS Profile data not set in the sales invoice (#13568 )	2018-04-12 13:37:08 +05:30
Nabin Hait	c10e106f8f	Optimization related to large number of items (#13606 )	2018-04-12 13:25:03 +05:30
Sanjay Kumar	6225b769a6	remove external app reference and update get_warehouse_list (#13597 )	2018-04-11 02:19:36 -08:00
Doridel Cahanap	ad76f9ad70	[Enhancement] Work Order Material Consumption (#13384 ) * Work Order Material Consumption * Test cases and other minor fixes * Test cases fixes * Travis Fixes * Work Order Material Consumption Request Changes * Update work_order.js	2018-04-09 10:31:28 +05:30
Nabin Hait	e9638be032	fixed merge conflict	2018-04-06 15:18:27 +05:30
rohitwaghchaure	c0f149a3be	[Fix] Delivery notification for delivery trip (#13543 )	2018-04-06 14:26:26 +05:30
rohitwaghchaure	2ae6cfda5f	[Fix] Item variant details report (#13545 )	2018-04-06 11:49:04 +05:30
rohitwaghchaure	22d9f0a4aa	[Fix] Bin not deleted on delete of an item (#13539 )	2018-04-06 10:29:07 +05:30
Suraj Shetty	97d84eb509	remove apply user permission (#13505 )	2018-04-05 12:10:46 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
Nabin Hait	5fd79f7f77	Update stock_ledger.py	2018-04-04 11:20:16 +05:30
Rushabh Mehta	d5f9ebd008	[optimize] item queries (#13480 )	2018-04-02 23:37:33 +05:30
Nabin Hait	edd320e338	Optimisation of warehouse_account_map (#13454 )	2018-04-02 10:30:17 +05:30
rohitwaghchaure	40a5a3063c	[Fix] Allow zero valuation rate if previous sle has zero valuation rate (#13432 )	2018-04-02 10:14:49 +05:30
Nabin Hait	ff2e4c898a	Fixed merge conflict	2018-03-29 13:57:39 +05:30
Manas Solanki	a4502c4f6b	Merge pull request #13430 from codingCoffee/child_doc_perm_fix Permisssion fixes for child table	2018-03-29 13:27:08 +05:30
Manas Solanki	1f02c62339	Merge pull request #13431 from manassolanki/fix-22 fix the item varint details	2018-03-29 13:26:14 +05:30
Manas Solanki	ef770b593a	fix the item varint details	2018-03-29 13:25:00 +05:30
Ameya Shenoy	c5d222253a	Permisssion fixes for child table Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3 frappe.client.[get_list, get, get_value] when called on child table needs parent as an argument or it throws an error by default	2018-03-29 13:16:08 +05:30
Manas Solanki	94769d81a8	Update get_item_details.py	2018-03-29 11:15:05 +05:30
Nabin Hait	4d9e104284	Merge branch 'master' into develop	2018-03-28 15:51:18 +05:30
rohitwaghchaure	a3c3dec5a2	[enhance] Item Alternative (#13121 ) * [enhance] Item Alternative * Added two way provision in item alternative * Test Cases * documentation	2018-03-28 11:51:44 +05:30
Nabin Hait	a6746407e5	Fixed waiting qty in item dashboard data	2018-03-28 11:16:12 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
Nabin Hait	9d7fe1f7cd	Indicator fix for stock entry item table	2018-03-27 13:30:11 +05:30
Prateeksha Singh	be368fe94b	Enumerate numeric values in variant dialog	2018-03-27 12:17:15 +05:30
Shreya Shah	ba4f32be5c	set default warehouse instead of product bundle's warehouse for packed_items in delivery note (#13398 )	2018-03-27 11:32:10 +05:30
rohitwaghchaure	2e560cb25d	[Fix] Same serial no returned two times (#13378 )	2018-03-27 11:24:50 +05:30
Nabin Hait	651b612909	Fixed logic for reserved qty for subcontract and production and written a patch (#13396 ) * Fixed logic for reserved qty for subcontract and production and written a patch * repost reserved qty for filtered bins	2018-03-27 11:24:20 +05:30
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +05:30
rohitwaghchaure	492de67d7b	Added consumed material cost in project (#13365 )	2018-03-23 15:02:04 +05:30
Nabin Hait	e3f0412570	Pass doc while autonaming item	2018-03-22 12:13:21 +05:30
rohitwaghchaure	23fa8893a8	[Fix] Division by zero issue (#13362 )	2018-03-22 11:16:00 +05:30
rohitwaghchaure	93779c21a7	[Fix] Project not set in the stock ledger entry (#13357 )	2018-03-21 17:52:41 +05:30
Zarrar	969c8aaf52	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198 ) * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-21 11:17:49 +05:30
rohitwaghchaure	2b88ac948e	[Fix] Special character issue (#13350 )	2018-03-21 10:04:47 +05:30
Zarrar	13ddc7e188	[ Enhance ] Production to Work Order (#12902 ) * remove occurrences of Production Order * rename from report and jsons * Change Production Order to Work Order * change occurences of production order from other files * resolve minor conflict issues and reports * patch added * codacy fix * updated patches, leftover changes * rename reports, rectify patches	2018-03-20 12:38:43 +05:30
Nabin Hait	d97c5a04b2	minor fix in item naming	2018-03-20 12:31:05 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	89346967da	Reverted #13259 (#13291 )	2018-03-13 16:01:11 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290 )	2018-03-13 15:46:59 +05:30
tundebabzy	0125f7b130	rename to Subscription and transfer present Subscription records to Auto Repeat in frappe	2018-03-12 13:51:47 +01:00
rohitwaghchaure	13460f023d	[Fix] Batch value showing as item value while making batch (#13281 )	2018-03-12 17:20:50 +05:30
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Nabin Hait	2c7a6e6b43	Reserve for subcontracting (#13195 ) * [fix] #8427 * review comments changes * Validation for reserved warhouse * code improvements * alignment * test case * message changes * default warehouse / remove validation / change sql * fix * patch * Fixed merge conflict * Fixes and cleanups of reserve qty for subcontracting * set from_warehouse only if purchase_order and purpose found (#12398) * [HotFix] Validation issue for subcontract stock entry (#12127) * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py * Fixes and cleanups of reserve qty for subcontracting * patch fixed * Reload bin in patch * [fix] set source warehouse in stock entry for manufacture * [fix] #8540 * code alignment * code alignment * Move target warehouse validation to submit * validation code improvement * code changes for single stock entry * validation fix * call make_rm_stock_entry * remove old stock entry method/rewrite test case * Don't set bom_no against raw materials while trasferring items for sub-contracting * minor fix	2018-03-12 14:12:12 +05:30
Shreya Shah	ef4c3b8e2f	add has variants in standard filter (#13251 )	2018-03-12 11:20:49 +05:30
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Nabin Hait	052333ea63	subctracting stock entry should also be considered as consumed qty	2018-03-09 14:30:32 +05:30
Achilles Rasquinha	b4de7e3d07	removed has_key, used pythonic in (#13236 ) * removed has_key, used pythonic in * Update bom.py	2018-03-09 12:35:47 +05:30
Suraj Shetty	f2d28ebd6a	Data import Tool bug fix (#13165 ) * fixes #13064 * commonified naming series checks * test fixes replaced test employee names according to naming series	2018-03-09 12:33:13 +05:30
Zarrar	3fd634783d	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198 ) * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-09 12:10:45 +05:30
rohitwaghchaure	bbd9b71547	Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043 )	2018-03-07 15:39:40 +05:30
Vishal Dhayagude	668ec25d19	Allow Item variant Rename (#13161 ) * [WIP] Item varient rename * [wip] Item Variant * [fix] Item Varient Rename * [fix] Item Attribution Rename * removed unwanted code	2018-03-07 15:31:08 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
Manas Solanki	5fd7b3bb80	Fix status updater (#13033 ) * fix the status updater for multiple sources * patch for updating the status * patch for updating the sales order item * Update update_status_for_multiple_source_in_po.py	2018-03-05 11:28:29 +05:30
Vishal Dhayagude	35b665cb26	[new] Create multiple warehouse address and fetch address to stock entry (#13109 ) * [new] Create multiple warehouse address and fetch address to stock entry * [fix] Deleted unwanted field and added patch to link warehouse details to Address * [fix] Codacy fixed * [fix] Modified patch for warehouse address * [fix] Modified patch for warehouse address * [fix] Patch updated and removed contact details from stock entry * [fix] Patch Updated	2018-03-05 11:10:01 +05:30
rohitwaghchaure	a6a4e86dc8	[Fix] System only shows 20 attribute values while making variants (#13155 )	2018-03-05 11:03:59 +05:30
rohitwaghchaure	67cfa81de2	[Fix] Stock Ageing report does not work with group warehouse (#13151 )	2018-03-05 11:00:42 +05:30
Nabin Hait	c10bbd6aa7	Editable unallocated amount in pe (#13130 ) * editable unallocated amount in payment entry to handle multi currency * set unallocated amount on server side * some minor fixes * Fixes in territory patch * removed print * minor fixes	2018-03-01 13:14:14 +05:30
Harsh Patel	5bebbbe7a9	[Feature] Supplier warehouse link field on purchase order (#13051 ) * Multiple Features: [New] Supplier warehouse link field on purchase order for sub-contracting [New] Auto select supplier warehouse while making purchase receipt from purchase order * Set default to_warehouse in stock entry as the supplier warehouse	2018-03-01 11:33:25 +05:30
rohitwaghchaure	0df95fa781	Multi-UOM for sales/purchase return (#13132 ) * Multi-UOM for sales/purchase return * Update sales_and_purchase_return.py	2018-03-01 11:31:33 +05:30
Nabin Hait	f68dc69078	Set auto created serial nos in incoming transactions in case of multi UOM (#13112 ) * Create user from Employee * Set auto created serial nos in incoming transactions in case of multi uom	2018-03-01 10:54:24 +05:30
Nabin Hait	a645f36b2b	Get valuation rate from historical SLE even if it is zero (#13129 ) * Don't overwrite start and end date comes from payroll entry * Get valuation rate from historical SLE even if it is zero, if records exists * Valid till should be autoset if not any default value * Set status of expense claim based on is_paid check	2018-03-01 10:31:24 +05:30
rohitwaghchaure	332a17ee86	[Fix] Test case for serial no (#13136 )	2018-03-01 10:28:04 +05:30
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
Achilles Rasquinha	96698c9a77	Use range instead xrange (#13128 ) * Use range instead of xrange * convert float to int	2018-02-28 16:12:51 +05:30
Nabin Hait	3799f8bec9	Don't validate serial nos while cancelling the transaction	2018-02-26 16:39:06 +05:30
Nabin Hait	127c61e930	Fixed logic in itemwise recommended reorder level	2018-02-26 12:43:17 +05:30
rohitwaghchaure	8ffd5d40e3	[Fix] UX for delivery trip (#13046 ) * [Fix] UX for delivery trip * Fixed test cases	2018-02-26 12:25:39 +05:30
Nabin Hait	802819df9d	Merge branch 'master' into develop	2018-02-23 16:59:44 +05:30
Zarrar	339426c926	fix permission issue for stock balance report - Item Group (#13069 )	2018-02-23 16:58:55 +05:30
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
rohitwaghchaure	4e8fdf7b3f	[Enhance] Quality Inspection Template (#12988 ) * [Enhance] Quality Inspection Template * Test case and patch * Update make_quality_inspection_template.py	2018-02-22 11:03:48 +05:30
Shreya Shah	8a77a0e1e4	Add total row in all trends reports (#13010 ) * total in sales order trends report * total in all trends reports	2018-02-21 14:46:07 +05:30
Zarrar	bc5515651b	[Hotfix] Selecting create on blank field throws error (#13014 ) * selecting create on blank field error fix * error when fetching default_print_format	2018-02-21 11:13:14 +05:30
Shreya Shah	f65afac353	db_update instead of save to avoid unnecessary validations (#13009 )	2018-02-21 11:12:04 +05:30
rohitwaghchaure	e2558308f6	[enhance] Production Plan (#12160 ) * [enhance] Production plan * Test cases * Removed production planning tool * Documentation * Added actual qty in material request production item * Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'	2018-02-20 12:20:00 +05:30
Pawan Mehta	2fbb4923a7	item balance report (#12983 ) * item balance report * remove hard coding * Update item_balance.json * Update item_balance.json Change name to "Item Balance (Simple)" * Update item_balance.json	2018-02-20 12:17:49 +05:30
joezsweet	16862f9051	Better handling of auto set barcode_type issue (#12970 ) Get barcode_type options and check if value is included	2018-02-16 17:33:30 +05:30
riyasrawther	d1134516c2	Warehouse wise Item Balance, Age and Value (#12879 ) * Create warehouse_wise_item_balanace_age_and_value.py * Create warehouse_wise_item_balance_age_and_value.js * Create warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.js * Rename warehouse_wise_item_balanace_age_and_value.py to warehouse_wise_item_balance_age_and_value.py * Update warehouse_wise_item_balance_age_and_value.py	2018-02-16 14:53:53 +05:30
joezsweet	bd7c00c59e	[Hot Fix] barcode_type auto set to a wrong value (#12957 ) * Fix barcode_type auto set to a wrong value This fix a problem that arise, for some weird reason that i can't figure out, when the barcode length == 8, 9,10 or 12,13 and barcode_type is not set; barcode_type become "ean8, ean9, ean10, ean11, ean12, ean13" * codacy fix	2018-02-16 14:47:10 +05:30
rohitwaghchaure	5a5f73e46a	Merge pull request #12602 from PawanMeh/fixes_8540 Select multiple raw material items for Sub Contract Stock Entries	2018-02-15 18:54:29 +05:30
Saurabh	82ffdd7dc6	Merge branch 'master' into develop	2018-02-15 15:17:04 +05:30
Achilles Rasquinha	0bf19a1ac5	Merge pull request #12931 from achillesrasquinha/py3-iteritems Py3 iteritems	2018-02-15 13:49:43 +05:30
Achilles Rasquinha	1697a7aa81	replaced string_types with basestring	2018-02-15 11:39:45 +05:30
Achilles Rasquinha	714c7465fb	Updated Python 3 fixes	2018-02-15 11:31:05 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900 ) * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Achilles Rasquinha	361366ebe6	Python 3 fixes. (#12916 ) * Fixed iteritems and exceptions * python3-fixes * fixed iteritems	2018-02-14 17:08:59 +05:30
rohitwaghchaure	a13b177908	[Fix] Not able to select delivery note in delivery trip (#12912 )	2018-02-14 17:06:21 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
Faris Ansari	5a91989665	Remove total_projected_qty (#12889 )	2018-02-13 16:00:52 +05:30
Achilles Rasquinha	56b2e12af8	Python 3 fixes [merge asap] (#12884 ) * Python 3 fixes * fixed compare	2018-02-13 14:42:40 +05:30
rohitwaghchaure	6a7495dbc8	Removed set only once for maintain stock field in item master (#12878 )	2018-02-12 17:25:24 +05:30
sivankar	a4ff220769	removed duplicate function and other CLI fixes (#12876 ) * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date * Quality Review fixes	2018-02-12 17:24:26 +05:30
Nabin Hait	e21e59614f	Fixed merge conflict	2018-02-12 15:59:55 +05:30
tundebabzy	6e90f49a35	Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714 ) * unconditionally fetch exchange rate * Revert "unconditionally fetch exchange rate" This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a. * allow for `plc_conversion_rate` field to be reset * fetch exchange rate using price list currency and company currency not form currency * clean up	2018-02-12 15:18:57 +05:30
joezsweet	04338cfb4b	removed extra spaces	2018-02-12 10:12:27 +01:00
sivankar	621740efd9	Enhancement and bug fix in batch (#12753 ) * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date	2018-02-12 14:33:40 +05:30
rohitwaghchaure	0aeeb7e02c	[Fix] Item variant details report (#12869 )	2018-02-12 11:44:39 +05:30
rohitwaghchaure	7477899d2e	Formatter, code cleanup (#12852 )	2018-02-12 11:25:58 +05:30
Manas Solanki	a884bd9c6a	don't set the ordered_qty in SO on load from BIN	2018-02-09 13:12:07 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
pawan	2b885beaee	code changes for single stock entry	2018-02-07 19:06:18 +05:30
rohitwaghchaure	b553b7a69d	PDC Enhancements (#12462 )	2018-02-07 18:32:51 +05:30
joezsweet	097a98cc10	fixed spaces to tabs	2018-02-05 13:16:00 +01:00
joezsweet	5f473611bd	space to tab	2018-02-05 12:05:11 +01:00
Prateeksha Singh	b8e9c9be08	[hub] form (info) view for items	2018-02-05 12:58:30 +05:30
Nabin Hait	2ef1f84041	Fixed merge conflict	2018-02-03 09:14:53 +05:30
tundebabzy	a829d5a4d5	Merge branch 'hotfix' into issue-12535-1	2018-02-01 16:56:05 +01:00
Nabin Hait	b9ce104b09	Opening balance in stock ledger report (#12729 )	2018-02-01 14:58:50 +05:30
Nabin Hait	7ba092eaf9	Fixes for making stock entry against Pro Order (#12721 )	2018-02-01 10:51:27 +05:30
rohitwaghchaure	32a5f38595	Merge pull request #12633 from vishdha/issue_12388 [fix] Sales order link to purchase order not working fixed	2018-01-31 17:30:43 +05:30
tundebabzy	4990cf7783	remove stray code	2018-01-31 11:35:56 +01:00
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
Zarrar	4e05f02038	error in throw message rectify (#12719 )	2018-01-31 15:33:51 +05:30
Vishal	fc05cc4e70	[fix] link with supplier quotation to purchase order	2018-01-31 15:10:39 +05:30
Vishal	4dc329f5ea	[fix] Sales order link to purchase order not working fixed	2018-01-31 15:10:39 +05:30
tundebabzy	2f4854ad1a	create new dialog everytime (#12696 )	2018-01-30 12:18:15 +05:30
Nabin Hait	585254456e	Check credit limit while making DN, if bypassed on SO (#12702 )	2018-01-30 12:11:22 +05:30
Saurabh	59c915f599	Merge branch 'master' into develop	2018-01-29 18:53:54 +05:30
Zlash65	f7a4d4221b	check precision with qty	2018-01-29 18:47:21 +05:30
Saurabh	d581ff40ea	Merge branch 'master' into develop	2018-01-29 17:42:37 +05:30
Zarrar	5bf77beb83	precision while checking qty (#12688 )	2018-01-29 16:47:52 +05:30
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
tundebabzy	794ecda618	corrected wrong get_diff arguments	2018-01-27 05:54:40 +01:00
tundebabzy	db4fd7f5b6	Improvements to batch auto naming (#12496 ) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test	2018-01-26 11:00:20 +05:30
rohitwaghchaure	bfa898ff9b	[Fix] System pull the valuation rate even if allow zero valuation rate is enabled (#12537 )	2018-01-26 10:59:00 +05:30
rohitwaghchaure	3574c96c8c	Update item_dashboard_list.html	2018-01-25 17:11:52 +05:30
Vinayak Jethe	5743ce2b6b	Made changes as per suggestions	2018-01-25 13:37:20 +05:30
Vinayak Jethe	549c196beb	Fixes issue #12512	2018-01-24 19:47:59 +05:30
Vinayak Jethe	46c82c45e0	Revised changes for codacy	2018-01-24 14:24:58 +05:30
Vinayak Jethe	2c8ce5a717	Fixes issue #12512	2018-01-24 13:51:26 +05:30
Saurabh	fb2f97391f	resolved merge conflicts	2018-01-24 11:24:10 +05:30
Saurabh	4b9a55b0ef	[fix] If buying or selling price list not found, return empty dict	2018-01-24 07:48:56 +05:30
Saurabh	c8399fd093	Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno Disabled property set only once for has serial no and has batch no field in item doctype	2018-01-23 18:08:56 +05:30
Rohit Waghchaure	266e66cd1b	Disabled property set only once for has serial no and has batch no field in item doctype	2018-01-23 18:06:12 +05:30
Shreya	dfae11bcee	disabled warehouse in list view	2018-01-23 16:46:24 +05:30
pawan	9b7093e4d6	validation code improvement	2018-01-23 11:39:53 +05:30
Shreya	e2b31085a7	fetch uom conversion factor in material request	2018-01-23 10:54:23 +05:30
pawan	6a8eba891e	Move target warehouse validation to submit	2018-01-23 00:57:44 +05:30
pawan	4ab6ef89a1	code alignment	2018-01-22 17:31:40 +05:30
pawan	67867529c0	[fix] #8540	2018-01-22 17:08:39 +05:30
Saurabh	ef31637549	Merge branch 'master' into develop	2018-01-22 15:29:15 +05:30
Rohit Waghchaure	f83f6aae22	[Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests	2018-01-20 15:44:38 +05:30
Nabin Hait	570e29d5e7	Fixed merge conflict	2018-01-17 18:56:02 +05:30
rohitwaghchaure	60febc5465	[Fix] Gross profit validation issue (#12516 )	2018-01-17 14:40:59 +05:30
Vishal Dhayagude	052b51ab20	[fix] Fetch UOM conversion and stock_uom from BOM into material request (#12513 ) * [fix]Fetch UOM conversion and stock_uom from BOM into material Request * Update material_request.js	2018-01-17 14:39:54 +05:30
umaepoch	832453a757	Added Delay days field to Ordered Items to be Delivered report (#12439 ) * Added Delay Days to Ordered Items to be Delivered Report * Ordered Items to be Delivered	2018-01-15 15:43:16 +05:30
Saurabh	35d8ce4fbd	resolved merge conflicts	2018-01-12 16:58:32 +05:30
tundebabzy	e1e38a4bb9	Autoname for Batch DocType #12302 (#12461 ) * add new fields: check: use naming series data: series prefix * refactor autoname: use new function - get_name_from_hash * add new function - get_name_from_naming_series * refactor autoname to generate name from naming series * PEP 8 compliance	2018-01-12 16:30:02 +05:30
tundebabzy	df023bff7f	add posting_date/transaction_date to list_view (#12453 )	2018-01-12 16:27:29 +05:30
Sachin Mane	24e2735e19	Add 'Shelf Life' (Item) and Manufacturing date (Batch) (#12381 ) * fix bug in batch number selector. fetch and display batch numbers only for the given item code. * remove print statement * Fix error on selecting Chattisgarh in address Fix error on selecting Chattisgarh in address because of spelling mistake * Revert "Fix error on selecting Chattisgarh in address" * Add Shelf Life (Item) and Manufacturing Date (Batch) fields * remove console.log * fix ci issues * Update batch.js	2018-01-11 12:45:50 +05:30
Charles-Henri Decultot	47ad7fb129	Multiple variant correction (#12424 )	2018-01-11 12:29:45 +05:30
rohitwaghchaure	752d21e658	Code cleanup for item price stock report and fix report was not exporting properly in excel (#12427 )	2018-01-11 12:28:48 +05:30
tundebabzy	6f75885d86	better validation message	2018-01-10 23:14:13 +01:00
tundebabzy	76dddbf26e	Merge branch 'develop' into multi-barcode	2018-01-10 21:49:27 +01:00
Zarrar	94f9f48d70	set from_warehouse only if purchase_order and purpose found (#12398 )	2018-01-10 16:29:40 +05:30
Saurabh	892a7a6980	resolved merge conflicts	2018-01-09 12:05:20 +05:30
rohitwaghchaure	412e044e8f	[Fix] Error in stock move from batch dashboard (#12377 )	2018-01-09 11:27:35 +05:30
Shreya Shah	44fa9a6d9d	Last purchase rate button added back (#12135 ) * last purchase rate button added * triggers to update rate on button * updated modified column in buying settings * moved trigger to get_item_details.py * hide get_last_rate button depending on buying settings	2018-01-08 14:58:20 +05:30
Nabin Hait	3a972c4d85	Precision issue in stock reconciliation	2018-01-08 12:35:05 +05:30
Nabin Hait	07e5376043	Fixes and cleanups of reserve qty for subcontracting	2018-01-05 18:19:59 +05:30
Nabin Hait	cab8dfc5fb	Fixed merge conflict	2018-01-05 14:15:39 +05:30
Nabin Hait	cb495fb33b	Merge branch 'master' into develop	2018-01-05 13:17:00 +05:30
Nabin Hait	28d0230e56	Multiple small fixes	2018-01-05 13:14:25 +05:30
tundebabzy	8f44d1c63d	Payment Terms in Delivery Note #12167 (#12293 ) * add Payment Terms Template field to delivery note: - This helps for users who create invoice from Sales Invoice - Field is hidden in print - Field is not coupled to Payment Schedule table. * do nothing in payment_terms_template trigger if doctype is Delivery Note	2018-01-05 12:46:50 +05:30
rohitwaghchaure	bc2c83ee3c	Companywise default tax template (#12290 ) * Companywise default tax template * Fix test cases	2018-01-05 12:42:02 +05:30
Nabin Hait	c33788a91b	Show standard rate only in unsaved Item	2017-12-29 15:42:50 +05:30
Shreya Shah	df0dd8be5f	Travis fix for client side tests (#12224 ) * salary slip test fix * attendance tool test fix * timeout after routing	2017-12-29 14:04:46 +05:30
rohitwaghchaure	fe22686a8f	Update last purchase rate from the purchase invoice (#12189 )	2017-12-28 16:11:27 +05:30
Nabin Hait	ca674bec42	Set numeric ranges in Item tamplate if blank (#12199 )	2017-12-28 12:35:11 +05:30
Nabin Hait	123759aff7	Fixes for travis (#12161 ) * Fixes for travis * Testcase fixes for get_item_details * Testcase fixes for get_item_details * Travis fixes * Travis fixes	2017-12-26 17:50:34 +05:30
Nabin Hait	92615901a7	Fixed merge conflict	2017-12-25 13:41:04 +05:30
rohitwaghchaure	d8c6449f3a	[Fix] Bom raw materials not in order in the stock entry (#12149 )	2017-12-25 11:26:40 +05:30
rohitwaghchaure	174900506e	[HotFix] Validation issue for subcontract stock entry (#12127 ) * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py	2017-12-21 11:28:01 +05:30
Nabin Hait	2f9f4f9c01	Multiple fixes related to payment terms (#12115 )	2017-12-20 12:24:59 +05:30
rohitwaghchaure	84da00da2f	Allow to add items in manufacturing process which are not part of bom items (#12110 )	2017-12-20 12:06:09 +05:30
Nabin Hait	2afcff1852	Get outstanding invoices on payment entry	2017-12-15 17:32:03 +05:30
Manas Solanki	53e47e6ba5	frappe call only if item code or serial no is ther (#12036 )	2017-12-15 15:47:52 +05:30
rohitwaghchaure	ce8adecbad	Incoming rate fixes (#11986 )	2017-12-15 12:13:50 +05:30
Nabin Hait	0f97eda7c9	Merge branch 'master' into develop	2017-12-12 19:17:53 +05:30
Zarrar	21ea6cdb91	batch.expiry should be sorted in ascending order too (#11960 )	2017-12-12 18:54:17 +05:30
Nabin Hait	aab1182c73	Update stock_entry.js	2017-12-12 18:45:39 +05:30
Pawan Mehta	bb7fab52d1	[fix] #11880- Item wise report showing price list and stock available (#11885 ) * [fix] #11880 * review comments * codacy fixes	2017-12-12 15:05:03 +05:30
KanchanChauhan	3ca00c7143	Items should not be used from Sample Retention warehouse (#11905 )	2017-12-11 14:59:19 +05:30
Shreya Shah	1b30642362	cal difference amount when qty 0 (#11925 )	2017-12-11 14:56:57 +05:30
KanchanChauhan	236ac5eb38	[Fix] Customer and Address blank if does not exist in Delivery Stops (#11895 )	2017-12-11 12:38:30 +05:30
KanchanChauhan	7f8df06663	[Minor]Removed alert=true from frappe.throw (#11904 )	2017-12-11 12:24:43 +05:30
Prateeksha Singh	0419e2384d	reinitialize variant attribute table, fixes #11900 (#11921 )	2017-12-11 12:22:28 +05:30
Giovanni	43372d3333	- make barcode mandatory if child row is added - check valid barcode only if exists	2017-12-10 20:56:48 +01:00
Giovanni	4c848ee14f	- codacy fix	2017-12-10 20:06:56 +01:00
Giovanni	8f8a485e07	- autoname field:barcode	2017-12-10 19:46:01 +01:00
Giovanni	01953135c5	- code clean	2017-12-10 18:54:19 +01:00
Giovanni	a04c756913	- validate EAN or UPC-A code - made Item Barcode Doctpye standard - added stdnum to requirements	2017-12-10 18:54:08 +01:00
Giovanni	9b7e52cafb	- added barcode validation against Item Barcode	2017-12-10 18:11:48 +01:00
Giovanni	2144e02d3c	- Added multiple barcode feature per item	2017-12-10 17:27:09 +01:00
Asharam Seervi	98d5878aa2	Added Column Break in Item Master (#11887 ) * Fixed: On Item form, added cb. * Fixed: On Item form, added cb.	2017-12-08 16:18:23 +05:30
Zarrar	17fd6610dc	Fix travis (#11882 ) * fieldname wrong * bifurcated test into two - error when both were running async * minor fixes with link and route * move school domain rename up * fix async creation of operations test * edit-in-full-page is button, not link * set_route issue in production order test * minor changes * fix task tree test * more fixes * fix server side issue * improvising ui tests	2017-12-08 14:57:38 +05:30
Doridel Cahanap	9f7e109c3e	[minor] Fix Delivery Trip Error (#11868 )	2017-12-07 11:52:33 +05:30
Nabin Hait	bb09437d1f	Merge branch 'develop' into payroll_entry	2017-12-06 19:18:40 +05:30
Shreya Shah	b13a54ac74	Checkbox in Price list for Price not UOM dependant (#11836 ) * checkbox price not uom dependant * change price list rate on uom dependancy condition * test case * Update get_item_details.py	2017-12-06 19:17:03 +05:30
KanchanChauhan	f6aff3de96	[New Feature] Sample Retention from a Batch of item recieved (#11624 )	2017-12-06 18:38:01 +05:30
Nabin Hait	c84476bd27	Fixed merge conflict	2017-12-06 14:17:51 +05:30
Shreya	e570e4a049	fixed a test	2017-12-04 16:49:44 +05:30
Shreya	eba3f39bbe	test delivery trip fix	2017-12-04 16:04:56 +05:30
Nabin Hait	a11dcb6e59	Pull items in Stock Entry from Purchase Invoice (#11839 )	2017-12-04 13:36:50 +05:30
tundebabzy	3061fc92fd	Batch Stock Items, having serial number can't be moved without inserting Serial Number (#11792 ) (#11813 ) * if doctype is batch, add extra information to args * automatically fetch serial numbers if possible * take advantage of changes in make_stock_entry * code clean up * PEP 8 compliance * fix bug that clears serial number	2017-12-04 11:23:21 +05:30
Saurabh	d505d83cb6	[fix] merge conflicts	2017-12-01 16:23:46 +05:30
rohitwaghchaure	b1ac979ac5	[fix] Do not allow zero valuation rate for serial no and fetch previous valuation rate for serial no (#11817 )	2017-12-01 16:09:02 +05:30
pawan	2ff844e740	default warehouse / remove validation / change sql	2017-11-30 18:14:55 +05:30
Nabin Hait	1b89be0c66	Fixed rounding issue in subcontracting (#11802 )	2017-11-30 15:59:56 +05:30
rohitwaghchaure	e34ef60e3e	[fix] Asset test cases and added make_sales_invoice (#11800 ) * [fix] Asset test cases and added make_sales_invoice * vehicle trip test cases	2017-11-30 15:59:40 +05:30
pawan	e4aaff6686	message changes	2017-11-30 15:49:54 +05:30
Nabin Hait	e761b9de40	Rearranged fields due to merge conflict messup	2017-11-30 14:29:10 +05:30
pawan	e43cd915e8	alignment	2017-11-30 12:31:32 +05:30
pawan	abc5523405	code improvements	2017-11-30 12:23:46 +05:30
pawan	11398fd572	Validation for reserved warhouse	2017-11-29 21:16:02 +05:30
Shreya	c0c470b56d	fixed json affected by latest merge	2017-11-29 19:31:15 +05:30
Vishal Dhayagude	d42242df22	[Feature] Shipping Rule Calculation based on Net Weight (#11770 ) * [new] Calculate shipping tax based on weight * [fix] Change field name weight to weight_per_unit in SI Item * [new] Shipping Rule based tax for selling module * [new] Shipping rule based on weight added to Buying module * [fix] Conflict in jsons * [fix] Removed Redudant add_fetch * [fix] Codacy fixed * [fix] Print hide added	2017-11-29 16:09:59 +05:30
Nabin Hait	ad2a3e4f38	Cleanup and fixes on delivery trip	2017-11-29 15:53:01 +05:30
Nabin Hait	46e285efe9	Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery	2017-11-29 14:15:16 +05:30
rohitwaghchaure	2fb8cc5f2c	[fix] Options must be a valid DocType for field Asset Category in row 18 (#11773 ) * [fix] Options must be a valid DocType for field Asset Category in row 18 * test cases	2017-11-29 13:50:04 +05:30
tundebabzy	2a4fefc6ff	Auto fetch batches based on quantity on POS (#11004 ) (#11767 ) * prevent premature escape when item has serial no and batch no * fetch actual_batch_qty for item * add available_qty to dialog * remove expired batches from drop-down * Update queries.py	2017-11-29 10:53:09 +05:30
pawan	54465f5df1	review comments changes	2017-11-29 10:18:38 +05:30
rohitwaghchaure	c037dc775e	Refactor multi pos profile selection in the pos invoice (#11721 )	2017-11-28 16:11:15 +05:30
Saurabh	b750b304dd	fixed merge-conflicts	2017-11-28 11:02:28 +05:30
rohitwaghchaure	373b5702a9	[fix] Server test cases (#11727 )	2017-11-27 11:27:28 +05:30
Saurabh	ab5e77ecf1	[fix] do not pull disabled pos profiles (#11733 )	2017-11-27 11:26:13 +05:30
pawan	f5279a0d67	[fix] #8427	2017-11-24 11:21:47 +05:30
rohitwaghchaure	15f8fe0179	[fix] Batch selected in the sales transaction for non batch item (#11713 )	2017-11-24 10:46:27 +05:30
Nabin Hait	cda4d50063	Fixed reserved qty for production logic and patch for reposting (#11691 )	2017-11-23 13:05:43 +05:30
tundebabzy	acccdb3890	Default batch number selection (#11454 ) * fetch batch_no in `get_basic_details` * PEP8 changes and docstring * only auto-fetch batch number for Sales documents: otherwise, automatic batch creation will not work properly because all new stock will be added to old batch * new function to fetch batch number using FEFO: FEFO - First Expiring First Out * fetch batch number in `get_basic_details` using FEFO * add new function - `set_batch_number` * `set_batch_number` when `qty` is triggered * `set_batch_number` when `uom` is triggered * whitelist `get_batch_no_fefo` * code clean up * move `set_batch_number` to conversion_factor instead of uom * rename `get_batch_no_fefo` to `get_batch_no` * fix test case * final cleanup * Revert "fetch batch_no in `get_basic_details`" This reverts commit dd024b1eb369eaeafab28165d523fb7a9f8ab8d3. * fix test case * update Sales Invoice manual * move changes away from `transaction.js` * query should not fetch expired batches * refactor `get_batch_no`: add new function `get_batches` * Update batch.py	2017-11-23 13:05:15 +05:30
Saurabh	ed4191ec5b	[fix] merge-conflicts	2017-11-22 18:01:56 +05:30
rohitwaghchaure	4dc5f0efaf	[Fix] Item details not fetching if item has no default bom (#11688 )	2017-11-22 15:21:47 +05:30
Nabin Hait	036bf6de6e	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2017-11-21 20:19:13 +05:30
Nabin Hait	32a62a02df	Fixed merge conflict	2017-11-21 20:18:03 +05:30
rohitwaghchaure	e8ccc0e942	[enhance] Added multi UOM feature in Material Request (#11352 ) * [enhance] Added multi UOM in Material Request * test cases * patch to update multi uom fields in material request item	2017-11-21 16:17:22 +05:30
creamdory	fd1503c6a5	[New Feature] Delivery	2017-11-20 10:28:49 +08:00
Prateeksha Singh	241d64d8c1	Merge pull request #11634 from pratu16x7/variant-modal-fix [minor] fix plurals spacing	2017-11-17 15:34:34 +05:30
pratu16x7	83587c72f6	[minor] fix plurals spacing	2017-11-17 15:33:12 +05:30
Rushabh Mehta	30dc9a14c6	[feature] [refactor] Shipping Rule for Buying + Refactor (#11628 ) * Shipping rule for Buying * [refactor] shipping rule	2017-11-17 14:31:09 +05:30
Saurabh	66e65dc104	[fix] merge-conflicts	2017-11-17 14:03:13 +05:30
Nabin Hait	1c4653ed97	Merge branch 'develop' into payment-terms	2017-11-17 12:41:56 +05:30
Prateeksha Singh	744ff0010b	Variant report (#11618 ) * Item Variant Details Report * remove queries from inside for loop * make attribute value map * Update item_variant_details.py	2017-11-17 12:00:29 +05:30
rohitwaghchaure	51a397c97f	[fix] Valuation rate in stock entry and code cleanup (#11614 )	2017-11-16 18:23:16 +05:30
Prateeksha Singh	8f43d2514c	Multiple variant creation dialog (#11608 ) * Multiple variant creation dialog * variant dialog codacy fixes * [multiple variants] show_alert, and other minors	2017-11-16 18:06:26 +05:30
Nabin Hait	46be9896a9	Account number in chart of accounts (#10551 ) * Account number in chart of accounts * Include account number while renaming account * Test case fixed * Standard coa with and without numbers * Standard coa with and without numbers	2017-11-16 16:51:55 +05:30
tundebabzy	f7e6934d7c	handle None case in `update_reserved_qty_for_production` (#11593 )	2017-11-16 14:13:49 +05:30
Manas Solanki	eb3982044b	convert html into text in the taxes description as it can break the reports (#11603 )	2017-11-16 14:11:39 +05:30
Rushabh Mehta	8e5dcd06fb	[fix] item.py	2017-11-15 17:53:44 +05:30
Rushabh Mehta	083dabaaf8	[fix] item.py	2017-11-15 17:08:53 +05:30
Nabin Hait	78ab8235f6	Minor code cleanups in stock balance report	2017-11-15 14:43:54 +05:30
Brown-Harry Boma	b9e44217a2	[Fix]Codacy Issues	2017-11-15 14:43:54 +05:30
Brown-Harry Boma	2da8f6e89d	Add Items Variants Attributes columns to Stock Balance Report	2017-11-15 14:43:54 +05:30
Zarrar	24b8aa2e80	set field dependent on link field fix (#11580 )	2017-11-15 14:27:00 +05:30
Nabin Hait	6fd163bc55	Merge branch 'master' into develop	2017-11-15 14:08:17 +05:30
Manas Solanki	bf59b5927f	make route from item code if item name is None (#11579 )	2017-11-15 10:55:22 +05:30
ppd1990	9bd84277db	Propagate projected_qty all the way to the root warehouse to make 'check in group' actually work for more complex warehouse topologies (#10842 )	2017-11-15 10:13:09 +05:30
Nabin Hait	10823e5a25	Merge branch 'neilLasrado-develop1' into develop	2017-11-14 17:40:45 +05:30
Nabin Hait	b55e98570f	Minor fixes	2017-11-14 17:40:30 +05:30
Shreya Shah	be690ef817	Rate with margin in customer and company currency (#11437 ) * field for company margin * added base_rate_with_margin * calculate company margin * test for item price * test for delivery note * test for sales order * test for quotation * test for sales invoice	2017-11-14 17:22:41 +05:30
Rushabh Mehta	b8b8dc119f	[fix] item.py fix for _doc_before_save	2017-11-14 16:52:05 +05:30
Rushabh Mehta	cc1262c36d	Add option to clean description html in item description. (#11565 ) * [fix] add item settings * [docs] Item Settings * [fix] enqueue in item_settings.py * [refactor] move to stock settings * [refactor] move to stock settings	2017-11-14 16:36:25 +05:30
Rushabh Mehta	d5c6416d91	[new feature] Product Configurator (via Item Quick Entry) (#11535 ) * [Feature] Item Variant Creation from Quick Entry * [minor] formatted js * [minor] set 3 attribute per page instead of 5 in template * [fix] fixed codecy issue * [fix] label translation * [minor] changed trigger event of item template * [fix] moved item ui tests under stock * [UI test] added test for item attribute * [UI test] added test for creation of item variant from quick entry * [fix] item variant ui test fixes * [wip] * [cleanup] item quick entry * [remove] tests, fixtures were missing * [refactor] use set_only_once in item	2017-11-14 15:27:28 +05:30
tunde	ffa659fd2c	Merge branch 'develop' into payment-terms	2017-11-14 09:59:45 +01:00
Rushabh Mehta	4313326ba0	[fix] treeview for tasks (#11515 ) [fix] treeview for tasks	2017-11-10 18:52:21 +05:30
Saurabh	7b78a83592	Merge branch 'master' into develop	2017-11-10 13:15:04 +05:30
KanchanChauhan	e59c9ce9f4	Checkbox has_expiry_date in Item to make suer Expiry Date is entered in Batch (#11413 )	2017-11-10 11:16:29 +05:30
Alchez	1077c782a3	[Fix] Packing Slip creation if custom field does not have a value (#11423 ) * [Fix] Packing Slip creation if custom field is Column/Section Break * Used no_value_fields and sorted imports * Update packing_slip.py	2017-11-10 11:14:57 +05:30
Nabin Hait	15753074bf	Nestedset model fixes for changing parent and renaming (#11467 )	2017-11-10 11:12:43 +05:30
Faris Ansari	4a864c1eea	[fix] Update bom item description (#11498 ) * [fix] Update bom item description * Update item.py	2017-11-09 19:01:21 +05:30
Saurabh	f41b13b736	[fix] merge-conflicts	2017-11-08 12:18:41 +05:30
Rohit Waghchaure	acc8995c48	[enhance] In item variants settings added provision, do not update the fields of variants from the template but will copy the value while making new variant aginst the template	2017-11-08 11:39:08 +05:30
Sushant Nadkar	72c40f0383	Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440 )	2017-11-08 11:35:46 +05:30
tunde	bbce7b7e5d	get attribute with get method	2017-10-26 14:31:13 +01:00
tunde	6575a615b1	get attribute with get method	2017-10-26 14:30:18 +01:00
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Nabin Hait	6a4e230cde	[fix] Status of Item (#11326 )	2017-10-25 17:06:30 +05:30
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Nabin Hait	b7483f6dfd	Update item.json	2017-10-25 11:58:02 +05:30
tundebabzy	cba7a11d75	Make Variant does not copy UOM properties (#10887 ) (#11261 ) * add `uoms` to Item Variant Settings if not already added * add new patch to patch list * change uoms field to no_copy:0	2017-10-25 11:57:10 +05:30
rohitwaghchaure	311823aca1	Validate stock exists against template item (#11305 )	2017-10-25 11:45:51 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Nabin Hait	bb60a59b96	Fixed asset test cases due to tax rule (#11247 ) * Fixed asset testcases due to tax rule * Delete tax rule record after running test cases * Fixed test cases * Fixed test cases * Fixed subscription tests due to tax rule	2017-10-19 12:14:37 +05:30
Vishal Dhayagude	3e02d80636	[fix] Travis Client Side Failure (#11198 )	2017-10-18 11:10:45 +05:30
Nabin Hait	a9feddbb79	Testcase fixes (#11238 ) * Restaurant test records fixed * Fixes for test cases	2017-10-18 10:52:48 +05:30
Nabin Hait	5a834209d0	Cleanup of PO schedule date pull requests	2017-10-05 19:51:10 +05:30
Stavros Anastasiadis	58b587834e	Provide a minor warning message if no stock levels are availiable (#11074 ) * Provide a minor warning message if no stock levels are availiable * Update item_dashboard.js	2017-10-05 18:44:50 +05:30
Stavros Anastasiadis	e31757b001	Show Stock Level section only to stock maintain items (#11073 )	2017-10-05 18:41:51 +05:30
Nabin Hait	395cf4689b	Cleanup of schedule date functionality in Material Request	2017-10-05 18:27:37 +05:30
Prateeksha Singh	925e9776e8	[hub] rename is_hub_item to is_item_from_hub (#11069 ) * [hub] rename is_hub_item to is_item_from_hub * [rename] is_hub_item to is_item_from_hub	2017-10-05 17:17:41 +05:30
Nabin Hait	d6d99e0d59	Removed duplicate field related to hub from Item	2017-10-05 12:39:42 +05:30
Faris Ansari	fd345f8e90	Hub (#10934 ) * [WIP]Hub * [listing] Show items, users and item_groups * Show filters * [start] cart, api for rfq and opp * rfq working * [wip] keys * wip quotes * [hub] register/unregister * [hub] rename password to access_token, remove passed company field * [hub] publishing cases, api call wrapper * [hub] add and remove fields working * [hub] fix flags, update on client save working * [hub] new hub page, client item CUD at hub working * listing, standard rate, local site hack * item listing, item page, search, back to home * [hub] implement hub company * [hub] company filter * [hub] basic rfq-ing, item page cleanup * categories wip * [hub] use get_doc_before_save() * [hub] send opportunity message to hub, api to make locally * [hub] enqueueing in hub api request wrapper * cleanup * [hub] refactor shopping cart's product.py to reuse * sync dynamic item fields daily * Scheduler heartbeat check * [wip] hub categories * [hub] wip enqueued callbacks * [hub] outgoing messages, fixing callback loop * [hub] bug: callback save after primary save * [hub] pricing, stock, currency * [hub] replace send_hub_request with make_and_enqueue * add hub.less, refactor code * Remove template html files, add styling for hub item cards * fix paging * add breadcrumb * Add sidebar * [hub] add company page, change country * [hub] order_by filters * [hub] make hub category a tree * [hub] enqueue batched item enqueueing * [hub] requested products page * [minor] * update hub url * [fix] url * [fix] more reform * fix recursion * [hub] data migration plans as jsons * Hub register, create data connector, sync with run * [add] user registration by session user * Removed hub_message * Remove sync code from hub_settings * Remove hub methods from item.py * Update Hub Sync plan * Hub unregister * Update Hub connector on reregister * Dont delete Hub Connector on unregister * Enable hub on success response * Add new hub whitelisted methods * [hub] list working * Hub register from hub page * [hub] Add hub logo in desk icon, link to page * [hub] hide page head on empty state * [hub] make rfq * [hub] push opportunity doc, poll for opportunity docs * add fields to item mapping * update hub mappings * Make RFQ * [hub] item, home routing * Make rfq and send opportunity refactor * [hub][fix] remote lead data * images passed as base64 * set default company on register * Revert "images passed as base64" This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4. * Add sync to hub page * Prompt for publish items to hub * add post process to hub document to lead * Rename Hub document to Hub message, create opportunity in post process	2017-10-05 11:17:30 +05:30
Nabin Hait	fc712aea32	Merge branch 'master' into develop	2017-10-04 18:05:20 +05:30
rohitwaghchaure	1e2c554e61	[Fix] Stock entry multi uom batch validation issue (#11049 )	2017-10-04 17:52:49 +05:30
Javier Wong	61287e3c53	[fix] Change Sample Item Error Message to Zero Valuation Rate (#10935 ) Change Sample Item Error Message to Zero Valuation Rate	2017-10-04 16:01:34 +05:30
Nabin Hait	7eba1a35d3	Controller init args fix (#11015 ) * Controller init args fix * cleanup useless code	2017-10-02 15:59:27 +05:30
Sunny	38647ed832	move Purchase Order patch to v9	2017-10-02 11:37:48 +08:00
Sunny	42c74a6365	set schedule_date when creating po	2017-10-02 11:37:48 +08:00
Sunny	c6f25ba996	correct field name	2017-10-02 11:37:47 +08:00
Sunny	869b878286	set schedule_Date when creating po	2017-10-02 11:36:24 +08:00
Sunny	f2e2e23b6b	[fix] tests	2017-10-02 11:35:33 +08:00
Nabin Hait	01b96a0e31	Fixes for uom in get_item_details	2017-09-29 18:57:41 +05:30
Nabin Hait	79a1d2a3b0	Fixes for uom in get_item_details	2017-09-29 18:15:40 +05:30
Javier Wong	bf37995745	[Enhancement] Sales and Purchase Default UOM (#10929 ) Option for specifying an optional default Sales and Purchase UOM at the item master level.	2017-09-29 15:23:08 +05:30
Nabin Hait	945f502748	Fixes for updating item variant from template (#10975 ) * Fixes for updating item variant from template * More fixes for test cases	2017-09-29 15:11:50 +05:30
Nabin Hait	c314485d55	Fixes based on test case	2017-09-28 18:55:49 +05:30
schilgod	0f6fff6f0c	item price track_changes default to 1 (#10958 )	2017-09-28 15:28:59 +05:30
Sunny	33670bba47	fix reorder_item	2017-09-28 15:24:11 +08:00
Sunny	0d91d3f572	add schedule_date while creating Material Request	2017-09-28 15:23:52 +08:00
Sunny	12cb07ce3c	[fix] test records	2017-09-28 15:22:49 +08:00
Sunny	23a4b09d43	Add Material Request schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:48 +08:00
Nabin Hait	fce14fdcf0	Fixed merge conflict	2017-09-27 17:21:21 +05:30
Prateeksha Singh	283922daa2	[fix] Check for stock_qty, else use qty (#10937 )	2017-09-27 17:12:28 +05:30
Nabin Hait	76e1ca35ad	Merge branch 'master' into develop	2017-09-27 13:05:21 +05:30
Makarand Bauskar	70eaf2da95	[minor] removed the default precision for the margin_rate_or_amount field (#10923 )	2017-09-27 12:49:16 +05:30
Prateeksha Singh	df8fbd7d72	[fix] batch qty checked against stock_qty field (#10906 )	2017-09-26 17:16:03 +05:30
Nabin Hait	2851dfad99	Set fields in Item Variant Settings which should be copied from template to variant	2017-09-21 15:41:57 +05:30
Rohit Waghchaure	5b05335e89	added patch and set default fields after completion of setup wizard	2017-09-21 15:41:57 +05:30
Rohit Waghchaure	0e28fccb34	[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated	2017-09-21 15:41:57 +05:30
Nabin Hait	b2dca79d89	Updated modified timestamp in sales/purchase transaction doctypes	2017-09-20 09:56:06 +05:30
Nabin Hait	2e4de83df6	Rounding Adjustment via a separate field, instead of last tax row (#10659 ) * Rounding Adjust via a separate field, instead of last tax row * Fixed test cases	2017-09-19 14:53:16 +05:30
Nabin Hait	bd4b80e3d8	Merge branch 'master' into develop	2017-09-19 12:05:41 +05:30
Neil Trini Lasrado	de3429280b	Made Template link in variant (Item Master) intro linkable (#10696 ) * Made Template link in variant (Item Master) intro linkable * Update item.js	2017-09-18 16:42:10 +05:30
Saurabh	590d401e5f	[fix] if bom specified on purchase order item then don't pull default bom in purchase receipt (#10793 ) * [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt * Update bom.js * Update stock_entry.py	2017-09-18 15:49:19 +05:30
Utkarsh Goswami	11bd5fc3b1	Description moved next to item code (#10820 )	2017-09-18 15:05:50 +05:30
Nabin Hait	092f6d3739	Fixes ui tests	2017-09-14 16:45:47 +05:30
Nabin Hait	f8f29677fd	Merge branch 'master' into develop	2017-09-12 16:16:57 +05:30
rohitwaghchaure	54099e592e	[fix] Serial No has already been received error while making purchase receipt entry for the returned serial no (#10736 )	2017-09-12 15:51:52 +05:30
rohitwaghchaure	1b65575860	Merge branch 'develop' into pos-refactor	2017-09-07 17:15:58 +05:30
rohitwaghchaure	166b78f022	[Enhance] Subscription module (#10089 ) * [Enhance] Subscription module * Added view documents from the subscription form * Test cases * documentation * UI Test cases, fixes * Removed child table in the subscription * Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow * added patch to make subscription from the recurring data * Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller * renamed subscription_id to subscription	2017-09-07 16:14:22 +05:30
Rushabh Mehta	134d59949a	[minor] update warehouse_group in item.reorder_levels	2017-09-07 09:04:24 +05:30
Faris Ansari	e4434d3200	Merge branch 'develop' into pos-refactor	2017-09-05 17:18:04 +05:30
mbauskar	9012a9b414	Merge branch 'master' into staging	2017-08-31 15:31:48 +05:30
mbauskar	2965f92be3	Merge branch 'master' into develop	2017-08-31 15:31:47 +05:30
Vishal Dhayagude	1252c30edf	[UI Test] UI test for Repack and Sales Invoice with Serialize item Added (#10583 ) * [UI Test] UI test for Repack and Sales Invoice with Serialize item Added * [Fix] Fixed path for sales invoice"	2017-08-31 14:47:56 +05:30
Vishal Dhayagude	1458d7fea6	[UI Test] Stock Entry for material issue with serialize item (#10592 )	2017-08-31 14:47:01 +05:30
Faris Ansari	491108a198	Merge branch 'develop' into pos-refactor	2017-08-30 12:37:05 +05:30
mbauskar	5096c45dec	Merge branch 'master' into hotfix	2017-08-29 20:42:06 +05:30
tundebabzy	1a947dbf6a	Item Name not loaded in Material Request via BOM (#10535 ) (#10555 ) * adds item_name to child table * adds two new functions to utils: - first_row_is_empty: to check if first row in child table is empty - remove_empty_first_row: to remove the empty first row in a child table * removes empty first row after getting from BOM * ui test	2017-08-29 18:18:27 +05:30
Rohit Waghchaure	ba3f0e6b70	Added serial no, batch no, item group functionality	2017-08-28 19:45:58 +05:30
Aditya Hase	6ccb6562f1	Python 3 compatibility syntax error fixes (#10519 ) * Use Python 3 style print function * Use 'Exception as e' instead of 'Exception, e' * Unpack tuple arguments explicitly in instead of relying on auto unpacking * Use consistent indentation * Use 0 if stock_frozen_upto_days is None	2017-08-28 18:17:36 +05:30
Vishal Dhayagude	7ed4bfe7ee	[UI Test] UI Test for Material Receipt with Serialize Item Added (#10565 ) * [UI Test] UI Test for Material Receipt with Serialize Item Added * [fix]Codacy fixed	2017-08-28 16:53:25 +05:30
Vishal Dhayagude	872bebbbf8	[UI Test] Stock Entry for Subcontract (#10574 )	2017-08-28 15:33:21 +05:30
Vishal Dhayagude	f8e6c44996	[UI Test] Stock Entry for Material Transfer to Manufacture (#10572 )	2017-08-28 15:32:33 +05:30
mbauskar	5d0c4361ab	resolved merged conflicts	2017-08-28 11:58:44 +05:30
mbauskar	aaec42ebc2	resolved merged conflicts	2017-08-28 11:57:56 +05:30
Vishal Dhayagude	da2164373c	[UI Test] UI Test added for Batch (#10564 )	2017-08-28 11:10:26 +05:30
Rushabh Mehta	6b651d734e	[fix] status in purchase_receipt.py (#10534 )	2017-08-24 15:47:49 +05:30
Rushabh Mehta	4a546e6c18	[minor] delivery note standard filter	2017-08-23 16:16:43 +05:30
Nabin Hait	34c218b2de	Minor improvements based on skip_transfer (#10457 )	2017-08-22 19:07:16 +05:30
mbauskar	4396a0e9a8	Merge branch 'master' into staging	2017-08-22 15:42:10 +05:30
mbauskar	3b3ab4d574	Merge branch 'master' into develop	2017-08-22 15:42:10 +05:30
rohitwaghchaure	187cea3602	[Fix] Accepting duplicate serial no is purchase receipt (#10469 ) * [Fix] Accepting duplicate serial no is purchase receipt * Fixed test cases	2017-08-22 15:38:32 +05:30
mbauskar	7716a08b5d	Merge branch 'master' into staging	2017-08-22 12:03:47 +05:30
mbauskar	7d9452f4e4	Merge branch 'master' into develop	2017-08-22 12:03:47 +05:30
Makarand Bauskar	a591d1df5f	[minor] ingore user permission for old_parent fields (#10471 )	2017-08-21 19:04:49 +05:30
mbauskar	5088ad11ee	Merge branch 'master' into staging	2017-08-21 08:58:52 +05:30
mbauskar	62f0722325	resolved merge conflicts	2017-08-21 08:58:42 +05:30
Nabin Hait	879e162cce	Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405 )	2017-08-21 08:28:55 +05:30
Makarand Bauskar	222e86bb13	[hotfix] fixed the mysql syntax error issue on stock ledger report (#10442 )	2017-08-21 07:35:16 +05:30
Vishal Dhayagude	592e8c2e77	[UI Test] UI Test added for Stock Reconciliation (#10432 ) * [UI Test] UI Test added for Stock Reconciliation * [fix] Codacy	2017-08-18 15:01:20 +05:30
Vishal Dhayagude	2890fa74a2	[UI Test] UI Test for Purchase Receipt Added (#10434 )	2017-08-18 11:55:14 +05:30
Manas Solanki	0371d5a326	new item group filter in the stock ledger report (#10400 )	2017-08-16 11:35:04 +05:30
mbauskar	f03afe0878	Merge branch 'master' into staging	2017-08-14 09:31:01 +05:30
mbauskar	2fa8af3b02	Merge branch 'master' into develop	2017-08-14 09:31:01 +05:30
Vishal Dhayagude	22baba2cff	[UI TEST] Test added for Delivery Note (#10376 )	2017-08-11 17:17:30 +05:30
Vishal Dhayagude	4157b64776	[UI Test] Multiple UI Test for Stock Entry added (#10354 )	2017-08-11 12:06:16 +05:30
rohitwaghchaure	2e8232e7aa	[Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company (#10320 )	2017-08-10 11:32:59 +05:30
Vishal Dhayagude	e05c2e5d95	[UI Test] for Stock Entery (#10346 )	2017-08-09 17:36:04 +05:30
Vishal Dhayagude	bde05e96a6	[UI TEST] Multiple test for Materail request (#10347 )	2017-08-09 16:56:14 +05:30
Vishal Dhayagude	da30a69ee7	[UI Test] test added for Material Request (#10338 ) * [UI Test] test added for Material Request * [mod] date in material request	2017-08-09 13:08:38 +05:30
KanchanChauhan	71088aa2bd	Supplier Part No in Purchase Receipt since it exits in Purchase Order (#10314 )	2017-08-08 14:41:35 +05:30
mbauskar	1065679720	Merge branch 'master' into staging	2017-08-08 12:54:12 +05:30
KanchanChauhan	255c5f4407	Supplier Delivery Note field added to Purchase Receipt, good to have for future references (#10309 )	2017-08-08 11:23:45 +05:30
Nabin Hait	19128134a8	Merge pull request #10295 from tundebabzy/issue-10099-2 BOM Currency symbol issue (#10099) - Stock Ledger report	2017-08-07 13:49:22 +05:30
tunde	80a9f37272	add options in `get_columns`	2017-08-04 12:08:09 +01:00
Ameya Shenoy	4331067e57	[ui-test] completed tests for manufacturing (#10218 ) * modified test_item to include child table assertions * minor travis fixes * removed css selectors and used cur_frm	2017-08-04 10:50:32 +05:30
Kanchan Chauhan	1fd17a9a67	[Minor] Country field name should be country	2017-08-03 10:18:43 +05:30
tunde	7663bbadb9	edit Doctypes to use company currency	2017-08-03 00:05:56 +01:00
Ameya Shenoy	4e91f28ce5	[ui-testing] added test for production order (#10138 ) * temporary commit for switching branches * [ui-tests] added bill_of_materials test * added warehouses required for production order * [ui-test] added production order test * debugging travis failure	2017-07-31 11:02:28 +05:30
Faris Ansari	482331b987	[fix] Default Warehouse not obeying form value (#10153 )	2017-07-28 20:58:39 +05:30
Rushabh Mehta	be4fd1100d	[fix] test	2017-07-28 15:54:07 +05:30
Saurabh	c07741d36f	Merge branch 'master' into staging	2017-07-27 17:50:28 +05:30
Saurabh	8907f1d2c3	Merge branch 'master' into develop	2017-07-27 17:50:27 +05:30
Makarand Bauskar	145393b12f	[hotfix] set the account name in GL entry instead of warehouse (#10134 )	2017-07-27 16:46:40 +05:30
Makarand Bauskar	9c6e2c3637	[hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends (#10127 )	2017-07-27 16:23:57 +05:30
tundebabzy	296603a861	auto populate all rows (#10090 )	2017-07-27 11:47:56 +05:30
cclauss	6848708377	old style exception, raise --> new style for Python 3 (#10082 ) * old style raise --> raise() for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style raise --> raise() for Python 3 * old style raise --> raise() for Python 3 * old style exception, raise --> new style for Python 3	2017-07-27 10:38:35 +05:30
Saurabh	dc6e369172	Merge branch 'master' into develop	2017-07-25 16:42:28 +05:30
rohitwaghchaure	4cccdbdbf9	[Fix] Validating price list currency even if price list is not defined (#10056 )	2017-07-25 14:05:01 +05:30
Makarand Bauskar	dfc5a454b3	[minor] fixed the delivery date issue in Ordered Item to be Dellivered report (#10028 )	2017-07-25 10:48:43 +05:30
Nabin Hait	9c42161061	Itemised tax breakup fix in docs other than invoice (#9961 ) * Itemised tax breakup fix in docs other than invoice * Set itemised tax breakup and hsn code in existing docs	2017-07-20 13:32:01 +05:30
Nabin Hait	338c28e78e	Merge pull request #9902 from rohitwaghchaure/sales_invoice_serial_no_issue_from_dn [Fix] Sales invoice serial no validation issue	2017-07-18 13:05:50 +05:30
Rohit Waghchaure	7e14996995	[Fix] Sales invoice serial no validation issue	2017-07-18 12:59:55 +05:30
Nabin Hait	4c40a416e6	Merge pull request #9900 from frappe/fixes_9899 [fix] #9899	2017-07-18 11:17:45 +05:30
Nabin Hait	3020c8086c	Update stock_balance.py	2017-07-18 11:17:32 +05:30
Nabin Hait	b962fc1573	Show hsn code in tax breakup for India and render via template (#9866 ) * Show hsn code in tax breakup for India and render via template * tax breakup if gst_tax_field does not exists * Fixed tax-breakup test cases	2017-07-17 18:02:31 +05:30
pawan	36025468a1	[fix] #9899	2017-07-17 17:28:44 +05:30
Nabin Hait	e06526ffff	Add indexes in some transaction doctypes (#9889 )	2017-07-17 13:28:27 +05:30
Rushabh Mehta	3df2c9421a	[fix] setup wont be called if declared inside setup	2017-07-13 16:11:54 +05:30
Makarand Bauskar	8f507a984e	[minor] check if the company is selected or not before triggering get_bank_cash_account (#9830 ) * [minor] check if the company is selected or not before triggering get_bank_cash_account * [minor] check if production order is available * [minor] fixed codacy errors	2017-07-13 11:44:29 +05:30
Nabin Hait	7312186c76	Set corrected states list in GST State field's options	2017-07-13 10:41:15 +05:30
Nabin Hait	0a32b7a6eb	Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code	2017-07-12 19:21:05 +05:30
Nabin Hait	cdf4320b3b	Merge pull request #9673 from rohitwaghchaure/serial_no_sales_return_issue Remove sales invoice from serial number while making sales return entery using delivery note	2017-07-10 19:04:30 +05:30
mbauskar	ccaf36a00f	[minor] fixed depends on for stock entry expense_account and purchase receipt item's cost_center field	2017-07-10 16:24:24 +05:30
Britlog	8c85562ceb	Breadcrumbs management (#9544 )	2017-07-10 12:14:05 +05:30
Rohit Waghchaure	934e69fe0b	Remove sales invoice from serial number while making sales return entery using delivery note	2017-07-06 18:19:18 +05:30
Rohit Waghchaure	6d03790b44	Revert sales invoice serial no issues	2017-07-06 15:58:50 +05:30
Nabin Hait	949a920022	Production Order Enhancements (#9432 ) * Production Order Enhancements - Show required items child table - Source warehouse for each raw materials, in Pro Order Item and BOM Item table - Group warehouse allowed for source and wip warehouse - Patch to populate required items, to fix status and reserved qty for stopped pro order - Cleaned up existing codes - Test cases * Set available qty in source and wip warehouse * minor fix in bom query naming * Minor Fixes * Reload BOM doctypes in patch	2017-07-05 13:55:41 +05:30
Doridel Cahanap	5ad4a6e161	Total Stock Summary (#9465 ) * Total Stock Summary * indentation fixes and removed the for loop * minor fixes in total stock summery report	2017-07-05 10:49:09 +05:30
tundebabzy	6015f0f2ec	Inspection required before delivery isn't working for item variants (#9362 ) * makes `copy_attributes_to_variant` to not ignore "Table" * fixes test cases - `test_auto_material_request` and `test_auto_material_request_for_variant` * adds test case - tables in templates should be copied to variants * [ci] use deprecated trusty build for now	2017-07-04 15:43:02 +05:30
Rushabh Mehta	43ef4e9047	Added first UI tests (#9532 ) * [wip] * [tests] wip * [ui-tests] first-cut * [minor] remove old tests	2017-07-03 11:53:07 +05:30
Rohit Waghchaure	eb7eb43dfc	[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before	2017-06-27 17:34:44 +05:30
pratu16x7	846f5d4bd8	[fix] cloning rows	2017-06-27 14:03:56 +05:30
pratu16x7	29cebbb0cd	use set_value() for setting rows	2017-06-27 09:48:28 +05:30
pratu16x7	89d001caf3	[lint] fixes	2017-06-26 17:45:49 +05:30
pratu16x7	ae450fc23b	async call to require, more validation	2017-06-26 15:31:46 +05:30
pratu16x7	5f389c999a	[fix] values update in items in invoices	2017-06-26 13:38:24 +05:30
pratu16x7	577e4c4e28	Add in transaction.js, cleanups	2017-06-23 19:25:01 +05:30
pratu16x7	759f669214	Add in delivery note	2017-06-22 18:14:29 +05:30
pratu16x7	70eca9462b	make erpnext.SerialNoBatchSelector	2017-06-22 18:14:29 +05:30
pratu16x7	60d9446656	onchange in df	2017-06-22 18:14:29 +05:30
pratu16x7	934105bf34	fix modified by, blur serial field	2017-06-22 18:14:28 +05:30
pratu16x7	26b8f5c3ce	[minor]	2017-06-22 18:14:16 +05:30
pratu16x7	36693e27be	[fix] tests	2017-06-22 18:14:16 +05:30
pratu16x7	a5d5403bf3	specific change bubbling for grid fields	2017-06-22 18:13:56 +05:30
pratu16x7	0e35651e94	Add get_stock_qty test	2017-06-22 18:13:56 +05:30
pratu16x7	837ffbddbc	[minor]	2017-06-22 18:13:55 +05:30
pratu16x7	ff25573558	cleanup	2017-06-22 18:13:55 +05:30
pratu16x7	82a199d6d7	[fix] availably qty reupdate	2017-06-22 18:13:55 +05:30
pratu16x7	d15a507567	add serial_no_check	2017-06-22 18:13:55 +05:30
pratu16x7	01e79f033e	add warehouse selection and mapping	2017-06-22 18:13:55 +05:30
pratu16x7	9a6e675b41	wip	2017-06-22 18:13:55 +05:30
pratu16x7	7331f169fc	[fix] warehouse required bug	2017-06-22 18:13:54 +05:30
pratu16x7	d09f35fa98	fire modal on item_code, events, validation	2017-06-22 18:13:54 +05:30
pratu16x7	52d703a232	[fix] test	2017-06-22 18:13:54 +05:30
pratu16x7	e4e00d2215	batch item distribution by oldest, serial no check	2017-06-22 18:13:54 +05:30
pratu16x7	60944e3397	get oldest batch in modal, insert batch items	2017-06-22 18:13:30 +05:30
pratu16x7	0b642cd414	set available qty	2017-06-22 18:13:30 +05:30
pratu16x7	b4de1c771b	WIP	2017-06-22 18:13:30 +05:30
Rushabh Mehta	aedaac63ea	[wip] batch, serial number selector	2017-06-22 18:13:30 +05:30
Makarand Bauskar	e995371b08	Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings [Enhance] Company wise perpetual inventory settings	2017-06-22 12:35:41 +05:30
Rohit Waghchaure	2d9b3cd270	Fixed test cases	2017-06-22 12:23:15 +05:30
Makarand Bauskar	ce7087f08a	Merge pull request #9408 from mbauskar/develop merged hotfix branch to develop	2017-06-21 16:41:33 +05:30
Makarand Bauskar	b37eb10421	Merge pull request #9382 from nick9822/nick9822-patch-1 Resetting batch and serial nos checks	2017-06-21 16:34:32 +05:30
mbauskar	196f3b1fb8	resolved merge conflicts	2017-06-21 14:38:06 +05:30
Saurabh	8d269beb45	[minor][fix] pass template item name to make_variant_item_code	2017-06-20 20:14:14 +05:30
Makarand Bauskar	cd5dd890aa	Merge pull request #9384 from nick9822/nick9822-patch-2 Bug while fetching stock balance of new item.	2017-06-20 19:52:28 +05:30
nick9822	cc699a94fd	Bug while fetching new item balance.	2017-06-20 17:13:29 +05:30
nick9822	43a48fd2bc	Resetting batch and serial nos checks	2017-06-20 17:02:55 +05:30
Vishal Dhayagude	310d4dc9e0	UOM column in Batch Wise Balance History Report (#9359 ) * Training Events/Results link to employee dashbord * [minor]Improve validation message for Buying / Selling Setting * [minor]Added UOM cloumn in Batch Wise Balance History Report * modified validation message for buying / selling setting	2017-06-20 13:02:35 +05:30
Rohit Waghchaure	e9ff1914fc	Added is_perpetual_inventory_enabled method	2017-06-20 11:26:37 +05:30
Rohit Waghchaure	65ccb42f95	fixed document	2017-06-20 10:21:34 +05:30
Rohit Waghchaure	6945d0dd8a	fixed test cases	2017-06-20 10:21:33 +05:30
Rohit Waghchaure	a5f40941ae	[Enhance] Companywise perpetual inventory setting	2017-06-20 10:21:33 +05:30
Rushabh Mehta	80ef298519	[fix] [tests] test_delivery_note	2017-06-20 10:07:28 +05:30
Rushabh Mehta	36311020de	[minor] ux fixes	2017-06-20 09:31:06 +05:30
Rushabh Mehta	b7b49f6da7	[fixes] fix message and type conversion;	2017-06-19 09:59:09 +05:30
Britlog	224eb90199	Fix get_parents context (#9296 )	2017-06-16 11:51:06 +05:30
Sagar Vora	5f407907a2	fix logic of quantity validation (#9311 )	2017-06-16 11:43:36 +05:30
mbauskar	f9e2bf1ab4	fixed merge conflicts	2017-06-15 13:42:47 +05:30
Nabin Hait	6d7b0ce794	Warehouse Account Linking (#9292 ) * [enhance] Added account in the warehouse * documentation * patch to move account head from account to warehouse * fixed test cases * Fixes in warehouse-account linking * minor fix in test case	2017-06-15 11:09:27 +05:30
tundebabzy	f5604c101c	Once primary key is generated, do not allow changing Series #8911 (#9265 ) * changes set_only_once field for tabDocField to 1 * changes all affected doctypes `set_only_once` option to 1 * add patch name to text file * adds test cases * Revert "add patch name to text file" This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c. * Revert "changes set_only_once field for tabDocField to 1" This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.	2017-06-14 16:10:09 +05:30
KanchanChauhan	c849f647f7	Show Stock Level only if any value(actual, reserved, reserved for production or projected) exists (#9168 )	2017-06-14 15:37:47 +05:30
Manas Solanki	40be3f4048	fix in the item for the function make_variant_item_code (#9280 )	2017-06-14 15:06:07 +05:30
Sagar Vora	489ab6d70d	[minor] remove hardcoded flt precision and use system default (#9250 ) * possible fix * use system default precision for flt	2017-06-13 18:58:47 +05:30
Saurabh	797f2030f8	Merge branch 'master' into develop	2017-06-13 15:20:13 +05:30
Makarand Bauskar	8ce53c94d1	Merge pull request #9189 from mbauskar/mysql-lockout [hotfix] fixes for mysql Lock wait timeout exceeded	2017-06-13 14:41:42 +05:30
mbauskar	6f71648719	[minor] removed the else condition in update_qty	2017-06-13 14:36:30 +05:30
mbauskar	f819c93329	[minor] replaced db_save by db_update and added patch to remove the indexes on tabBin	2017-06-13 13:22:34 +05:30
Saurabh	0c21d85f0d	[fix] add index on voucher type and voucher no in stock ledger entry	2017-06-09 19:05:30 +05:30
Faris Ansari	0626716f48	Merge pull request #9182 from pratu16x7/stock-entry-detail-global-fix [fix] sys_defaults global in stock entry detail	2017-06-09 16:27:07 +05:30
mbauskar	1042941348	[hotfix] fixes for mysql Lock wait timeout exceeded	2017-06-08 18:45:50 +05:30
pratu16x7	adb418d453	[fix] sys_defaults global in stock entry detail	2017-06-08 10:42:03 +05:30
Nabin Hait	2c808c578d	Merge branch 'master' into develop	2017-06-08 10:34:45 +05:30
tundebabzy	f3be8e0da6	removes check for condition - `status == "Submitted"` (#9176 )	2017-06-07 19:59:33 +05:30
Nabin Hait	a128b21baa	Fixed merge conflict	2017-06-07 12:17:17 +05:30
tundebabzy	99b734bfd7	Fix #4587 : Status does not display "Pending" in report filter (#9104 ) * adds Material Request to `status_map` * updates eval condition for Partially Ordered in Material Request map * changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options * adds more options to `validate_status` * adds `set_status` just before saving * adds `check_for_closed_status` in `before_cancel` * adds patch to convert status to material request specific status * adds stricter status update conditions * changes `update_status` to me `set_status` * adds checker such that draft status can only change to pending * renames `check_draft_status` to `status_can_change` * adds Cancelled to Material Request map * makes `status_can_change` block any attempt to change a cancelled document * adds more test cases * updates what `set_status` checks for before adding comment * adds patch to rename the present material request status	2017-06-07 12:02:07 +05:30
Makarand Bauskar	db8363e9eb	[minor] check serial no filedtype before updating (#9126 ) * Update serial_no.py Takes care of Different FieldTypes * [minor] check serial no filedtype before updating	2017-06-07 11:54:26 +05:30
Faris Ansari	5f27c94100	Merge pull request #9078 from netchampfaris/remove-globals Lint and fix JS files	2017-06-06 11:35:42 +05:30
Makarand Bauskar	c196d740e5	[minor] added filter for batch no field in purchase transaction (#9038 ) * [minor] added filter for batch no field in purchase transaction * [minor] filter the batch based on item_code instead of get_batch_no method * [minor] filter based on item_code for Purchase Invoice with update stock	2017-06-02 17:28:40 +05:30
Nabin Hait	02d282f347	Merge branch 'master' into develop	2017-06-01 19:09:37 +05:30
Faris Ansari	9f6d024260	Set website route field as No Copy field (#9106 ) * Set website route field as No Copy field * minor	2017-06-01 18:58:07 +05:30
tundebabzy	cf92be88b7	[minor] fixes typo (#9093 )	2017-05-31 13:21:12 +05:30
Nabin Hait	c9fa07b16d	Merge branch 'master' into develop	2017-05-30 15:59:04 +05:30
Manas Solanki	253c53cf53	updating serial no status from scheduler #9061 (#9066 )	2017-05-30 15:35:58 +05:30
Faris Ansari	ab74ca7fff	Lint and fix JS files	2017-05-30 12:54:42 +05:30
Nabin Hait	6a541a6f7a	Merge branch 'master' into develop	2017-05-26 21:35:42 +05:30
Sagar Vora	7b0c682635	[fix] add round off difference to last row in landed cost voucher (#8989 ) * [fix] add round off difference to last row in landed cost voucher * Add test case for odd numbers * Add assertEquals to verify applicable charges * Use make_purchase_receipt, move round off logic * Allow rounding difference * Specify cost center to pass test	2017-05-26 14:58:54 +05:30
Nabin Hait	c795386230	Fixed merge conflict	2017-05-24 18:39:16 +05:30
Manas Solanki	659a225f24	allow multiple items in purchase receipt (#8997 )	2017-05-24 17:49:52 +05:30
nick9822	ca150cee8c	Minor change: Alert to msgprint (#8966 ) * Minor change: Alert to msgprint * msgprint to frappe.msgprint	2017-05-24 17:22:26 +05:30
mbauskar	d1552f97e4	[minor] moved a comment in item.js	2017-05-24 17:13:16 +05:30
Nabin Hait	799a9cabe7	Can't change valuation method in stock settings, if there are transactions against some items which does not have it's own valuation method	2017-05-24 17:11:48 +05:30
Makarand Bauskar	3b9c2a4438	Added a reference of Sales Invoice in Serial No (#8855 ) * [enhance] added Sales Invoice reference in Serial Number * [patch] added test cases for Sales Invoice and added patch to copy sales invoice * [minor] minor fixes in validate_serial_against_delivery_note * [minor] fixes in sales invoice serial number validation	2017-05-23 18:45:34 +05:30
Nabin Hait	47afc55939	Merge branch 'master' of github.com:frappe/erpnext into hotfix	2017-05-19 14:10:53 +05:30
Rushabh Mehta	4bcc2316a9	Don't update variant when template is updated (#8922 ) * [fix] allow editing of variant properties, reverting earlier fix * [minor] dont automatically update variants when the template is saved	2017-05-19 12:33:00 +05:30
tundebabzy	a109141624	Issue 8842 (#8869 ) * adds test that confirms #8842 * fixes #8842 and adds tests * fixes new test case * adds test for `encode_company_abbr` * adds six as a requirement * fixes six.moves.range import * fixes duplicate company used in test * fresh commit of test * fixes failing test - company not saving * fixes failing test * Revert "adds six as a requirement" This reverts commit 80454d98dc5859c37dbf589a4152663d2d644906. * replaces whitespace indentation with tabs	2017-05-19 11:42:45 +05:30
Rushabh Mehta	c6d75eb942	[fix] allow editing of variant properties, reverting earlier fix (#8905 )	2017-05-18 16:21:01 +05:30
Nabin Hait	8fac2ad183	Don't set batch nos automatically on saving, if already set and validate qty with batch (#8887 )	2017-05-18 11:54:24 +05:30
Nabin Hait	4b544347a9	Hide 'Edit Posting Time' from printing (#8888 )	2017-05-17 19:42:38 +05:30
Sagar Vora	3b04b030eb	Fix cost center not getting pulled in DN and SINV (#8878 ) * Fixes for getting selling cost center instead of company's default cost center. * fix error in update_item	2017-05-17 19:16:27 +05:30
Nabin Hait	8a27cf3785	Fix status of invoices with negative outstanding, if no return entry (#8829 ) * Move allowance field in Item to the first section to apply it for both stock and non-stock items * Fix status of invoices with negative outstanding, if no return entry * get_value included in safe_eval	2017-05-16 12:43:00 +05:30
Makarand Bauskar	5886aafbae	[minor] removed cur_frm and added frappe.ui.form.on (#8803 )	2017-05-16 08:35:39 +05:30
Rushabh Mehta	939db36ad4	[fix] copy item variant values on save and make non no_copy fields as not editable. fixes frappe/erpnext#4253 (#8837 )	2017-05-16 07:42:44 +05:30
Prateeksha Singh	edeb4dc7e0	Multiselect dialog for getting items (#8583 ) * Concatenate docnames and send to mapper * Multiselect with checkboxes * set setters as separate filters * Map filter fields to target_doc * Get items from quotation (in SO) working * [major] Set dialog setters for all forms * Add date field * Specify non-default date_fields * [minor] add test_mapper.py * [minor] remove cur_frm * [minor][fix] test * [minor] fix test with make_test_records	2017-05-15 11:32:06 +05:30
Makarand Bauskar	e8270fe21c	[fix] minor fix in get_context for item variants (#8791 )	2017-05-12 11:23:23 +05:30
Makarand Bauskar	0e4c5c9efb	[minor] renamed a Total Margin field to Rate With Margin (#8720 ) * [minor] renamed a Total Margin field to Rate With Margin * [minor] minor fixes in field lable	2017-05-11 11:40:02 +05:30
Rushabh Mehta	95233a62d7	[minor] item route item_name + random string	2017-05-09 07:48:41 +05:30
Rushabh Mehta	a6bc583daf	[minor] item route is item name + code	2017-05-08 11:35:40 +05:30
Nabin Hait	3257aeeb55	Price list rate fix multiple uom and validation with prev doc (#8718 )	2017-05-06 12:47:14 +05:30
KanchanChauhan	ed56b8afd8	Website route for item based on name not item name (#8682 )	2017-05-05 11:56:55 +05:30
Nabin Hait	3ce41d6b1f	Fixed related to auto fetching batch nos and date valiation in salary structure (#8666 ) * Fixed related to auto fetching batch nos and date valiation in salary structure * Update get_item_details.py	2017-05-03 18:22:24 +05:30
Aditya Duggal	bd8c7d683b	Website related fields now consider show_variant_in_website field as well -Resolves issue #8635	2017-05-03 10:14:09 +05:30
akshay	b674d27285	Test Cleanup	2017-05-02 09:48:51 +05:30
akshay	949fbc559e	Serial No Rename	2017-05-02 09:48:51 +05:30
Nabin Hait	8c9fb76854	Remove pricing rules if 'Ignore Pricing Rule' manually triggered	2017-04-28 15:20:49 +05:30
mbauskar	1b6270ef40	[hotfix] error while sending the auto email report of Ordered Items To Be Delivered	2017-04-28 14:35:18 +05:30
Nabin Hait	7b04f092a6	Fixed test cases	2017-04-28 09:58:41 +05:30
Nabin Hait	b6a8920489	Fixed conflict	2017-04-28 09:58:41 +05:30
Nabin Hait	96c247c834	Pick batch autmatically only if batch found	2017-04-26 14:37:33 +05:30
sburanaw	66951e528f	Fix an import typo in get_item_details.py	2017-04-25 14:09:51 +05:30
Rushabh Mehta	c44910370b	[fix] is_sample_item	2017-04-24 10:28:38 +05:30
Rushabh Mehta	551406ab11	[enhance] automatic batch selection in Delivery Note and Stock Entry	2017-04-24 10:28:38 +05:30
Rushabh Mehta	e385b5b97b	[enhance] automatic batch creation, move and split	2017-04-24 10:28:38 +05:30
mbauskar	c3d642e5d1	[minor] allow bulk edit for doctype	2017-04-21 17:50:40 +05:30
Nabin Hait	68ae9f3f88	Merge branch 'develop' into allow_on_submit_fix	2017-04-19 21:10:23 +05:30
mbauskar	9e9d242a24	[minor] fixes in test cases and added the test case for multiple uom in selling	2017-04-19 21:05:37 +05:30
mbauskar	287fe81329	[minor] calculate price list rate based on items uom	2017-04-19 21:05:37 +05:30
Nabin Hait	eef55185fc	Update purchase_receipt_item.json	2017-04-19 20:58:09 +05:30
Nabin Hait	2de3bf7a0f	Fixed indexes on sales and purchase transactions	2017-04-19 20:58:09 +05:30
Nabin Hait	2704162f5a	Fixes allowd on submit	2017-04-19 16:25:39 +05:30
Rohit Waghchaure	dc981dc546	[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue	2017-04-17 17:31:32 +05:30
Javier Wong	54d9c9eaf4	Merge branch 'develop' into develop	2017-04-14 18:33:44 +08:00
Javier Wong	9b11d9b45d	[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"	2017-04-14 18:24:04 +08:00
mbauskar	cca55ddc33	[minor][hot] fixes for KeyError: from_date for stock balance report	2017-04-14 14:54:11 +05:30
CH	8e92250798	Correction of issue #8354	2017-04-13 18:59:51 +05:30
mbauskar	3ddfce4f17	[patch] move supplier_address to address_display and set supplier_address in SE	2017-04-13 16:46:41 +05:30
mbauskar	1b32d913a2	[minor] fetch supplier address, address_display on supplier trigger	2017-04-13 11:55:20 +05:30
Nabin Hait	2efe05c1ce	Merge pull request #8263 from frappe/revert-8126-issue8094 Revert "Add link field Package Code (fixes #8094)"	2017-04-12 19:50:43 +05:30
mbauskar	0b665ac791	[minor] don't throw error for buying transactions if price list is not selected	2017-04-11 18:51:12 +05:30
mbauskar	e0271a8331	[minor] ReferenceError:doc fixes for delivery note	2017-04-11 17:54:22 +05:30
mbauskar	236f7aac7f	[minor] track changes for transaction documents	2017-04-10 14:48:54 +05:30
Rushabh Mehta	9365641777	[added] frappe.safe_eval	2017-04-06 18:24:34 +05:30
Rushabh Mehta	9264313f0e	[fix] ordering for Edit Posting Time check	2017-04-05 12:49:01 +05:30
Rushabh Mehta	ffc807cd57	[minor] check below posting date in delivery note	2017-04-05 12:27:41 +05:30
Nabin Hait	c469f2c954	Get POS profile fix	2017-04-03 13:01:11 +05:30
Rushabh Mehta	f0b4562a95	[refactor] move purchase_common.js -> public/js/controllers/buying.js	2017-03-31 17:36:48 +05:30
Rushabh Mehta	cc8b2b2fdb	[fix] [refactor] demo for v8 and remove purchase common	2017-03-31 17:36:48 +05:30
Rushabh Mehta	9d9cb8b7b1	Revert "Add link field Package Code (fixes #8094 )"	2017-03-31 14:35:23 +05:30
Nabin Hait	620bde7144	Updated modified date to reload sales uom	2017-03-30 19:50:45 +05:30
mbauskar	90d82be966	[minor] make varient fixes in item.js	2017-03-30 15:36:46 +05:30
Nabin Hait	f912317fae	Stock Balance: Show records based on all child item groups if filters set based on group node	2017-03-29 18:08:10 +05:30
Nabin Hait	e2fef16d78	Made join_table query optional based on item group filter	2017-03-29 17:51:05 +05:30
Javier Wong	41bf1ba7b3	[enhancement] Stock Balance Report - Added Item Group Filter	2017-03-29 17:51:05 +05:30
Makis Etzoglou	82e6bc45e4	tax_id add to Sales Order, Delivery Note, and Sales Invoice	2017-03-29 17:39:08 +05:30
rohitwaghchaure	afa93c624b	[fix] Reserved qty is not calculating properly in BIN for multi sales UOM (#8203 )	2017-03-29 17:29:20 +05:30
Nabin Hait	79731360ed	Merge pull request #8126 from kickapoo/issue8094 Add link field Package Code (fixes #8094)	2017-03-28 20:48:39 +05:30
Stavros Anastasiadis	b9bbb3c3db	Add link field Package Code (fixes #8093 )	2017-03-28 16:09:52 +03:00
Neil Trini Lasrado	193c8919b9	Fixed issue with misleading error message on Stock Entry creation of Serialized Items	2017-03-28 17:43:23 +05:30
Nabin Hait	6c3eb36c35	Merge branch 'develop' into customs_tariff_number	2017-03-28 13:51:44 +05:30
Nabin Hait	77b2fef41e	Fixed test cases	2017-03-28 13:39:26 +05:30
Dominik Ottenbreit	fc9ed4da24	Add Customs Tariff Number	2017-03-24 15:53:03 +01:00
Dominik Ottenbreit	6eb202ef3a	fix patch after test, fix variant based on manufacturer, add json for item_manufacturer	2017-03-24 14:49:52 +01:00
Dominik Ottenbreit	3938c61996	migrate from manufacturer to manufacturer childtable	2017-03-24 14:24:34 +01:00
Rushabh Mehta	43583d6497	Update item.js	2017-03-21 17:49:53 +01:00
Rushabh Mehta	a07c43fd68	[feature] ability to have variants based on manufacturer	2017-03-21 17:48:34 +01:00
Rushabh Mehta	f340e19ea7	[minor] field re-arrangements in sales invoice, purchase invoice, stock reco	2017-03-15 15:12:43 +05:30
Nabin Hait	56f650f342	Merge branch 'master' into develop	2017-03-15 11:28:07 +05:30
Nabin Hait	ee7b4f2882	Merge pull request #8016 from rmehta/posting-date-option [feature] posting date, time is always current unless explicitly set	2017-03-15 11:22:04 +05:30
Rushabh Mehta	4f3da42b75	[fixes] for tests	2017-03-14 21:29:55 +05:30
Rushabh Mehta	131866a11a	[fixes] for tests	2017-03-14 21:06:15 +05:30
Rushabh Mehta	82c258948d	[fixes] for recurring and tests	2017-03-14 19:13:39 +05:30
Nabin Hait	3d731df7e3	Field order changed for 'Qty as per Stock UOM'	2017-03-14 17:24:57 +05:30
Rushabh Mehta	6b53792aea	[fix] posting date, time is always current unless explicitly set	2017-03-14 17:06:51 +05:30
Rohit Waghchaure	0169341917	[Fix] Item variants broken when using naming series for items and vriants of numeric value	2017-03-10 19:40:08 +05:30
Nabin Hait	f73a44aa8d	Update material_request.py	2017-03-09 10:57:00 +05:30
Rohit Waghchaure	02fb5880fe	[Fix] Material Request to Production Order not working	2017-03-08 18:38:12 +05:30
Nabin Hait	961bdc3743	Set new name in warehouse_name on rename of warehosue	2017-03-07 15:02:34 +05:30
Nabin Hait	b3ffd6b282	Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles Changed userrole to has role, commonify role editor of the user	2017-03-06 18:44:53 +05:30
Nabin Hait	fe876c0805	Test case fixed for multiple uom in selling	2017-03-06 16:41:13 +05:30
Nabin Hait	e68f32cf19	UOM Conversion in selling	2017-03-06 16:41:13 +05:30
Kanchan Chauhan	5a980ac87a	UOM Conversion in Selling	2017-03-06 16:41:12 +05:30
Rohit Waghchaure	e7485150a1	added roles in the report	2017-03-06 14:26:09 +05:30
Rohit Waghchaure	312498060f	changed doctype name userrole to has role	2017-03-06 14:24:39 +05:30
Nabin Hait	c642f76a4d	Fixed merge conflict	2017-02-27 14:40:53 +05:30
Rushabh Mehta	509543752c	[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request	2017-02-23 17:03:46 +05:30
Kanchan Chauhan	1d45a4312e	[Minor] Landed Cost Voucher test case fixed	2017-02-23 08:44:02 +05:30
Kanchan Chauhan	fe61c314b7	[Minor] Landed Cost Voucher test case fixed	2017-02-22 17:25:26 +05:30
Kanchan Chauhan	f2803ac427	[Fix] Throw error if item is added multiple time	2017-02-22 10:40:38 +05:30
Nabin Hait	cd837ecbac	Merge branch 'develop' into develop	2017-02-20 19:09:20 +05:30
Nabin Hait	589f4656ad	Merge branch 'develop' into in_global_search	2017-02-20 15:04:52 +05:30
Nabin Hait	9f4cb0c097	Fixed merge conflict	2017-02-20 15:00:04 +05:30
Nabin Hait	fd3ec066ce	Added fields in global search	2017-02-20 13:38:31 +05:30
Nabin Hait	e285258374	Merge pull request #7762 from mbauskar/hotfix [minor] timestamp fixes for heatmap	2017-02-17 15:18:01 +05:30
Rushabh Mehta	0c5375d0fa	[minor] item name not mandatory and item price with quick edit	2017-02-17 14:57:31 +05:30
mbauskar	e7b87ad071	[minor] timestamp fixes for heatmap	2017-02-16 16:05:46 +05:30
Nabin Hait	ea1cb68fe7	Merge branch 'master' into develop	2017-02-16 14:37:50 +05:30
Nabin Hait	3437a9a123	minor fix	2017-02-16 12:14:30 +05:30
Nabin Hait	2f7697d1bd	Merge pull request #7746 from pratu16x7/minor-search-presets Preset doctypes fields to Search	2017-02-15 18:46:03 +05:30
pratu16x7	349ed568ed	Add task and item	2017-02-15 09:23:26 +05:30
Kanchan Chauhan	79cd59303a	[Fix] Serial No Status	2017-02-14 12:49:36 +05:30
Nabin Hait	99dfa3060a	Check existing SO, PO and MR for disabling 'Is Stock Item' checkbox	2017-02-13 16:06:02 +05:30
Nabin Hait	89b6c47b2e	Merge pull request #7712 from rohitwaghchaure/minor_fix_item_valuation_method [Fix] Valuation method changing issue in the item	2017-02-13 15:42:22 +05:30
suyashphadtare	049a88cc40	[minor] Show item quantity in warehouse set query	2017-02-10 19:14:43 +05:30
KanchanChauhan	cc2c7649a8	[Minor] Stock Entry Fix (#7715 )	2017-02-10 17:47:49 +05:30
Nabin Hait	bdd470a6d1	Update item.py	2017-02-10 17:12:48 +05:30
Rohit Waghchaure	2f09dc0e62	[Fix] Valuation method changing issue in the item	2017-02-10 15:29:45 +05:30
Rushabh Mehta	e6aa3b435a	[minor] added make material request from Stock Entry and removed cur_frm	2017-02-09 17:47:22 +05:30
Nabin Hait	6ff0caa87a	Fixed merge conflict	2017-02-08 11:33:33 +05:30
Nabin Hait	70fd8546ce	Merge pull request #7677 from KanchanChauhan/serial-no-in-return [Fix] Serial No if is_return	2017-02-07 13:28:30 +05:30
Nabin Hait	0a6aaf4257	Get standard/historical valuation rate where missing: some minor fixes	2017-02-07 12:50:22 +05:30
Kanchan Chauhan	4f3b0aa249	[Fix]Serial No if is_return	2017-02-07 11:28:34 +05:30
Nabin Hait	ea8fab52c6	Get standard/historical valuation rate where missing, if item is not a sample item	2017-02-07 01:24:32 +05:30
Rushabh Mehta	6ede4a3809	[enhance] production order from sales order	2017-02-02 17:42:01 +05:30
Rushabh Mehta	3714626dd0	[minor] enhance BOM view	2017-02-01 18:35:53 +05:30
Rushabh Mehta	7ec4b717ed	[feature] added team updates page	2017-01-31 11:42:58 +05:30
Rushabh Mehta	063e86a1bf	[fix] remove on_update in Item	2017-01-27 16:16:08 +05:30
rohitwaghchaure	ab65f6d8b1	Merge pull request #7547 from mnatalia/develop Added translations to the web page and item dashboard.	2017-01-23 15:57:33 +05:30
Nabin Hait	349d520ae2	Fixed merge conflict	2017-01-20 15:44:35 +05:30
mnatalia	e09407571c	Added translations to the web page and item dashboard.	2017-01-20 12:00:25 +02:00
Nabin Hait	4c952f48f8	Some minor fixes	2017-01-20 15:15:31 +05:30
Nabin Hait	a0b967f2cd	Get valuation rate from Item while not found based on SLE	2017-01-20 12:50:40 +05:30
Rohit Waghchaure	a3a977d02a	[Fix] Minor issue in landed cost voucher	2017-01-19 18:38:53 +05:30
Kanchan Chauhan	03dc695c77	[Minor] Set website warehouse as default warehouse	2017-01-19 14:57:05 +05:30
Dhaifallah Alwadani	9eb830ac4f	fix string translation	2017-01-17 11:13:57 +05:30
Dhaifallah Alwadani	9375d1dfeb	fix string translation	2017-01-16 04:05:40 -08:00
Rushabh Mehta	6695830f3f	[fix] warehouse test cases	2017-01-16 16:57:53 +05:30
Rushabh Mehta	b92087cb2d	[cleanup] move contact, address to frappe 💥	2017-01-13 18:54:47 +05:30
Nabin Hait	b251cd4ccb	Fixed merge conflict	2017-01-13 14:34:54 +05:30
Nabin Hait	8f0c060578	Merge pull request #7447 from saurabh6790/tree_param_fix [fix] provision to handle custom mandatory params while creating node	2017-01-13 11:50:18 +05:30
Nabin Hait	007c87ea63	Merge pull request #7440 from nabinhait/gle_repost_optimization Optimization to reduce GLE reposting time for future stock transactions	2017-01-13 11:33:42 +05:30
Saurabh	2f02101d7d	[fix] provision to handle custom mandatory params while creating node	2017-01-11 12:41:01 +05:30
Nabin Hait	0287d31c0f	Fetch bin details after setting warehouse based on POS Profile	2017-01-11 10:31:45 +05:30
Nabin Hait	5dd988207f	Show values based on precision and filter out zero value rows	2017-01-10 16:10:40 +05:30
Nabin Hait	51d45d8bce	Fixed merge conflict	2017-01-10 12:32:01 +05:30
Nabin Hait	a7f616564e	Merge pull request #7417 from KanchanChauhan/quick-entry-for-item [Minor] Valuation rate in Quick entry for Item	2017-01-10 12:23:36 +05:30
Kanchan Chauhan	43e07aed2c	[Minor]Valuation rate in Quick entry for Item	2017-01-10 12:06:51 +05:30
Nabin Hait	6e9d2a3c1f	fixed conflict	2017-01-09 17:21:34 +05:30
Nabin Hait	d1eb237909	Merge pull request #7400 from rohitwaghchaure/minor_issue Get item default warehouse	2017-01-09 15:49:14 +05:30
nick9822	6f48d4be1c	whitelisted erpnext.stock.utils.get_stock_balance (#7402 ) whitelisted erpnext.stock.utils.get_stock_balance with respect to https://github.com/frappe/erpnext/issues/7364	2017-01-09 12:12:36 +05:30
Rushabh Mehta	8b133ac087	[minor] [tests] fix, tests will fail on the 5th of a month!	2017-01-06 17:21:04 +05:30
Rohit Waghchaure	6734c4ad5c	Get item default warehouse	2017-01-06 14:39:40 +05:30
Nabin Hait	91621639e8	Reload in_standard_filter property	2017-01-06 12:54:16 +05:30
Nabin Hait	8281b36a26	Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress Email ID renamed to Email Address	2017-01-04 15:46:48 +05:30
Nabin Hait	96562e3eb7	Merge pull request #7362 from rmehta/minor-fixes [minor] dont get warehouse in opening entry #7353	2017-01-04 15:42:23 +05:30
Kanchan Chauhan	b7cc393eb8	Email ID renamed to Email Address	2017-01-03 16:45:38 +05:30
Nabin Hait	9784d27317	Optimization to reduce GLE reposting time for future stock transactions	2016-12-30 16:21:35 +05:30
Rushabh Mehta	985cb8226d	[minor] dont get warehouse in opening entry #7353	2016-12-30 15:06:54 +05:30
Nabin Hait	e97d40806f	Merge branch 'master' into develop	2016-12-30 14:56:20 +05:30
Rushabh Mehta	a8326de4d0	[fix] on_update in item.py	2016-12-30 06:17:45 +05:30
Manas Solanki	5c82e9ef8b	Fetching the item details from the reference doctype in quality inspection Error Report [2016-12-29]	2016-12-29 18:01:25 +05:30
Nabin Hait	f327a58b7f	Merge branch 'master' into develop	2016-12-29 11:04:05 +05:30
Rushabh Mehta	94c4d7014d	[fix] item_name in stock reco	2016-12-28 06:56:09 +05:30
Nabin Hait	3bcf9b5e70	Fixed merge conflict	2016-12-27 14:30:17 +05:30
Rushabh Mehta	174c3478a1	[fix] item variants not directly shown in website due to route clash	2016-12-27 12:30:30 +05:30
Rushabh Mehta	512b85e040	[minor] replace autocomplete with awesomplete	2016-12-27 12:14:37 +05:30
Nabin Hait	88817b40df	Merge pull request #7284 from mntechnique/develop Report : Batch Item Expiry Status	2016-12-26 16:10:46 +05:30
Nabin Hait	7b2177a544	[test] Fixed test cases for LCV	2016-12-26 15:31:05 +05:30
Nabin Hait	61a190dd69	Merge branch 'master' into develop	2016-12-24 11:01:26 +05:30
Nabin Hait	1d90b41aea	[fix] Fetch serial nos on change of Warehouse	2016-12-24 10:42:23 +05:30
Nabin Hait	58291c77e9	Fixed version conflict	2016-12-23 17:43:42 +05:30
Nabin Hait	1e1e28b0ae	Update landed_cost_voucher.js	2016-12-23 15:48:57 +05:30
bhupen	a83de5eac1	applicabe charges field is now editable	2016-12-22 16:24:14 +05:30
bhupen	914ae77a22	Limit instead of Allowance in stock settings	2016-12-22 16:24:14 +05:30
bhupen	5bb85e7a95	partially orderd status will be shown in material request	2016-12-22 16:24:14 +05:30
Revant Nandgaonkar	1c00b1fb21	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2016-12-21 18:01:35 +05:30
Rushabh Mehta	0632ee3da9	Merge branch 'v7.2.0-beta' into develop	2016-12-21 17:31:09 +05:30
Rushabh Mehta	c6bd7ade2f	[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253	2016-12-21 17:30:29 +05:30
Revant Nandgaonkar	00e65cb70b	Report - Batch Item Expiry Status Changed column name `Expiry Status` to `Expiry (In Days)` Changed column type from Data to Int	2016-12-21 14:21:53 +05:30
Revant Nandgaonkar	0766d3e67e	Report : Batch Item Expiry Status Select From Date and To Date Lists Items about to expire or already expired Expiry Status column shows number of days in which item/batch will expire	2016-12-21 12:32:12 +05:30
Nabin Hait	f573d43b90	fixed version conflict	2016-12-20 11:40:15 +05:30
Rushabh Mehta	99c814b360	[fix] paging for products (support)	2016-12-19 11:55:10 +05:30
Rohit Waghchaure	6500ef404d	[Fix] Timeout error in item attribute validation	2016-12-16 13:35:50 +05:30
Rushabh Mehta	9277f3250d	[minor] partiall ordered in material request #6858	2016-12-16 12:36:50 +05:30
Nabin Hait	f02f1bb0c7	Added standard filters	2016-12-15 14:57:20 +05:30
Nabin Hait	201af80706	Fixed merge conflict	2016-12-13 14:30:32 +05:30
Nabin Hait	9a1a4cd0ac	Fixed test cases for item / warehouse renaming	2016-12-13 10:46:50 +05:30
Nabin Hait	da3a9e255d	Changed fieldtype of opening stock from Int to Float	2016-12-12 18:22:15 +05:30
Nabin Hait	f67799197d	Merge pull request #7189 from nabinhait/fix_10111 Rename and merging of Item and Warehouse	2016-12-12 17:27:38 +05:30
Nabin Hait	fb1fb83b8c	[tests] Test cases for Item and Warehouse renaming and merging	2016-12-12 17:01:24 +05:30
Nabin Hait	3ef63bef02	Rename and merging of Item and Warehouse and patch to fix deleted bins	2016-12-12 15:37:52 +05:30
Rohit Waghchaure	c858d52ce7	[Fix] Unable to purchase item in the company warehouse if dropship has enabled	2016-12-12 13:06:06 +05:30
Nabin Hait	58667ab123	Fixed merge conflict	2016-12-09 15:49:24 +05:30
Nabin Hait	ad4f1c7fd1	date is optional in get_exchange_rate	2016-12-09 12:14:47 +05:30
Nabin Hait	288a18e0cc	Fixes and patch for Currency Exchange based on date	2016-12-08 15:36:23 +05:30
Nabin Hait	1cc55fbbcb	Fixed merge conflict	2016-12-08 14:09:23 +05:30
Nabin Hait	ded059b253	[fix][tests] Fetching serial nos via get item details	2016-12-08 13:20:43 +05:30
Nabin Hait	5c18bd9b61	Fixed merge conflict	2016-12-06 16:16:58 +05:30
Rohit Waghchaure	36a01d3464	[Enhancement] Total row added for report builder	2016-12-05 18:59:59 +05:30
Nabin Hait	3f1c50a483	Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo [Fix] Fetch Serial No by default for Delivery Note Item	2016-12-05 16:51:42 +05:30
Nabin Hait	4306cc80d0	removed print	2016-12-05 16:51:30 +05:30
Rushabh Mehta	323c06ebbf	[minor] rename icons as per FontAwesome 4 (#7136 )	2016-12-05 14:17:26 +05:30
Kanchan Chauhan	af0d6378f1	[Fix] Fetch Serial No by default for Delivery Note Item	2016-12-02 18:18:04 +05:30
Nabin Hait	7f3da5dbb1	Fixed merge conflict	2016-11-28 14:23:51 +05:30
Nabin Hait	a78c463e97	Multiple minor fixes	2016-11-27 16:32:41 +05:30
Nabin Hait	d194cce35c	fixed merge conflict	2016-11-23 14:55:23 +05:30
Nabin Hait	b18ad55e2b	minor fixes	2016-11-23 14:51:30 +05:30
Nabin Hait	4059fb3961	delivery note dashboard fix for quality inspection	2016-11-23 11:45:19 +05:30
Nabin Hait	d855167b9b	Fixed merge conflict	2016-11-21 19:13:22 +05:30
Nabin Hait	075e33245e	Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636	2016-11-21 18:09:55 +05:30
Nabin Hait	c2f8dd71d7	Merge pull request #6965 from manassolanki/qa_redesign [Fix] [Enhancement] Quality Inspection	2016-11-21 14:49:18 +05:30
Manas Solanki	99dac07a56	[Fix] Minor fix for field rename	2016-11-18 12:52:34 +05:30
Rohit Waghchaure	e887e92dd4	Minor fix in delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item	2016-11-18 12:16:22 +05:30
Ignatius Cuknoris	6471057df4	fix bugs uom and conversion factor on stock entry	2016-11-17 10:31:19 +07:00
Nabin Hait	8af429da1f	Cleanup and fixes in quality inspection feature	2016-11-16 17:22:38 +05:30
Manas Solanki	55756d71b6	[Fix] Change of module of quality inspection	2016-11-16 17:22:38 +05:30
Manas Solanki	dbc2511a39	[Fix] Delivery Note fixed	2016-11-16 17:22:38 +05:30
Manas Solanki	a8d1bc7ff4	[Fix] Quality Inspection in Purchase Invoice fixed	2016-11-16 17:22:38 +05:30
Manas Solanki	c2cd3fd2c6	Function in parent transaction.js and call from corresponding files	2016-11-16 17:22:38 +05:30
Manas Solanki	cc90241fa5	Quality Inspection Issue 1. validate_inspection() function defination in stock_controller.py 2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py 3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no	2016-11-16 17:22:38 +05:30
Rushabh Mehta	4bfa0748cd	[merge] master	2016-11-16 11:28:23 +05:30
Shreyas Patil	99a3593a0d	[Fix] Make from_date and to_date for stock balance query report as mandatory fields (#6948 )	2016-11-16 11:16:44 +05:30
Saurabh	7fbc00c9d6	[fix] repost qty only for bin items	2016-11-09 16:10:42 +05:30
Rushabh Mehta	057db06216	[minor] enhancements to item dashboard, filter by item group and show item name fixes #6459	2016-11-08 12:40:10 +05:30
KanchanChauhan	6d5fcdec5a	Item Inspection before Delivery (#6823 )	2016-11-07 17:49:37 +05:30
Rushabh Mehta	13fc52d713	[minor] added default standard filters (#6854 )	2016-11-07 17:19:19 +05:30
robert schouten	8672f29c6f	[minor] add rate to stock entry detail grid (#6843 )	2016-11-07 17:17:12 +05:30
Nabin Hait	f5d8dd3b18	Fixed merge conflict	2016-11-04 16:54:53 +05:30
Nabin Hait	81f7a265bc	Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value Remember last selected value for link field	2016-11-04 16:13:49 +05:30
Nabin Hait	43d2fec78e	[fix] float division by zero	2016-11-04 10:58:30 +05:30
Rohit Waghchaure	0d2f7e62c0	set remember last selected value as true for company field	2016-11-03 16:19:34 +05:30
Nabin Hait	eab38cd4eb	Merge branch 'master' into develop	2016-11-03 15:17:39 +05:30
Nabin Hait	ceca7fbc87	Merge pull request #6780 from rohitwaghchaure/float_issue Change fieldtype from float to currency	2016-11-03 10:49:05 +05:30
Nabin Hait	57f51f648e	Merge pull request #6795 from manassolanki/report Report: Bin - Item Shortage Report -- Should have Item Name and descr…	2016-11-03 10:48:37 +05:30
Manas Solanki	5bc4784bad	Report: Bin - Item Shortage Report -- Should have Item Name and description #4946 New report is build including two new column Item name and item description	2016-11-01 18:07:12 +05:30
Nabin Hait	df01b5770b	Merge branch 'master' into develop	2016-11-01 17:44:43 +05:30
Nabin Hait	06fe0c7c9d	Merge pull request #6790 from neilLasrado/hotfix Hotfixes for demo	2016-11-01 17:40:03 +05:30
Nabin Hait	dec9f2558e	Update purchase_receipt.py	2016-11-01 17:24:46 +05:30
Neil Trini Lasrado	9dde085144	Fixes to demo	2016-11-01 17:05:43 +05:30
Rohit Waghchaure	60e5e4ac2d	change fieldtype from float to currency	2016-11-01 16:32:33 +05:30
Saurabh	0cf7f7aee0	[fix] set default value as empty frappe dict	2016-11-01 16:19:33 +05:30
Nabin Hait	f4068fd6f1	Fixed merge conflict	2016-11-01 15:06:55 +05:30
Nabin Hait	b9f708663c	Update item.py	2016-10-31 16:52:17 +05:30
Kanchan Chauhan	9100322462	[Fix] Serial No report fixed for Creation No link	2016-10-31 16:01:09 +05:30
Nabin Hait	d08ced14ca	Merge pull request #6751 from neilLasrado/develop Fixes to demo	2016-10-31 13:15:36 +05:30
Nabin Hait	eb1a55bbba	Update purchase_receipt.py	2016-10-29 14:49:33 +05:30
Nabin Hait	952c9cccfc	Merge pull request #6734 from KanchanChauhan/default-warehouse-in-item Default warehouse in Item master	2016-10-29 14:44:19 +05:30
Neil Trini Lasrado	71e3746a05	Fixes to demo	2016-10-28 18:59:33 +05:30
Kanchan Chauhan	4c22825f01	Default warehouse in Item master	2016-10-27 23:56:04 +05:30
Saurabh	468e41f24f	[enhance] introduce ignore_fields param for _tree and get_query	2016-10-27 15:23:19 +05:30
Nabin Hait	7f19a24e5e	Merge pull request #6705 from KanchanChauhan/get-serial-no Fetch serial no by default	2016-10-26 16:31:11 +05:30
Kanchan Chauhan	0a3f2c818a	Fetch serial no by default	2016-10-26 14:59:43 +05:30
Saurabh	8c3764a6ef	test case for scrap item	2016-10-24 13:55:36 +05:30
Saurabh	4ae4eb0eb9	added get_scrap_items param to get_bom_items_as_dict	2016-10-24 13:55:36 +05:30
Saurabh	5a2fa8aac7	[enhance] scrap management	2016-10-24 13:55:36 +05:30
Kanchan Chauhan	55106ab66b	Warehouse based on selected Company	2016-10-22 21:42:28 +05:30
Rohit Waghchaure	69be01aa1b	[Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer	2016-10-20 16:38:30 +05:30
Nabin Hait	0702fa2fc6	Fixed version conflict	2016-10-19 16:49:36 +05:30
Rohit Waghchaure	ac9172f6df	[Fix] total projected qty	2016-10-19 15:06:30 +05:30
Nabin Hait	fa1cdd5bf0	Fixed merge conflict	2016-10-18 15:37:33 +05:30
Rushabh Mehta	17f6874450	[minor] [fix] doctype_dasboard.py files, move data to get_data	2016-10-18 14:54:39 +05:30
KanchanChauhan	9cb69ca0e3	Posting Date cannot be future date (#6628 )	2016-10-17 16:40:16 +05:30
Saurabh	048ee48475	[fix] #6573 Material Request Required Date auto set (#6627 )	2016-10-17 16:24:20 +05:30
Nabin Hait	cd9c45f816	Fixed merge conflict	2016-10-07 16:53:07 +05:30
Rohit Waghchaure	022d87969d	[Fix] Issue in merging duplicate item	2016-10-07 13:40:45 +05:30
Saurabh	a2a25abfa5	[fix] warehouse account rename fix #6526	2016-10-06 18:20:53 +05:30
Nabin Hait	8db8a91d2e	Minor fixes	2016-10-05 13:11:19 +05:30
Kanchan Chauhan	f6f8ec68ad	Total and difference added for amount and qty	2016-10-05 13:11:19 +05:30
Nabin Hait	efa68fb6b8	Fixed version conflict	2016-10-04 17:27:02 +05:30
Nabin Hait	80de91776d	Merge pull request #6539 from rohitwaghchaure/stock_entry_grid_issue [Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record	2016-10-04 16:20:47 +05:30
Nabin Hait	cf87027422	Merge pull request #6537 from rohitwaghchaure/pos_multi_company_issue [Fix] Multi company issue for POS	2016-10-04 16:20:24 +05:30
Rohit Waghchaure	661db8ba71	[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record	2016-10-04 14:46:34 +05:30
Rohit Waghchaure	6f1d012b65	[Fix] Multi company issue for POS	2016-10-04 12:18:59 +05:30
Nabin Hait	5fd5a77750	Fixed version conflict	2016-10-03 14:13:50 +05:30
Rohit Waghchaure	74bf022273	[Fix] Purchase receipt title issue	2016-09-30 18:35:48 +05:30
Nabin Hait	80499bb657	Fixed merge conflict	2016-09-29 14:18:53 +05:30
Nabin Hait	b3bc41131e	Reposting of GLE and SLE for all stock transactions	2016-09-28 18:17:52 +05:30
Nabin Hait	443ac7bf30	Test case fix	2016-09-28 16:54:23 +05:30
Nabin Hait	706612bcd4	Fixed version conflict	2016-09-26 18:11:56 +05:30
Rohit Waghchaure	d728f5a429	[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288	2016-09-23 18:06:24 +05:30
Nabin Hait	6b4eb7f77f	Fixed version conflict	2016-09-23 12:16:31 +05:30
Nabin Hait	d03087d3ab	Patch fixed for legacy migration	2016-09-23 11:08:02 +05:30
Nabin Hait	0be6073f10	Fixed version conflict	2016-09-21 13:06:19 +05:30
Nabin Hait	a36325c6e5	Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix [fix] minor fix to accomodate custom fields in tree popup	2016-09-20 18:06:49 +05:30
Nabin Hait	429a38f90b	Merge pull request #6415 from rmehta/hotfix [minor] bring back old grid style in material request	2016-09-20 18:05:32 +05:30
Rushabh Mehta	57a1905576	[minor] bring back old grid style in material request	2016-09-20 17:22:54 +05:30
Nabin Hait	902bcc07b5	Merge pull request #6401 from rmehta/fix-lead-link [fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051	2016-09-19 19:22:34 +05:30
Saurabh	9aacf46c51	[fix] minor fix to accomodate custom fields in tree popup	2016-09-19 16:45:35 +05:30
Rushabh Mehta	5a58d8a11e	[minor] production order link in material request, fixes #6197	2016-09-19 15:33:46 +05:30
Chude Osiegbu	1f64f9897c	Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments.	2016-09-19 01:34:49 +01:00
Kanchan Chauhan	d1d129edf0	Actual Qty added to Material Request Item	2016-09-19 00:22:37 +05:30
Rushabh Mehta	39b5d39df6	[fix] remove campaign depends on	2016-09-16 15:55:34 +05:30
Rushabh Mehta	59dc0ece9f	[enhance] added Lead Source master, fixes #6231	2016-09-16 11:44:49 +05:30
Nabin Hait	d5ebd79ad7	Fixed version conflict	2016-09-14 15:50:22 +05:30
Nabin Hait	cd23530d24	Merge pull request #6324 from RobertSchouten/patch-24 stock entries from production_order dont fetch serial number of project	2016-09-12 18:35:13 +05:30
Nabin Hait	6c08f5caf9	Update stock_entry.py	2016-09-12 18:34:46 +05:30
Nabin Hait	0a7c0f4418	Merge pull request #6338 from RobertSchouten/report_names add customer and supplier names to some reports	2016-09-12 17:36:46 +05:30
pawan	af111e9c43	[fix] #6195	2016-09-12 15:16:23 +05:30
Nabin Hait	a36a88b6de	Remove Difference Account field from Stock Entry parent form	2016-09-12 13:15:59 +05:30
Nabin Hait	294664b24c	Merge pull request #6267 from PawanMeh/fixes_6254 [fix] #6254	2016-09-12 13:03:14 +05:30
Nabin Hait	9c82dd9157	Merge pull request #6332 from rmehta/item-group-paging [fix] paging for item group	2016-09-12 13:01:54 +05:30
robert schouten	4fc70d962b	add customer and supplier names to some reports	2016-09-12 15:23:51 +08:00
Rushabh Mehta	3aa315040f	[fix] paging for item group	2016-09-11 16:48:24 +05:30
RobertSchouten	b64fc33be1	stock entries from production_order dont fetch serial number of project	2016-09-09 11:08:39 +08:00
pawan	7b2bd20a09	[fix] #6254	2016-09-06 18:28:41 +05:30
Kanchan Chauhan	366ba04823	Barcode added to Stock Reconciliation	2016-09-06 12:44:57 +05:30
Rohit Waghchaure	cc1c7ad2df	added test cases	2016-09-05 00:43:17 +05:30
pawan	bd9a275d5f	[fix] #6254	2016-09-02 16:51:22 +05:30
Nabin Hait	15b26d8b1a	Fixed merge conflicts	2016-09-02 14:29:57 +05:30
Saurabh	ff910f4c72	[fixes] set filter for warehouse	2016-09-02 13:39:05 +05:30
RobertSchouten	ba4456b42b	dont run duplicate set status on submit	2016-08-30 08:21:20 +08:00
Kanchan Chauhan	dd96cbd012	Coded column deleted, column added from UI	2016-08-26 14:32:38 +05:30
Nabin Hait	3b6dc141c6	[fix] Repost only distinct purchase receipts and invoices	2016-08-19 16:39:50 +05:30
Nabin Hait	e68b089187	Query for warehouse in delivery note	2016-08-18 16:14:23 +05:30
Nabin Hait	40c60b6182	Default material request type field restored	2016-08-17 16:14:24 +05:30
Rushabh Mehta	d973c1606a	[revert] is_sales_item, is_purchase_item back	2016-08-16 11:32:08 +05:30
Rushabh Mehta	730f3e7aba	[minor] remove validation #4904	2016-08-11 17:17:26 +05:30
Nabin Hait	764e6ef210	default material request type field restored in item	2016-08-03 17:32:26 +05:30
Rushabh Mehta	06c92a782a	[fix] small text for route	2016-08-03 16:27:11 +05:30
Rohit Waghchaure	08aadb853c	PPT looks at default MR type in Item to set MR type.	2016-08-02 16:59:03 +05:30
Rushabh Mehta	180e43585f	[minor] formatter for item and employee	2016-07-29 18:52:00 +05:30
Nabin Hait	7590b8fff1	minor fix for stock ledger entry	2016-07-27 16:44:26 +05:30
Saurabh	3642f987c7	[fix] report filter fix	2016-07-27 11:42:50 +05:30
Rushabh Mehta	6c3ac9587e	[fix] quick entry	2016-07-25 15:03:39 +05:30
Rushabh Mehta	29517d0b8c	[fix] purchase order dashboard	2016-07-22 21:01:39 +05:30
Nabin Hait	db4aca3eaf	Merge pull request #5823 from nabinhait/fix_107 Update opening stock on creation if item, only if it is non-serialized and does maintain batch	2016-07-22 13:17:26 +05:30
Nabin Hait	0953aeb731	Merge branch 'master' into develop	2016-07-22 13:15:53 +05:30
Nabin Hait	767cf99435	Update opening stock on creation if item, only if it is non-serialized and does maintain batch	2016-07-21 18:46:09 +05:30
Rohit Waghchaure	47c64ec728	[Fix] Stock entry differnce amount issue.	2016-07-21 12:24:12 +05:30
Nabin Hait	89d0b1b9a5	Merge pull request #5804 from nabinhait/demo1 Demo data for fixed asset depreciation	2016-07-21 10:05:00 +05:30
Rushabh Mehta	5a39d41a0c	[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792	2016-07-20 22:53:23 +05:30
Nabin Hait	3edefb19b9	Demo data for fixed asset depreciation	2016-07-20 16:14:30 +05:30
Rushabh Mehta	649e2538e5	[fix] merge conflict?	2016-07-20 15:30:17 +05:30
Nabin Hait	9d93ad92bc	minor fixes	2016-07-20 11:28:50 +05:30
Rushabh Mehta	636acc2565	[minor] run stock reco in background if more than 100 items, fixes #4904	2016-07-19 17:14:48 +05:30
Rushabh Mehta	76b134192f	[fix] grid columns now restricted to 10	2016-07-18 14:30:27 +05:30
Nabin Hait	37dd714e6c	Is Stock Item checkbox visibility	2016-07-16 11:00:29 +05:30
Rushabh Mehta	95383bb281	[fix] item attribute validation and tests	2016-07-15 15:12:06 +05:30
Rushabh Mehta	b8bdfbcead	[minor] optimize item attribute validation for #5756	2016-07-15 12:41:08 +05:30
Rushabh Mehta	176b63b354	[fix] remove first row on mapping, fixes #5707	2016-07-14 17:43:48 +05:30
Rushabh Mehta	62fcaa7900	Merge pull request #5758 from saurabh6790/is_group_fixes [fix] alter fieldtype for is_group from select to check	2016-07-14 16:57:01 +05:30
Rushabh Mehta	528e145a54	[docs] fixes #5697	2016-07-14 17:00:05 +05:30
Rushabh Mehta	92d1b8cc6d	[fix] [demo] permissions for accounting	2016-07-14 16:18:20 +05:30
Saurabh	6bc7b892c4	[fix] alter fieldtype for is_group from select to check	2016-07-14 14:06:28 +05:30
Rushabh Mehta	29b80b2233	Merge pull request #5701 from saurabh6790/item_reorder [fix] fix get query for sub warehouse in reorder level table	2016-07-11 17:14:50 +05:30
Rushabh Mehta	3ce24d64c2	[cleanup] payment entry form view	2016-07-11 16:08:46 +05:30
Saurabh	7151f91862	[fix] fix get query for sub warehouse in reorder level table	2016-07-11 13:19:06 +05:30
Rushabh Mehta	391c0efcee	[fix] make grids editable	2016-07-11 13:01:58 +05:30
Rushabh Mehta	cca33b2ff0	[cleanup]	2016-07-11 13:01:58 +05:30
Rushabh Mehta	ea0ff23891	[cleanup] form dashboards	2016-07-07 14:28:05 +05:30
Rushabh Mehta	964ad0fcae	[cleanup] rename "links" to "dashboard"	2016-07-07 14:28:05 +05:30
Nabin Hait	b71a14ceca	minor fix	2016-07-06 23:38:05 +05:30
Nabin Hait	e417000bbb	Fetch Fixed Asset property from item in Sales / Purchase Invoice	2016-07-06 23:38:05 +05:30
Nabin Hait	abd6c5debb	Fixed asset item property and validations	2016-07-06 23:38:04 +05:30
Nabin Hait	2dec0db3bd	Is Fixed Asset and Asset Category field added in Item	2016-07-06 23:38:04 +05:30
Nabin Hait	df2200b417	Added Valuation Rate field in Item for opening stock	2016-07-06 16:05:15 +05:30
Nabin Hait	4671038211	Item Name added in Stock Reconciliation	2016-07-06 16:05:15 +05:30
Nabin Hait	5f82a5387d	Query for warehouse and editable fields in grid	2016-07-06 15:35:23 +05:30
Rohit Waghchaure	a71d9d33af	Rename prevdoc field in purchase order and purchase receipt doctype	2016-07-06 12:13:29 +05:30
Nabin Hait	7f3938b19f	Warehouse patch fix	2016-07-04 18:12:08 +05:30
Rushabh Mehta	e38872294a	[fix] [patch]	2016-07-04 17:34:25 +05:30
Rushabh Mehta	1d797f717b	[fix] warehouse validation for parent_account	2016-07-04 17:07:08 +05:30
Rushabh Mehta	b33df4afe8	[cleanup] link methods made common	2016-07-04 11:39:25 +05:30
Rushabh Mehta	5f5f0bec2c	[fix] buttons for rfq and material request	2016-07-04 11:39:25 +05:30
Rushabh Mehta	8c2e79cf0d	[minor] fixes	2016-07-04 11:39:25 +05:30
Rushabh Mehta	6703792472	Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes [Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI	2016-07-04 10:59:11 +05:30
Rushabh Mehta	2be94f7675	Merge pull request #5615 from rohitwaghchaure/v7_rfq_fixes [RFQ Enhancement] Added button on supplier row to download PDF for particular supplier	2016-07-04 10:58:33 +05:30
Saurabh	b35906efc1	[fix] load dependancies on page load event	2016-07-02 17:13:11 +05:30
Saurabh	feefaaf1ee	[fix] Stock Analytics Report page fix	2016-07-01 18:15:17 +05:30
Rohit Waghchaure	4d8f4d76e1	[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI	2016-07-01 15:33:57 +05:30
Rohit Waghchaure	fc1fa9a774	[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier	2016-07-01 14:53:11 +05:30
Saurabh	1301b3b3d1	[fix] set default value for is_group to 0	2016-06-29 19:48:44 +05:30
Saurabh	b8a57a4b4d	[fix] wareehouse nestedset fix if company not associated with warehouse	2016-06-29 19:01:49 +05:30
Saurabh	d7d878b6db	[fix] label fix	2016-06-29 18:48:20 +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
Neil Trini Lasrado	b7ff027937	Added Safety Stock to Item Master	2016-06-27 17:45:08 +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
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	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	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	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
Nabin Hait	c65f160776	[fix] Identify account group for warehouse based on account type	2016-06-26 08:25:51 +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
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
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	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	ac53357f53	[fixes] renamed _treeview to _tree	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	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	a334062b03	[redesign] website routing system	2016-06-24 16:18:07 +05:30
Nabin Hait	2effad33d0	Merge branch 'master' into develop	2016-06-24 12:48:24 +05:30
Nabin Hait	6dfc78b12a	Item Valuation Rate in case of negative inventory	2016-06-24 12:28:55 +05:30
bcornwellmott	813dddeb10	Fix Percent Billed to show Percentage Previously was showing Currency	2016-06-22 14:49:31 -07:00
Rushabh Mehta	b5f2c78f8f	[list] reports for item list	2016-06-15 12:57:22 +05:30
Rushabh Mehta	d1eba515e9	[cleanup] fixes to v7	2016-06-13 17:47:13 +05:30
Rushabh Mehta	538607e6b6	[cleanup] a better message for insufficient stock	2016-06-12 11:03:00 +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	e9d2c3d46e	[fix] report requested items to be transferred, fixes #5295	2016-06-08 16:41:09 +05:30
Anand Doshi	16e2442278	[cleanup] document flow	2016-06-07 18:55:23 +05:30
Saurabh	7d0e78d399	[fixes] this.frm instead of cur_frm	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
Rushabh Mehta	aed79e993f	[fix] item attribute validation, fixes #5308	2016-06-02 17:49:16 +05:30
Rushabh Mehta	675f9c6e6e	[minor] reset barcode if item is changed, fixes #5314	2016-06-02 16:34:00 +05:30
Rushabh Mehta	0dcb861b56	[minor]	2016-05-31 07:22:51 +05:30
Rushabh Mehta	bc92824bc4	[minor] rename item_name if same as item, on rename and removed item selector	2016-05-31 07:22:51 +05:30
Nabin Hait	591a5aba56	Added Project in GL Entry and General Ledger report	2016-05-26 17:51:20 +05:30
Nabin Hait	79ddf67289	Merge pull request #5362 from nabinhait/budget Budgeting	2016-05-23 17:56:42 +05:30
Rohit Waghchaure	bc894428ca	Added today as default in transaction.	2016-05-23 15:22:36 +05:30
Nabin Hait	832988e2fd	test case fixed	2016-05-23 13:04:26 +05:30
Nabin Hait	3956c94bbb	Merge pull request #5340 from rohitwaghchaure/support_week_new [Fix] Sales Invoice shows default date while no default mentioned	2016-05-20 12:06:22 +05:30
Rushabh Mehta	532eedf411	[enhance] more editable grids	2016-05-19 18:22:49 +05:30
Rushabh Mehta	35047ac283	[ux] direct editing in material request	2016-05-18 18:17:38 +05:30
Rohit Waghchaure	5d97d89a03	[Fix] Sales Invoice shows default date while no default mentioned	2016-05-17 15:13:17 +05:30
Rushabh Mehta	3a87c479c7	Merge pull request #5346 from umairsy/domains Domainifying	2016-05-16 12:02:51 +05:30
Umair Sayyed	99f7528578	domanifying ERPNext via #5334	2016-05-13 18:06:17 +05:30
Rohit Waghchaure	8904730cd4	[Fix] Removed is_pro_applicable	2016-05-12 18:03:08 +05:30
Rushabh Mehta	4b9238a03b	[cleanup] homepage	2016-05-12 15:23:17 +05:30
Nabin Hait	b81ed45b2b	fixed conflict	2016-05-11 12:52:31 +05:30
Nabin Hait	1997350364	[fix] Divisional loss in purchase receipt	2016-05-11 12:06:29 +05:30
Nabin Hait	a9c4c8fc31	In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate	2016-05-09 17:34:47 +05:30
Nabin Hait	332d29f166	Merge branch 'master' into develop	2016-05-06 16:13:35 +05:30
Nabin Hait	e67c1cdf12	[fix] In purchase return entry, consider outgoing rate for serialized items	2016-05-06 15:46:31 +05:30
Rushabh Mehta	c711b82889	Merge pull request #5296 from KanchanChauhan/websitemakeover New look to the website	2016-05-02 15:54:41 +05:30
Kanchan Chauhan	239b351367	New look to the website	2016-05-02 11:43:44 +05:30
Rushabh Mehta	be2ee18de4	[fixed] frappe.require is now async 💥	2016-04-29 17:22:42 +05:30
Rushabh Mehta	1aa1c8a9ef	[minor] remove hide_first in forms	2016-04-29 12:20:23 +05:30
Nabin Hait	6146cc1e33	Merge branch 'master' into develop	2016-04-29 11:44:55 +05:30
Nabin Hait	761a7a8e7c	[fix] On rename update item code in item_wise_tax_detail json in tax table	2016-04-28 17:33:49 +05:30
Rushabh Mehta	5dfe20ce17	[fix] frappe.require in stock_entry.js	2016-04-26 12:59:08 +05:30
Rushabh Mehta	3d2622ce91	[refacator] added dashboard in item	2016-04-25 17:53:42 +05:30
Rushabh Mehta	0fa7b7c4f2	[test] [fix] default cost_center	2016-04-23 11:11:10 +05:30
Rushabh Mehta	0394aec6a4	[wip] inventory tool	2016-04-22 17:22:22 +05:30
Rushabh Mehta	68d428bfd4	[fix] for sort selector	2016-04-22 13:23:34 +05:30
Rushabh Mehta	621283c5c5	[enhancement] stock balance page	2016-04-21 19:00:34 +05:30
Rushabh Mehta	202cb7cdf1	Merge pull request #5249 from nabinhait/fixed_asset Fixed asset	2016-04-21 11:41:11 +05:30
Rushabh Mehta	c291ab64a6	Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext [WIP] No not merge	2016-04-21 11:39:45 +05:30
Rushabh Mehta	02772442b6	[cleanup] added dashboard in project	2016-04-20 18:45:56 +05:30
Nabin Hait	3d9c5c0c20	Fixed Asset module cleanup and fixes	2016-04-20 17:57:11 +05:30
Kanchan Chauhan	11638ba358	Changes 3	2016-04-20 16:24:25 +05:30
Kanchan Chauhan	704f248952	Changes 2	2016-04-20 16:24:24 +05:30
Rushabh Mehta	0525387328	[enhancement] added reserved_qty_for_production in bin and updated item dashboard	2016-04-18 19:27:46 +05:30
Nabin Hait	c46c1f0288	[fix] Rejected serial nos in purchase invoice	2016-04-18 17:46:36 +05:30
Nabin Hait	14aa9c5320	[fix] Cleanup and fixes in update stock feature in Purchase Invoice	2016-04-18 16:59:47 +05:30
Saurabh	7fee1b8343	[fixes] set expence account to item on sales invoice	2016-04-18 15:58:43 +05:30
Saurabh	224737b9ed	[fixes] split make gl entry function into chuncks as per SI	2016-04-18 15:58:43 +05:30
Saurabh	fbb342c1ac	[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI	2016-04-18 15:58:43 +05:30
Saurabh	130c57b201	[fixes] code clean-up	2016-04-18 15:58:43 +05:30
Saurabh	e29248bcb3	[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning	2016-04-18 15:58:43 +05:30
Saurabh	4bd34a58ba	[fixes] fix perpetual inventory	2016-04-18 15:57:55 +05:30
Rushabh Mehta	17d52becdf	[typo]	2016-04-15 16:51:33 +05:30
Rushabh Mehta	86a824c767	[ux] added opening stock and rate in new Item	2016-04-15 16:44:44 +05:30
Rushabh Mehta	e8e9440b06	[fix] [tests]	2016-04-15 15:19:35 +05:30
Rushabh Mehta	be2dde468d	[enhance] set material request title as comma separated list of items	2016-04-15 15:11:06 +05:30
Rushabh Mehta	a305c29b0e	[cleanup] remove is_pro_applicable	2016-04-15 15:03:16 +05:30
Rushabh Mehta	dd9a973a0b	Merge pull request #5216 from umairsy/is-sales-purchase Removed Is Sales Item and Is Purchase Item	2016-04-15 14:12:14 +05:30
Rushabh Mehta	f4c25b13e2	[fix] update total_projected_qty in bin.py	2016-04-15 13:01:09 +05:30
Umair Sayyed	72534deea2	removed Is Sales Item and Is Purchase Item	2016-04-15 12:57:00 +05:30
Nabin Hait	972c25f78d	Fixed conflict	2016-04-14 18:25:53 +05:30
Rushabh Mehta	15a7f215b9	[enhancement] heatmaps on item and notifications for item	2016-04-14 17:30:53 +05:30
Umair Sayyed	6269f1e3d0	address and contact related fields re-arranged in the sales transactions fixes #5192	2016-04-14 13:07:41 +05:30
Rushabh Mehta	0e2dd859b0	[cleanup] link dashboard for customer, supplier, item, employee and hide form by default	2016-04-13 17:22:09 +05:30
Nabin Hait	4b09f48d94	Merge pull request #5195 from nabinhait/stock_non_stock_item_toggle Dont allow to toggle stock and non-stock settings if any transaction exists against the item	2016-04-13 11:40:45 +05:30
Rushabh Mehta	8bbca6fa2e	[enhancement] links menu in customer, supplier, item	2016-04-12 19:16:33 +05:30
Nabin Hait	dd94d4e43d	Dont allow to toggle stock and non-stock settings if any transaction exists against the item	2016-04-12 19:00:50 +05:30
Nabin Hait	32b2a7795e	[fix] Set actual qty onload of the draft stock entry. Fixed #5172	2016-04-11 15:14:05 +05:30
Rushabh Mehta	203cc962f5	[enhancement] Item Selector	2016-04-08 17:21:00 +05:30
shreyas	ffeacb299d	[Fix] Show a message while user tries to create Material request with BOM which contains only non-stock item	2016-04-08 16:32:19 +05:30
shreyas	b94b94afd9	[Fix] Move company field to top of the Stock Entry form	2016-04-07 16:25:29 +05:30
Rushabh Mehta	78b7a53635	[cleanup] set default bold, print_hide for prints	2016-04-06 15:29:45 +05:30
Rushabh Mehta	d690094b12	[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM	2016-04-04 16:57:56 +05:30
Nabin Hait	4f10f15686	[fix] Modified date changed in query report due to project field renaming	2016-04-01 17:59:06 +05:30
Rushabh Mehta	45c6b550f0	[cleanup] assets and made items mandatory in transactions	2016-03-31 15:37:51 +05:30
Nabin Hait	1d04a23a00	Merge pull request #5082 from umairsy/perm-issue-2 [Fix] changed permission for the Stock Ledger Entry	2016-03-31 11:54:28 +05:30
Rushabh Mehta	72b4ad8155	[cleanup] for quick-entry	2016-03-30 15:42:22 +05:30
Rushabh Mehta	3fc6fdeba0	[cleanup] for quick-entry	2016-03-30 13:18:30 +05:30
Rushabh Mehta	652dee45a6	[minor] make margin collapsible	2016-03-29 16:42:13 +05:30
Umair Sayyed	6481ab23ce	[Fix] changed permission for stock ledger entry	2016-03-29 13:35:46 +05:30
Nabin Hait	4fdb05228d	fixed asset depreciation	2016-03-29 11:54:37 +05:30
Nabin Hait	3a15c92c5e	Fixed Asset Depreciation first commit	2016-03-29 11:54:37 +05:30
Rushabh Mehta	3117b4b8d6	[fix] minor for quick-entry	2016-03-29 11:53:17 +05:30
Rushabh Mehta	e1b20a0b29	Merge pull request #5044 from rohitwaghchaure/add_margin_feature [Enhancement] Add margin in sales flow.	2016-03-28 18:27:05 +05:30
rohitwaghchaure	a1064a6149	[enhancement] request for quotation	2016-03-28 17:28:45 +05:30
rohitwaghchaure	6d1b5d618a	[enhancement] request for quotation	2016-03-28 12:13:07 +05:30
rohitwaghchaure	44d0449895	[enhancement] request for quotation	2016-03-28 12:13:07 +05:30
Rushabh Mehta	c20c536f28	[fix] [wip] cleanup for collaborative pm	2016-03-25 17:22:17 +05:30
mbauskar	a52472cf5b	[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py	2016-03-24 14:07:51 +05:30
mbauskar	b6d19bcfc2	[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item	2016-03-24 14:07:50 +05:30
mbauskar	6f60339e75	[fix] total margin calculations	2016-03-24 14:07:50 +05:30
mbauskar	b8b56f127f	fetched the markup type and rate of selected item	2016-03-24 14:07:49 +05:30
Rushabh Mehta	b2269dd326	[fix] back links from project web view	2016-03-23 18:29:00 +05:30
Rushabh Mehta	17da0b8f8b	Merge pull request #5035 from rmehta/warehouse-buttons [enhancement] [minor] stock ledger, general ledger buttons in warehouse	2016-03-23 11:50:30 +05:30
Rushabh Mehta	3cc9b3ef08	[enhancement] [minor] stock ledger, general ledger buttons in warehouse	2016-03-22 16:18:01 +05:30
Neil Trini Lasrado	11dafa27ba	Added Project to materail request	2016-03-21 12:40:42 +05:30
Nabin Hait	9a75530c26	[fix] reload doctype for renaming project	2016-03-18 16:19:25 +05:30
Nabin Hait	4e78cee1c2	Merge pull request #4959 from ShashaQin/patch-37 Improvements about Item Prices Report	2016-03-17 18:13:09 +05:30
Nabin Hait	6221117069	[fix] shipping address position in document	2016-03-16 16:23:30 +05:30
Saurabh	14d646f636	[fixes] shipping address on purchase flow	2016-03-16 16:23:30 +05:30
Neil Trini Lasrado	f433a5a124	Fixed bug while selecting project in sales_invoice, sales_order, delivery_note	2016-03-16 16:00:27 +05:30
ShashaQin	769b01e07a	Update item_prices.py	2016-03-16 16:37:28 +08:00
Neil Trini Lasrado	6e343e23d9	Renamed project_name to project	2016-03-15 17:50:53 +05:30
rohitwaghchaure	986616f8ee	[fixes]draft BOM showing in Material Request	2016-03-14 19:33:30 +05:30
Nabin Hait	b1f0a7d52e	Merge pull request #4876 from saurabh6790/valuation_rate_on_so [enhancement] get valuation rate and gross profit on sales order item	2016-03-14 19:18:58 +05:30
Nabin Hait	d1f85c4fe6	[fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000	2016-03-14 14:59:21 +05:30
Valmik Jangla	13bb2ba779	Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance	2016-03-11 13:07:49 +05:30
Valmik Jangla	063946a02f	Removed from Purchase Invoice and Purchase Reciept	2016-03-11 13:07:48 +05:30
Valmik Jangla	d89dcf60e6	Removed from Delivery Note and Appraisal Added back in Stock Ledger Entry Added validation in GL Entry and SL Entry Stock Controller sets Fiscal Year using Posting Date	2016-03-11 13:07:48 +05:30
Valmik Jangla	d4ac3d8ceb	Removed from Stock Ledger Entry and Sales Invoice	2016-03-11 13:07:48 +05:30

... 21 22 23 24 25 ...

3862 Commits