3096 Commits

Author	SHA1	Message	Date
Ranjith Kurungadam	e51c175aca	Fix tests (#14991) ... * minor improv in fetching account * pass name field while creating tds doc * create tds fixture after creating tds account * Inpatient Record - Test - Fix * fix batch query	2018-07-24 11:07:28 +05:30
Nabin Hait	0c0c345678	Added index on SLE based on batch_no, item and warehouse	2018-07-23 14:38:50 +05:30
yimesgen	20a80fee45	Update batch.py (#14905) ... * Update batch.py Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and". * Update batch.py	2018-07-23 14:36:50 +05:30
rohitwaghchaure	6b862fcae5	[Fix] Rounded total is not working in the purchase receipt (#14984)	2018-07-23 13:02:07 +05:30
Zarrar	a22e0d0c99	return empty if no stock ledger entry found (#14968)	2018-07-23 11:31:04 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874) ... * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
Shreya Shah	663b435919	Update modified time to fix patch (#14931)	2018-07-17 16:47:18 +05:30
Saurabh	e78a877202	patch fixes (#14936)	2018-07-17 16:38:11 +05:30
Shreya Shah	ffd2254944	Make item defaults non-collapsible (#14908)	2018-07-16 14:55:54 +05:30
rohitwaghchaure	526ab2ca30	[enhance] Allow transfer for manufacture in the BOM (#14891) ... * [enhance] Allow transfer for maufacture in the BOM * Added patch * Fix codacy * Fixed typo and added test cases	2018-07-15 20:04:41 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
rohitwaghchaure	2d84945839	[Fix] Stock reconciliation wrong difference amount calculation (#14893)	2018-07-13 11:07:27 +05:30
Zarrar	9a3b785a03	[Minor] Employee Separation Fix (#14867) ... * delete associated task & project forcefully in Employee Seapration cancel trigger * remove leftover print statement * remove console statements	2018-07-11 14:34:55 +05:30
rohitwaghchaure	07d0e9a2b2	Don't show disabled items in the stock balance report (#14851)	2018-07-09 16:56:41 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
rohitwaghchaure	3f5e80ebe3	Allow bulk edit for the sales invoice item (#14826)	2018-07-06 12:39:04 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631) ... * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
rohitwaghchaure	82a9fde921	Added compact print option for the material request (#14799)	2018-07-06 10:40:51 +05:30
Zarrar	dfe897b888	[ Fix ] UOM Conversion fix (#14768) ... * increase precision for conversion value * inverse the conversion data * update uom data * rectify conversion logic according to inversion of values * rectify test case for uom conversion * patch improv to correct conversion data	2018-07-01 16:45:53 +05:30
rohitwaghchaure	1501a6e58e	[Fix] Data missing issue in stock ledger report (#14755)	2018-07-01 16:42:00 +05:30
Cadmandata	d673afccf2	Updated comment in make_stock_entry() function (#14726) ... Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.	2018-06-28 23:05:32 +05:30
rohitwaghchaure	cae945e743	Added validation and fixes UX for asset (#14727)	2018-06-28 23:04:25 +05:30
Nabin Hait	e2a8120ef8	ignore user permissions for some fields	2018-06-26 15:27:34 +05:30
rohitwaghchaure	d3fb0fbb20	Added test cases for asset accounting, asset value adjustment (#14572) ... * Added test cases for asset accounting, asset value adjustment * Accounting entry for the asset created manually * Added asset movement test cases and validation * Added validation to make asset from purchase receupt, invoice only	2018-06-22 15:40:59 +05:30
Sachin Mane	19a5a5dcf4	improve performance of stock_value retrieval using tabBin instead of … (#14584) ... * improve performance of stock_value retrieval using tabBin instead of stock ledger * rename fn * rename fn * Update warehouse.py	2018-06-21 13:01:48 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604) ... * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
Nabin Hait	3946b77555	changed fieldname of inventory section break in Item	2018-06-20 22:33:34 +05:30
Bassam Ramadan	45725c2c7b	add missing brand filter to stock balance report (#14597) ... add missing brand filter to stock balance report	2018-06-20 17:41:29 +05:30
Shreya Shah	5c3929c5ea	Fix positioning of fields (#14562)	2018-06-18 15:49:59 +05:30
Shreya Shah	1ac5585151	Bug - Add batch while creating serial nos (#14559)	2018-06-18 15:44:10 +05:30
rohitwaghchaure	77a45b43aa	Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535)	2018-06-15 18:03:31 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
Nabin Hait	2737b08f0f	blanket order related fixes	2018-06-14 18:07:34 +05:30
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