1673 Commits

Author	SHA1	Message	Date
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
deepeshgarg007	867ca63750	fix: Purchase order item description fix	2019-02-14 18:10:47 +05:30
Deepesh Garg	4d1bc0ca85	fix: Add total row in analytics report (#16648)	2019-02-13 16:58:46 +05:30
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Sagar Vora	e9778d9556	fix: do not use built-in "input", reload_doc	2019-01-23 17:13:31 +05:30
Sagar Vora	f51661b225	fix: allow operators, make weighting_function mandatory	2019-01-23 16:42:28 +05:30
Sagar Vora	9aeabce3d3	fix: trailing whitespace, duplication & more	2019-01-23 16:01:19 +05:30
Sagar Vora	57d7c837aa	fix: supplier scorecard test	2019-01-23 14:26:35 +05:30
Sagar Vora	037d0f8ba6	fix(buying): make supplier scorecard usable	2019-01-23 14:11:25 +05:30
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Saif Ur Rehman	74a3370095	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-22 16:20:40 +05:00
Rohit Waghchaure	fa7ee0b3b6	Added dafult bank account in the customer/supplier	2019-01-17 15:45:27 +05:30
Deepesh Garg	59b9d363c9	Delete purchase_order.json	2019-01-16 22:54:45 +05:30
Deepesh Garg	e6e1f2a46f	Delete __init__.py	2019-01-16 22:53:28 +05:30
Deepesh Garg	9fb871c040	Delete pending_purchase_order.json	2019-01-16 22:52:27 +05:30
Deepesh Garg	3f5fea97fa	Delete __init__.py	2019-01-16 22:52:07 +05:30
Saif Ur Rehman	502f15ba1b	test: test_party_details_tax_category	2019-01-12 19:07:39 +05:00
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
deepeshgarg007	8621869d24	Created multiple reports and linked them to email digest	2019-01-09 21:56:45 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Saif Ur Rehman	380b4b0926	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json	2019-01-08 13:41:46 +05:00
Saif	e5091cbc0f	chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356) ... * chore: Updated DocType json files to clean up git diff of other PRs * fix: remove auto-generated file	2019-01-07 18:19:30 +05:30
Saif Ur Rehman	7ea6554f1f	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/stock/doctype/item/item.json	2019-01-06 04:43:13 +05:00
Rohit Waghchaure	3dc5b93db7	[Fix] Report quoted item comparison not working	2019-01-03 12:19:44 +05:30
Suraj Shetty	3de12db2b1	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-27 09:05:25 +05:30
Saif Ur Rehman	677866824a	More work on Tax Category and Item Tax Template	2018-12-27 02:11:07 +05:00
Frappe Bot	9e09b3adbe	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
Frappe Bot	e8c2fdfb8c	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
Suraj Shetty	146be9f6a6	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-24 16:08:43 +05:30
Suraj Shetty	83e3c4c0fa	Fix quote error	2018-12-24 11:11:04 +05:30
Suraj Shetty	b2965001d1	Replace 'Make' with 'Create'	2018-12-23 13:25:58 +05:30
Saif Ur Rehman	8ac261750b	Add and Modified DocTypes for Item Tax Template	2018-12-22 02:51:59 +05:00
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
shreyashah115@gmail.com	ba8c041206	fix: Check if items exist	2018-12-20 13:23:51 +05:30
Nabin Hait	a78947f2de	Merge pull request #16218 from deepeshgarg007/analytics-graph ... [Bug-fix] Analytics report graph skipping quarter values bug fix	2018-12-19 18:08:25 +05:30
Rohit Waghchaure	4ac9ea0e85	[Fix] Get items from material request not working for PO	2018-12-17 11:18:46 +05:30
deepeshgarg007	1ee19e4167	Analytics report graph fix	2018-12-15 15:36:09 +05:30
Stavros Anastasiadis	3d82b74ea4	Update Items in Submit state can add new row (#15644) ... * Update Items in Sumbit state can add new row In Sales Order and Purchase Order when docstatus is submitted user can use Update Item btn to add new child Items * Remove unused code line * Remove blocking db save thread line * Remove Company as not standard Field in Purchase Order Item * Minor indentation fix * Add Unit Test, add new row in update_child_qty_rate * Codacy fix	2018-12-10 17:30:55 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
deepeshgarg007	4c79274054	Fixed patch and deprecated grid reports	2018-11-30 18:01:22 +05:30
deepeshgarg007	ec5bbe351c	Row check fix for purchase analytics	2018-11-30 16:25:16 +05:30
deepeshgarg007	1a1c013b2a	Analytics report bug fixes and code cleaning	2018-11-29 08:34:47 +05:30
Frappe Bot	b5c7b96a73	Merge branch 'staging' into develop	2018-11-13 11:33:31 +00:00
Saif	60ec88bcc8	Added Default Warehouse field that sets all item's warehouse (#15462) ... * -Added field def_warehouse that sets warehouse of all items -Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied * Set def_warehouse in test_sales_order.py * Changed from def_warehouse to set_warehouse * Rest of def_warehouse to set_warehouse	2018-11-13 12:37:53 +05:30
Zarrar	6922415d1b	[New Feature]Scan Item Barcode label to quick create/update records in items child table (#15731) ... * Update transaction.js * setup barcode scan stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js * fix bug of item_code change always reset qty to 0 when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0. * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * clean up barcode logic for transactions * call scan_barcode method for stock entry * separate out logic for searching serial, batch or barcode number * added scan barcode field in transactions doctype * search barcode-serial-batch sequence, code rectify * hide all barcode related field if disabled from settings * remove print statement * Update stock_entry.py	2018-11-13 11:11:32 +05:30
Deepesh Garg	a057f4c2a0	Script report for purchase analytics (#15612) ... * Purchase Analytics Query Report * Minor Changes * Codacy Issue Fixes * Codacy Issues Fixed * Code cleaning and optimization * Indentation Issue Fix * Code cleaning and better function naming * Added link for purchase analytics in buying.py * Added link for production analytics in manufacturing.py * Commonified purchase-analytics using Analytics class * Codacy issue fix	2018-11-12 17:01:02 +05:30
Dominik Ottenbreit	63ec78aa5d	Fix Purchase Order Issue in Update Items (#15811) ... * Fix Purchase Order Issue in Update Items * fix(zero-division)	2018-11-08 12:28:57 +05:30
Ameya Shenoy	7658bdc00a	Merge branch 'staging' into develop	2018-10-23 08:06:15 +00:00
Zlash65	473437931c	field name fix	2018-10-22 11:22:12 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
Sagar Vora	d92f3ac480	Fix 'transporter info' section in Delivery Note (#15565) ... - create is_transporter checkbox in supplier doctype - new field transporter (supplier with is_transporter checked) - created fields driver and driver_name - removed GST India fields from core doctype - removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery) - read_only transporter_name field (kept for backwards compatibility) - made necessary changes in delivery_trip implementation - hidden section's fields from print (preserving v10 convention) - added transporter field to 'Driver' doctype - added queries for transporter and driver fields - GST India fields in regional module - Fix e-waybill report	2018-10-10 14:51:26 +05:30
Ameya Shenoy	f5d3ce8846	Merge branch 'staging' into develop	2018-10-08 09:44:34 +00:00
Ameya Shenoy	ecba14e6cf	Merge branch 'master' into staging-fixes	2018-10-08 09:39:49 +00:00
Zarrar	5fcccda883	[Minor] Supplier Quotation (#15578) ... * throw meaningful error if RFQ does not have selected supplier * Update supplier_quotation.py * codacy fix	2018-10-08 14:30:53 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
Charles-Henri Decultot	efd776da46	Events in timeline (#15485) ... * Events in timeline * Namespace correction * Codacy correction * Addition of sales partners in participants * Correct json indent	2018-10-03 10:41:26 +05:30
Saif	90cf2ddc01	Make pricing rule from Supplier and Customer Doc (#15533) ... * Make pricing rule from Supplier and Customer Doc * Make sure the "+" button also works the same way as the "Make" button	2018-09-30 22:16:31 +05:30
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287) ... * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Nabin Hait	9fde97cdd2	Fixed merge conflict	2018-09-12 15:45:20 +05:30
rohitwaghchaure	713cfc786f	[enhance] Payment order (#15056)	2018-09-11 17:40:37 +05:30
Zarrar	525a005b78	TDS Monthly report & TDS Computation Summary report (#15204) ... * tds computation report added * tds computation logic added * minor changes to commonify code * tds payable monthly report added * initial logic for monthly tds calculation added * added field for supplier type and pan * changes related to pan and entity type * date filter fix and cleanup	2018-09-07 13:27:10 +05:30
rohitwaghchaure	eef5cda1a9	[Fix] Blanket order issue (#15339)	2018-09-07 13:19:45 +05:30
Zarrar	203baa9a3a	update modified date to load blanket order field (#15332)	2018-09-06 17:46:11 +05:30
Rushabh Mehta	49f9747385	major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267) ... * major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc * fix: remove debug	2018-08-30 18:50:48 +05:30
Rushabh Mehta	13bcc4e27e	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +05:30
Nabin Hait	6b539d65d7	Restored missing rounded_total fields	2018-08-29 12:41:23 +05:30
Shreya Shah	a5add289bb	Refactor Naming Series (#15070) ... * Patch to create Property Setter for existing naming series * Update existing naming series options with new * Add patch link to patches.txt * Update patch * Fix codacy * Fix as per suggestions * Remove old patch for property setter * Improve as per suggested - Modified the naming - Also refactored naming for doctypes having autoname with series - Added a patch to make property setter for autoname * Fix Travis * Rebase with develop	2018-08-28 13:44:48 +05:30
Saurabh	51570f731c	[Fix] patch fixes for V11 migration	2018-08-27 17:00:51 +05:30
Saif	15636a3b98	Problem: Making a PE from PO led to incorrect values in PE form since PO's default party_account_currency is the company's currency (#15153) ... Fix: PO will set party_account_currency to supplier's default currency on validation.	2018-08-20 17:57:00 +05:30
Faris Ansari	4809f86035	fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106)	2018-08-14 10:56:18 +05:30
Shreya Shah	0631aed3d9	Discount amount field in all transactions' child tables (#15124) ... * Add discount_amount and base_discount_amount in Sales Invoice Item * Add patch for existing documents * Discount amount field in all child tables of Purchase and Selling * Remove console statements	2018-08-14 10:51:48 +05:30
Himanshu Mishra	859d942b22	Cached calls (#15109) ... * [optimize]: bin updates * [optimise]: use frappe.get_cached_value instead of get_value for item * [fix]: change db.get_cached_value to get_cached_value	2018-08-08 18:33:50 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Saurabh	824b388631	Resolved merge conflicts	2018-08-07 13:01:11 +05:30
rohitwaghchaure	ae4ff5a403	[Fix] In words showing grand total instead of rounded total (#15065)	2018-08-01 18:09:51 +05:30
Zarrar	7f8024c516	[Enhancement] Tax Withholding Category (#15064) ... * add single, cumulative threshold, remove checkboxes * remove tds child table from supplier & add tds link field * add description field in tax withholding category * add tax withholding data for indian setup, some fixes * add a checkbox for tax withholding in purchase invoice * remove supplier's child table for tds * enable tds field if supplier has tds set inits master * move rates data to child table - adding fiscal year support * change bootstrap data according to child table config of tds * show category name in list view * loyalty program fixes * moved tax calculation to tax_withholding.py - calculation for tds amount for cumulative threshold from gl entry * add fiscal year dependency in company test * minor loyalty program fix * minor tier calculation fix * minor handling duplicate exception * toggle apply_tds according to supplier, code rectify * minor fixes for loyalty program * test case for single and cumulative threshold * codacy fix	2018-08-01 17:45:05 +05:30
Nabin Hait	e45ec661ea	Additional fields in Item Price (#14540) ... * [IMPROVEMENT] Item Price New Fields and Features * [IMPROVEMENT] Item Price - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom - Stock Setting to accept Default Price List for Purchase or Sales Item - Move Item Section in Item Price * Fetch default Item Price based on Customer as null * test fixes * Code cleanup and fixed the issue of incorrect item price fetched against the customer * Removed min qty from packing_increment calculation * Removed auto_update_price_list_rate from the stock settings * Revert sales_order.json changes * Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings * Removed unnecessory file * Fixed item price validation code	2018-08-01 17:44:34 +05:30
Nabin Hait	7d9a1db97a	Update buying_settings.json	2018-08-01 15:26:40 +05:30
Zarrar	89c87fd6a6	[Minor] Patch fix (#15041) ... * update modified date * remove extra parameter from function call	2018-07-30 10:57:47 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Shreya Shah	8395a7ad6f	Modifications in last purchase rate button (#14948) ... * Make last purchase rate button visible until submitted * Move buttons - Get last purchase rate and link to material request buttons moved to toolbar under Tools button * Remove disable fetch last rate functionality * Make last purchase rate field read_only	2018-07-18 12:27:27 +05:30
Faris Ansari	9e874af9ba	Query report print (#14935) ... * QueryReport - Only print visible columns in report - Use get_columns_for_print method instead of directly accessing report.columns * Query Report - Replace frappe.query_report_filters_by_name with new API	2018-07-18 09:28:44 +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
Saurabh	e78a877202	patch fixes (#14936)	2018-07-17 16:38:11 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +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
Charles-Henri Decultot	8b22310d66	Allow auto repeat update (#14706) ... * Allow auto repeat update * Allow auto-repeat reference update	2018-06-28 14:27:58 +05:30
rohitwaghchaure	4c23be1821	Added test cases for subcontract (#14702)	2018-06-28 11:18:37 +05:30
Nabin Hait	e2a8120ef8	ignore user permissions for some fields	2018-06-26 15:27:34 +05:30
Manas Solanki	0ebd0f0d62	Update purchase_order.js	2018-06-26 11:44:29 +05:30
Kanchan Chauhan	bddebb52d6	Allow only submitted Blanket Order in PO/SO	2018-06-26 09:31:27 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604) ... * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
Shreya Shah	97124e92fa	[Fixes] Tax withholding category and Bank Guarantee (#14576) ... * Fetch withheld percentage * Set query for accounts on the basis of company * Fix bank guarantee error on submit * Remove errors caused by fields which are removed	2018-06-19 10:46:41 +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
Nabin Hait	b2d3c0f040	Update ordered qty in blanket order	2018-06-14 15:56:29 +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
Manas Solanki	2fb63e1724	init the blanket order	2018-06-14 15:55:37 +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
Rohit Waghchaure	b6381c66d8	[Fix] Purchase receipt test cases	2018-06-12 13:54:40 +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
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +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
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
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
Manas Solanki	38667ab8da	return defaults according to the company	2018-05-16 17:00:05 +05:30
Rohit Waghchaure	23942701f1	[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'	2018-05-16 15:41:00 +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
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
Rohit Waghchaure	909069fa20	[Fix] 'Supplier' object has no attribute 'on_hold'	2018-05-16 12:25:51 +05:30
tundebabzy	ad08d4ce96	Ability to hold payment for disputed invoices #12048 (#13298) ... * add new fields to Supplier Master: - on_hold: To signal the Customer is blocked from completing certain transactions - hold_type: 3 options - All, invoices and payments * sanitize `on_hold` field input * show hold status in list view * add `release_date` field to Supplier Master: - specifies the date when transaction restraint will be removed * reset release date if supplier is not on hold * add validation to stop transactions when Supplier is blocked * add test cases * return empty list for outstanding references if supplier is blocked * block make button:payment if supplier is blocked * adjust test cases * PEP 8 clean up * more tests * adds new fields to Purchase Invoice: - release_date: once set, invoice will be on hold until set date - hold_comment: so user can add comment pertaining to why invoice is on hold * implement individual purchase invoice on hold logic * allow user to change release date * update manual * final cleanup including more validation and tests * update supplier manual * make default for release_date argument todays date * remove Auto Repeat added by mistake * add on_hold_field to purchase invoice * add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view * implement explicit payment hold in purchase invoice * update manual * add dialog for saving comment * bug fix, refactor, clean up * more test cases	2018-05-16 11:31:41 +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
Shreya	da5163da2f	Fix Supplier Doctype	2018-05-15 17:43:50 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
Saurabh	b9d3385fec	calculate TDS on Sales Invoice Amount	2018-05-14 20:42:08 +05:30
Saurabh	3b4a6be4d0	Supplier Tax Withholding Config	2018-05-14 20:42:08 +05:30
Zlash65	39097c7fbe	codacy fix	2018-05-14 15:34:45 +05:30
Zlash65	93d6b555d7	added fixtures for supplier-group, changed analytics report accordingly	2018-05-14 11:45:38 +05:30
Zlash65	890707854d	config/utility level changes	2018-05-14 11:45:38 +05:30
Zlash65	0a50554417	doctype level changes	2018-05-14 11:45:38 +05:30
Zlash65	4437a5ed18	json level changes	2018-05-14 11:45:38 +05:30
Zarrar	f2df7f32fa	update subscription to auto_repeat across dashboards (#13956)	2018-05-08 16:06:36 +05:30
Nabin Hait	4bbe5fbefc	Fixes related to auto repeat	2018-05-05 12:32:59 +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
Shreya	59512aaaaa	Internal Supplier check in Supplier	2018-05-02 14:34:14 +05:30
Nabin Hait	3652a62b55	minor fixes	2018-04-30 19:32:29 +05:30
Nabin Hait	1c13e70d13	New doctypes for HR and Accounting (#13652)	2018-04-26 12:12:29 +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
tundebabzy	caae0f4dcc	Merge branch 'develop' into new-subscription	2018-04-17 09:34:04 +01:00
matmyers	742da8cfce	removed duplicate keys (#13675)	2018-04-17 12:20:57 +05:30
Dominik Ottenbreit	82eac06505	Add Order Confirmation to PO (#13421)	2018-04-06 11: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	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
rohitwaghchaure	c9a1eb1081	[Fix] Not able to delete row in modal table (#13377)	2018-03-27 11:26:43 +05:30
Faris Ansari	34dd079a68	Remove unnecessary columns Analytics Reports (#13344)	2018-03-22 11:12:02 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Ameya Shenoy	95763bc233	Purchase Order fixes (#13287) ... - Reason: If Item Code was changed in Item Master, it didn't used to reflect on the 'Purchase Order Item Supplied' and 'Purchase Reciept Item Supplied' - Data field in 'Production Order Item Supplied' and 'Production Reciept Item Supplied' converted to Link Field.	2018-03-13 15:51:56 +05:30
Achilles Rasquinha	cbfcb3e61d	string_types from basestirng	2018-03-12 19:15:29 +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
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
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
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
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
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
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +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
Saurabh	ec23a6f0eb	[fix] section break for raw_material_details (#12976)	2018-02-19 11:33:11 +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
Achilles Rasquinha	1697a7aa81	replaced string_types with basestring	2018-02-15 11:39:45 +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
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
pawan	471a018e67	remove old stock entry method/rewrite test case	2018-02-12 21:15:46 +05:30
pawan	1b8c13b175	call make_rm_stock_entry	2018-02-12 16:59:59 +05:30
rohitwaghchaure	7477899d2e	Formatter, code cleanup (#12852)	2018-02-12 11:25:58 +05:30
pawan	2b885beaee	code changes for single stock entry	2018-02-07 19:06:18 +05:30
Nabin Hait	2ef1f84041	Fixed merge conflict	2018-02-03 09:14:53 +05:30
Nabin Hait	91c5e4c429	Validate rate in PO with supplier quotation only if checking is enabled via Buying Settings (#12734)	2018-02-01 18:58:22 +05:30
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
Vishal	fc05cc4e70	[fix] link with supplier quotation to purchase order	2018-01-31 15:10:39 +05:30
Nabin Hait	4eae6c985c	Fixed test records for supplier	2018-01-30 15:27:29 +05:30
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
Nabin Hait	cfa9d1adb7	Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685) ... * Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date * Payment Terms patch for credit days defined in customer group	2018-01-29 16:07:21 +05:30
pawan	afab0a64e5	code alignment	2018-01-22 17:34:27 +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
Rohit Waghchaure	c987500e08	Merge branch 'master' into develop	2018-01-19 13:29:57 +05:30
Rohit Waghchaure	86cbde9057	[Fix] Error in PO. No Permission for Buying Settings	2018-01-19 12:45:53 +05:30
tundebabzy	df023bff7f	add posting_date/transaction_date to list_view (#12453)	2018-01-12 16:27:29 +05:30
Saurabh	892a7a6980	resolved merge conflicts	2018-01-09 12:05:20 +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	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
rohitwaghchaure	bc2c83ee3c	Companywise default tax template (#12290) ... * Companywise default tax template * Fix test cases	2018-01-05 12:42:02 +05:30
rohitwaghchaure	fe22686a8f	Update last purchase rate from the purchase invoice (#12189)	2017-12-28 16:11:27 +05:30
Manas Solanki	5e9d1246e8	remove the autoname from the supplier json	2017-12-26 15:21:03 +05:30
Nabin Hait	2f9f4f9c01	Multiple fixes related to payment terms (#12115)	2017-12-20 12:24:59 +05:30
Vishal Dhayagude	d377018695	[fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001) ... * [wip] shipping rule * [wip] Shipping Rule tax auto calculate * [wip] Shipping Rule * [new] Shipping charges change on different triggers * [minor] Removed unnecessary comments * [fix] Minor Changes in function calls	2017-12-14 18:06:02 +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
pawan	14d570ed9e	fix	2017-11-30 18:41:09 +05:30
pawan	2ff844e740	default warehouse / remove validation / change sql	2017-11-30 18:14:55 +05:30
pawan	f5bb2af92c	test case	2017-11-30 15:20:00 +05:30
Nabin Hait	e761b9de40	Rearranged fields due to merge conflict messup	2017-11-30 14:29:10 +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
pawan	54465f5df1	review comments changes	2017-11-29 10:18:38 +05:30
Saurabh	b750b304dd	fixed merge-conflicts	2017-11-28 11:02:28 +05:30
Saurabh	8eda0cc8ba	[fix] validate bom if order type is subcontracting (#11705) ... * [fix] validate bom if order type is subcontracting * [fix] moved validation to server side	2017-11-28 10:41:35 +05:30
pawan	f5279a0d67	[fix] #8427	2017-11-24 11:21:47 +05:30
Nabin Hait	82027ea3bf	Set print hide property for payment terms	2017-11-23 12:49:42 +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
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
Nabin Hait	1c4653ed97	Merge branch 'develop' into payment-terms	2017-11-17 12:41:56 +05:30
Rushabh Mehta	a5ebebd09c	[enhance] Add Issue Type and Opportunity Type masters (#11598) ... * [enhance] added & linked Issue Type & Opportunity Type with opportunity * [patch] create issue and opportunity type from the custom field if available * [minor] issue_type and opportunity type should be mandatory * [patches] removed try catch from the patch * [fix] patch * [refactor] cleanup issue/opportunity type	2017-11-16 17:03:52 +05:30
Rushabh Mehta	d3f5d0961a	[feature] Opening Invoice Creation Tool (#11589) ... * [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices * [minor] added progress bar while creating invoice * [minor] allow bulk upload for the invoices * [minor] calculate item rate from net total * [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0 * [minor] check mandatory values before making opening invoices * [minor] enable primary button if there is any error while creating invoices * [minor] minor fixes, set company currency as invoice currency added tests * [dashboard] added Opening Invoice Summery section in Dashboard * [minor] added total invoices count on dashboard * [minor] don't show dashboard if there are no opening invoices available * [minor] added Opening Invoice Tools to Account's Tools section * [minor] codecy fixes * [fix] refactored general ledger and buttons on charts * [fix] tests	2017-11-15 16:29:53 +05:30
Zarrar	24b8aa2e80	set field dependent on link field fix (#11580)	2017-11-15 14:27:00 +05:30
schilgod	e418a5bdc1	Option to disable fetching last purchase details in Purchase Order (#11573) ... * add check for enable/disable last purchase details in Purchase Order * fix tabs	2017-11-15 09:49:49 +05:30
AravindPranera	04e3518fad	Update request_for_quotation.py	2017-11-14 17:13:53 +05:30
AravindPranera	5bae488f25	Update request_for_quotation.py	2017-11-14 17:13:53 +05:30
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Nabin Hait	1c1237537b	Subscription fixes (#11292) ... * Subscription fixes * Removed recurring fields, cleanup code	2017-10-25 12:10:44 +05:30
tunde	c8d2361b81	Merge branch 'develop' into payment-terms	2017-10-24 12:25:29 +01:00
Nabin Hait	4825eccad5	UI test fixed for supplier quotation (#11260) ... * UI test fixed for supplier quotation * ui test fixes for purchase order * Fixed number of assertion in student admission test * Fixed multiple ui tests * ui tests	2017-10-21 10:44:30 +05:30
Nabin Hait	b4f5f14438	Timeout increased for setting __newname (#11252) ... * Timeout increased for setting __newname * UI test fixes * fixed ui test for PO * ui tests * ui tests * ui tests * ui tests * ui tests	2017-10-20 11:26:17 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Saurabh	5fa2adcca9	Merge branch 'master' into develop	2017-10-18 16:23:44 +05:30
rohitwaghchaure	a3fe5b8528	[Fix] Disable desk access view to supplier (#11234)	2017-10-18 10:53:34 +05:30
tunde	d82677f1e6	Merge branch 'develop' into payment-terms	2017-10-06 02:23:45 +01:00
Nabin Hait	5a834209d0	Cleanup of PO schedule date pull requests	2017-10-05 19:51:10 +05:30
Nabin Hait	395cf4689b	Cleanup of schedule date functionality in Material Request	2017-10-05 18:27:37 +05:30
AravindPranera	9c0d30a087	Fetching Document ID also in Email Subject while clicking "Send Supplier Emails" button (#10874)	2017-10-05 17:08:32 +05:30
tunde	19e63b73ed	Merge branch 'develop' into payment-terms	2017-10-03 12:02:38 +01:00
Nabin Hait	7eba1a35d3	Controller init args fix (#11015) ... * Controller init args fix * cleanup useless code	2017-10-02 15:59:27 +05:30
Sunny	c6f25ba996	correct field name	2017-10-02 11:37:47 +08:00
Sunny	b387b3cca0	[fix] tests	2017-10-02 11:37:47 +08:00
Sunny	a456901e9f	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	0f2b21f88b	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:37:47 +08:00
Sunny	73f4eef40f	[fix] tests	2017-10-02 11:37:47 +08:00
Sunny	9ded8a7290	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	c2befc59d1	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:37:47 +08:00
Sunny	34a8fb4100	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	47eac28f0a	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	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
Sunny	3a22fd1535	Add schedule_date when creating Purchase Order	2017-10-02 11:35:33 +08:00
Sunny	f07e53b7a8	[fix] tests	2017-10-02 11:35:33 +08:00
Sunny	bd121486a8	[fix] Codacy errors	2017-10-02 11:35:33 +08:00
Sunny	122981d465	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:33 +08:00
Sunny	962cef470a	Set PO Reqd By Date default in code, to next date	2017-10-02 11:35:33 +08:00
Sunny	0f73f90fa2	[fix] Codacy errors	2017-10-02 11:35:33 +08:00
Sunny	69e88ffa39	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:33 +08:00
schilgod	f29969a5cc	update test records	2017-10-02 11:35:32 +08:00
Sunny	e3ed8b7cb3	[fix] tests	2017-10-02 11:35:32 +08:00
Sunny	c429a6e688	[fix] Codacy errors	2017-10-02 11:35:32 +08:00
Sunny	2315a79b5f	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:32 +08:00
Sunny	9da25f568d	Set PO Reqd By Date default in code, to next date	2017-10-02 11:35:32 +08:00
Sunny	9d497a984b	[fix] Codacy errors	2017-10-02 11:35:32 +08:00
Sunny	bb03ec103b	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:32 +08:00
tunde	c49e748c85	Merge branch 'develop' into payment-terms	2017-09-29 13:30:22 +01:00
Shreya Shah	b79c4a9ff6	Getting last purchase price of an item (#10897) ... * Added a column last purchase rate * Removed button last purchase rate * Get last purchase rate on adding an item * Added test case for last purchase rate * Replaced cur_frm with frm * Update purchase_order.js	2017-09-29 15:20:48 +05:30
tunde	3415ac6e9c	Merge branch 'develop' into payment-terms	2017-09-29 10:10:24 +01:00
Sunny	bf68611567	clean code	2017-09-28 15:24:11 +08:00
Sunny	892ec599d4	[fix] tests	2017-09-28 15:23:09 +08:00
Sunny	799d69baba	[fix] Codacy errors	2017-09-28 15:22:49 +08:00
Sunny	71866e06f3	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:49 +08:00
Sunny	284ceb7abe	Set PO Reqd By Date default in code, to next date	2017-09-28 15:22:49 +08:00
Sunny	65c7a6947a	[fix] Codacy errors	2017-09-28 15:22:49 +08:00
Sunny	f7a8277d12	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:49 +08:00
Nabin Hait	c9f9e5235b	Fixed merge conflict	2017-09-28 12:31:33 +05:30
Makarand Bauskar	53e19075d1	[hotfix] fixes and refactored Quoted Item Comparison report (#10954)	2017-09-28 12:30:04 +05:30
tunde	9e4dcdfbc8	rename Payment Terms Schedule section break to Payment Terms	2017-09-26 09:44:23 +01:00
tunde	8a53b64ac4	Merge branch 'develop' into payment-terms	2017-09-25 10:31:42 +01:00
tunde	cf42d1db5c	more tests	2017-09-22 17:20:33 +01:00
Nabin Hait	5478a7fa67	Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop	2017-09-21 15:48:18 +05:30
tunde	c02f332565	Merge branch 'develop' into payment-terms	2017-09-20 15:37:34 +01:00
Nabin Hait	b2dca79d89	Updated modified timestamp in sales/purchase transaction doctypes	2017-09-20 09:56:06 +05:30
tunde	3387d026b1	Merge branch 'develop' into payment-terms	2017-09-19 18:07:12 +01:00
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
AravindPranera	1276893550	Files added with all functions	2017-09-18 17:30:20 +05:30
tunde	9448f4b13c	codacy corrections	2017-09-18 12:08:34 +01:00
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
Nabin Hait	092f6d3739	Fixes ui tests	2017-09-14 16:45:47 +05:30
Rushabh Mehta	f056974bc5	[domain] Healthcare (#10664) ... * Medical module for erpnext * Changes in core for Medical module * patient registration updated * fix - appointment invioce - fields missing * pages- indicator instead of bg-color * Lab Test field renamed service type * Department added Lab Test * procedure name in prescription * fixes sample collection * filter disabled patient * fix patient admission * updated patient age * availability check msg updated * fixes, removed procedure from invoice * sample print renamed * fixes, validation * service desk physician in filter * refactor scheduler * Appointment -field property - set only once = 1 * Appointment - Mark closed and pending buttons removed * Appointment - readonly = 1 if value set * Appointment - availabilty * Appointment - Cancel - info - cancel invoice * Appointment - set pending appointments * Dosage form - new DT * Drug Prescription - Dosage form added * Facility - Floor - removed from Fecility * Floor - removed * Lab Test Template - item creation validation * Procedure - Create Procedure * Procedure Appointment - new DT * Service Unit - Floor reference removed * Zone Fcilities - Unused DT removed * Appointment Desk - fixed * Service Desk - method pointing from procedure changed to procedure_appointment * Consultation print - got featured * Consultation - removed patient refernce to procedure prescription * Procedure Prescription - removed patient refernce * Lab Test - Changed field properties and value * Lab Test - field property changed * Lab Test - methods rewrite - lab test doc creation * Lab Test - create lab test from invoice and consultaion - got changed * Button History changed to Medical Record * Service Desk - Updated * Notification - Procedure Appointment * fix-get procedure prescription * fix field added to test prescription * msgprint on invoice creation * fix data on install * Merge branch erpnext/develop * fixes- minor * Setup wizard - Create Sensitivity * Appointment - Validate and Save if there is no schedule for Physician * Consultation - Button create vital signs and medical record * Review Type - New DocType * Review Detail and Treatment Plan - Childs - Consultation * Patient Medical Record - field Attach doc * Consultation - New Fields * Consultation - Manage new Fields - Medical record add action * Patient Relation - Child DocType - Patient * Patient - Patient Relation added * Patient - collapsible = 1 * Laboratory Settings - fields - message for lab test * Laboratory Settings - get message for lab test * SMS text for lab test and invoice test report * Procedure Stock Detail - Stock detail for Procedure and Template * Template Stage Detail - Stage detail for Procedure Template * Procedure Stage Detail - Stage detail for Procedure * Service Unit - field - warehouse * Scheduler - msg - content changed * Laboratory Settings - defualt - msg content * Invoice Test Report - msg print * Print Format-Changed-Consultation-Invoice Test Report-Lab Test * OP Settings - Expnse Account for Stock Entry in Procedure * Procedure and Procedure Template - Manage Stock Stage and Sample Collection * Procedure Appointment - Manage Stock and Stage * Lab Test - fixed - resource not find * Invoice Test Report - fixed - resource not find * Procedure - doc reload after insert * Patient Medical Record - fixed - refernce missed * Create Vital Signs -on client side * Rename module Medical to Healthcare * Remove In Patient (IP) Feature. * Rename - Procedure to Clinical Procedure * Remove spaces in Naming Series * Rename Duration to Drug Prescription Duration * Duration to Drug Prescription Duration * Merge All Settings to Healthcare Settings * Healthcare settings - import fixed * Procedure related documents are removed * Appointment Desk and Sevrvice Desk are removed * Consultation - minimal * Consultation - minimal * Consultation - minimal - patient detials in collapsible section * Message Print to Alerts * Patient - some fields removed * Patient - create consultation - message print to alerts * Consultation - show patient details updated * Setup wizard - Duration to Drug Prescritpion Duration * Healthcare Settings - patient registration - fee collection * Lab Test - Create Sales Invoice bug fixed * Healthcare menu rearranged * Healthcare Settings - Optimised and Rearragnged * Healthcare Settings - Expense account removed * Receivable account removed from patient * Patient - Optimised and Rearragnged * Removed Referring Physician * Healthcare Settings - bold headings removed * Physician - Patient - Fields are Segregated * Remove Service Unit * Remove - Service Type * Consultation invoice * Lab Test - invoice * Patient - Invoice * Rename Appointment to Patient Appointment * wip * Patient Dashboard, Physician Form cleanup * Dosage renamed to Prescription Dosage * Renamed Drug Prescription Duration to Prescription Duration * Patient Appointment booking modal * Patient Age - calculate by dob * Remove - scheduler * Consultation - Appointment to Patient Appointment * Patient Dashboard - rearranged * Patient Appointment * Removed rer_physician from lab test and consultation * Patient Appontment Changes * Appointment and Consultation - optimized * Patient Appointment - fee validity code optimized * Consultation and Patient Appointment - Invoice validate two side * fix: #13 remove relation to admission * Healthcare - Patient Portal * fix import error * domain Healthcare added on install * Removed - Invoice Test Report * Physician Schedule - menu * Consultation - patient details - re write * New Doctype-Medical Code * Consultation - Daignosis codification * Medical Code - Codification - Settings * Medical Code Standard - Medical Code - Codification - Settings * fix appointment calendar * fix appointment analytics * Menu Medical Code Standard * New Doctype - Medical Code Standard * Set Physician Role insted of IP Physician and OP Physician Role * fixed some json files * Medical code - permission to physician * Unused Childs - Work Schedule and User List - Removed * Label Procedure to Lab Test * Lab Test and Patient - code optimised * Add Item Groups - setup wizard * Healthcare Settings - add Role - Medical Administrator * Healthcare - Demo setup - Make Demo * Fee Validity - Logic Test * Test Fee Validity - Optimised * Healthcare Doctypes - Restricted to Domain Healthcare * Domainify - remove Healthcare Roles - Other Domains * Healthcare doctypes - beta checked * Codacy fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Lab Test - print hide =1 for some fields * Consultation - Codification field label to Medical Coding * Codacy fixes - import frappe and etc. * Codacy fixes - import frappe in test_vital_signs * Codacy fixes * Codacy fixes * Codacy fixes and remove delete perm for patient * send_sms - import form frappe * Healthcare Settings * Lab Prescription - Consultation - Test Code - read_only = 0 * Portal fixes * Patient Appointment - filter physician - if has schedule * Physician - IP Charge - Removed * test - files * Web Form - Patient Profile - removed * Role Medical Administrator to Healthcare Administrator * WIP healthcare documentation * Coday - fixes * Travis - fixes * Lab Test Report - menu * Reorder Healthcare settings - group lab config to bottom * Sample Collection - New - allow Sample and patient Selection * Rate - similar behaviour and Label as in Item Standard Selling Rate * Healthcare documentation * Lab Test Samples to Lab Test sample * Commplaints to Complaint * Commplaints to Complaint * Antibiotics to Antibiotic * Appointment Token Number - remove * View - Medical record * Codacy fixes * update healthcare docs * Cleanup Docs - Search, quick entry, trsck change, etc. * [minor] ux changes	2017-09-13 12:52:30 +05:30
tunde	1255aa0f11	Merge branch 'develop' into payment-terms	2017-09-12 11:54:52 +01:00
Nabin Hait	de9eebe51c	Fixed multiple ui tests	2017-09-12 15:40:33 +05:30
tunde	df3a175974	fix bugs: add payment_schedule if payment_terms_schedule specified	2017-09-11 11:02:57 +01:00
mbauskar	dfeadf876e	Merge branch 'master' into develop	2017-09-10 12:32:21 +05:30
Makarand Bauskar	80b2ba2b9a	[hotfix] fixed Not Permitted issue for System user while accessing documents on portal (#10725) ... * [hotfix] dont allow guest user to list the invoices or orders * [hotfix] fixed Not Permitted issue for System user while accessing documents on portal * [codecy] removed trailing whitespace * [fixes] added filters for supplier in RFQ and other minor fixes	2017-09-10 12:04:28 +05:30
rohitwaghchaure	225ac0dac3	[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-08 10:31:21 +01:00
tunde	24cb494a3b	Revert "Revert "make payment_schedule field no-copy"" ... This reverts commit fbd895d781.	2017-09-08 10:07:39 +01:00
tunde	fbd895d781	Revert "make payment_schedule field no-copy" ... This reverts commit 4f4148b0da.	2017-09-08 10:06:46 +01:00
tunde	4f4148b0da	make payment_schedule field no-copy	2017-09-07 18:49:10 +01:00
tunde	9085a5e52d	more test cases for quotation, purchase/sales order	2017-09-07 14:31:33 +01:00
tunde	ad7d3a1733	Merge branch 'develop' into payment-terms	2017-09-07 13:13:59 +01:00
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
tunde	794001df50	more test cases in Supplier	2017-09-06 09:16:11 +01:00
tunde	98cca8ee18	remove unused imports	2017-09-06 06:11:58 +01:00
tunde	743ba690dd	more test cases for Supplier	2017-09-05 01:17:14 +01:00
tunde	635423d70f	rewrite Supplier test cases	2017-09-04 19:37:54 +01:00
tunde	975eff7310	remove redundant test case	2017-09-01 12:10:44 +01:00
tunde	cbd72f6113	adjust failing tests	2017-09-01 11:48:00 +01:00
tunde	e44ce5d88e	adjustment: removes credit_days_based on and credit_days fields	2017-08-31 16:11:42 +01:00
tunde	762c810fa2	add payment terms to supplier master	2017-08-31 11:52:49 +01:00
tunde	3dfbd957b7	add payment terms to supplier master	2017-08-31 09:42:01 +01:00
AravindPranera	764bb30d2d	Fetching Opportunity items into Request for Quotation	2017-08-24 18:34:45 +05:30
tunde	d13fe18d30	Merge branch 'develop' into payment-terms	2017-08-22 14:18:11 +01:00
Doridel Cahanap	a6a93cbe06	[Fix] Request for Quotation Portal Title (#10489)	2017-08-22 18:39:38 +05:30
Vishal Dhayagude	a1637d8343	[UI Test] UI test for Sales Invoice with Payment Entry (#10483) ... * [UI Test] UI test for Sales Invoice with Payment Entry * Update test_purchase_order_receipt.js	2017-08-22 18:33:17 +05:30
Utkarsh Goswami	5cf3bdd593	Travis fix for purchase order receipt (#10498)	2017-08-22 17:39:06 +05:30
tunde	10fc880b06	Merge branch 'develop' into payment-terms	2017-08-21 18:27:46 +01:00
Zarrar	196b491ac4	[ui test ] Travis failing fix (#10468) ... * Value in assertion was wrong * Update test_purchase_order_receipt.js	2017-08-21 08:07:42 +05:30
tunde	c7f46218d7	tests and test fixes ... fixes test case: make sales invoice using customer that does not have credit_days_based_on 'Last Day Of Next Month' so that it doesn't conflict with payment term due date fix test case: create purchase invoice with new supplier with credit_days_based_on "Fixed Days" as the default "Last Day of Month" does not apply when using payment terms	2017-08-20 17:23:27 +01:00
tunde	b76ab49ede	add Payment Term to Purchase Order	2017-08-20 16:52:05 +01:00
KanchanChauhan	dd351c585a	[Minor] Title added to rfq web view (#10454)	2017-08-20 11:00:43 +05:30
Vishal Dhayagude	8fd5b325e0	[UI Test] travis.yml modified for fresh UI Test (#10446) ... * [UI Test] travis.yml modified for fresh UI Test * [fix] travis * Update test_production_order.js * Update test_production_order.js * Update test_purchase_order_receipt.js * Update tests.txt * Update test_purchase_order_receipt.js	2017-08-20 10:59:48 +05:30
Ben Cornwell-Mott	ee9f9863ff	MORE CODACY	2017-08-17 11:29:11 +05:30
Ben Cornwell-Mott	9727a3fe50	More codacy issues	2017-08-17 11:27:31 +05:30
Ben Cornwell-Mott	13218f7d76	Fixed codacy issues	2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott	bea7d9f919	Added tests	2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott	1b43515160	Codacy fixes	2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott	48058a88e5	Minor cleanup	2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott	f7e42211b9	Added Quote Status to RFQ Suppliers with No Quote	2017-08-17 11:18:49 +05:30
Shreya Shah	b5ed6823d6	[UI Test] Buying - Create Purchase receipt (#10421) ... * Create purchase receipt after submitting the purchase order * Checks quantity and rate in stock ledger	2017-08-17 11:03:43 +05:30
Vishal Dhayagude	f37eacdee5	[UI Test] Purchase Invoice (#10422) ... * [UI Test] Purchase Invoice * [fix] Travis failed	2017-08-17 11:01:59 +05:30
Shreya Shah	289400d944	[UI Test] Buying module - Multiple tests for Purchase orders (#10414) ... * Extended timeout to avoid rare failures * Get purchase orders with discount on grand total * Get purchase orders with discount on individual items * Get purchase orders and calculate taxes * Added paths	2017-08-16 11:31:34 +05:30
Shreya Shah	f6544e95d4	[UI Tests] Buying Module - Supplier quotations and Purchase orders (#10397) ... * Get Supplier Quotation with item wise discount * Get purchase orders * Added paths * Codacy fix	2017-08-14 17:29:09 +05:30
Shreya Shah	67e2ef30c4	[UI test] Buying module - Get Supplier Quotations (#10375) ... * Get quotations for Suppliers * Calculate taxes and charges for Supplier quotations * Added paths for tests * Codacy fix * Improvised the page route function	2017-08-14 09:17:00 +05:30
Shreya Shah	9e30969243	Fetching items from material requests doctype (#10363)	2017-08-11 12:02:35 +05:30
Shreya Shah	5ae39ae79a	Get Quotation requests and send emails to suppliers (#10356)	2017-08-10 16:20:47 +05:30
Shreya Shah	243f091b30	Get supplier details (#10352)	2017-08-10 10:51:47 +05:30
tunde	4a263c714d	get_party_detail should use default currency of party	2017-08-02 22:26:39 +01:00
rohitwaghchaure	49a6b4a4fa	[Fix] RFQ list showing to all supplier in the portal (#10023)	2017-07-25 14:12:58 +05:30
bcornwellmott	05e51d6c83	Add Get Suppliers dialog (#10025) ... * Add Get Suppliers dialog * Commonize code, use depends_on * Update request_for_quotation.js	2017-07-25 14:10:23 +05:30
bcornwellmott	d023d9a0bd	Add RFQ email sent check (#10068) ... * Add RFQ email sent check * remove blankspace * Removed debugger	2017-07-25 11:03:12 +05:30
bcornwellmott	96381da547	Supplier Scorecard (#9294) ... * Initial start of scorecard docs * Got basic functionality working * Fixed doc names and added key functions * Basic functional version minus Actions * Hide scorecard docs until functional * Created supplier scorecard documentation * Added default variables and standings. Added restrictions for PO + RFQ * Automatic daily scorecard creation + on save * Added warning for PO nd RFQs * Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo * Added tests, fixed codacy formatting, small improvements * Fixed test bug w/ criteria. Codacy cleanup * Fixed codacy issues. Fixed sticky criteria * Fixed bug with period search. Remove blank variable child. * Updated docs, automatically add criteria and standings, clean up period create message * Uncommented test, set docs to beta * Fix for nabinhait review * Fix codacy issue. Fix dict assignment for records	2017-07-24 22:42:30 +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	e06526ffff	Add indexes in some transaction doctypes (#9889)	2017-07-17 13:28:27 +05:30
Nabin Hait	fb8e59234b	Merge pull request #9652 from bcornwellmott/sq_lead_time ... Added lead time field to supplier quotation	2017-07-11 23:39:27 +05:30
Ben Cornwell-Mott	b1f0fd4ac3	Lead time matches Item master	2017-07-10 09:09:29 -07:00
Nabin Hait	fa351f4bdf	Merge pull request #9433 from tundebabzy/issue-9424 ... Errors due to a single quote in Supplier's name #9424	2017-07-06 15:22:16 +05:30
Ben Cornwell-Mott	19d9381197	Added lead time field to supplier quotation	2017-07-05 13:17:13 -07:00
Makarand Bauskar	4095915bff	Merge pull request #9489 from rohitwaghchaure/billed_amt_issue_in_pr ... [fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before	2017-06-30 16:02:31 +05:30
Vishal Dhayagude	76f93d05b7	display image in supplier's list view (#9500) ... * [fix]display supplier image in desk * Supplier image displayed in desk * Show image in supplier desk page * [minor] removed whitespaces	2017-06-29 11:23:13 +05:30
Makarand Bauskar	eef3f62ff7	Merge pull request #9488 from rmehta/gst-reminder ... [regional] ability to send gst reminders to all parties	2017-06-27 19:33:05 +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
Rushabh Mehta	00ae424cac	[regional] ability to send gst reminders to all parties	2017-06-27 17:31:41 +05:30
Rohit Waghchaure	f3e91e2b2b	[minor] Currency label not displaying in the total advance field	2017-06-27 15:51:35 +05:30
tunde	5824ae98d9	calls local to build frappe.form_dict in order to pass failing test	2017-06-26 12:42:11 +01:00
tunde	8859eb23a3	set form_dict correctly	2017-06-26 12:01:41 +01:00
tunde	ea7768d3f3	fixes form_dict failure in travis test	2017-06-26 10:17:53 +01:00
tunde	bce13cd0e3	fixes failing test	2017-06-26 08:43:25 +01:00
tunde	94500fd17b	adds test case	2017-06-22 17:34:54 +01:00
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
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	1dc26b127b	Salutation and Gender in Lead and Customer (#9199)	2017-06-13 15:26:35 +05:30
_JG_	aafe0c517f	Update purchase_order_dashboard.py (#9149) ... There are no links to projects	2017-06-13 13:00:47 +05:30
Faris Ansari	ab74ca7fff	Lint and fix JS files	2017-05-30 12:54:42 +05:30
Nabin Hait	2d79a641c2	Annual billing amount in party dashboard based on grand total	2017-05-24 16:46:56 +05:30
Ayush Shukla	76d965f340	[minor]-Changed receivable to payable (#8880)	2017-05-17 19:18:47 +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
Nabin Hait	3257aeeb55	Price list rate fix multiple uom and validation with prev doc (#8718)	2017-05-06 12:47:14 +05:30
Nabin Hait	7228e1af6e	Customer/Supplier Name in sales/purchase analytics (#8717)	2017-05-06 12:45:37 +05:30
Pawan Mehta	cac94b9bd5	[fix] #8373 (#8707)	2017-05-05 17:29:57 +05:30
Makarand Bauskar	c4ec937835	[hotfix] fixed object has no attribute 'delivered_by_supplier' (#8699)	2017-05-05 11:52:17 +05:30
mbauskar	c482aeda1a	[fixes] added missing get_linked_material_requests method to buying utils	2017-05-02 14:05:54 +05:30
Nabin Hait	db8f41ba55	Added Payment documents as Quick Links in SO/PO	2017-04-26 14:34:41 +05:30
Nabin Hait	9b20e07431	[fix] currency field precision	2017-04-25 14:09:29 +05:30
Nabin Hait	2de3bf7a0f	Fixed indexes on sales and purchase transactions	2017-04-19 20:58:09 +05:30
mbauskar	1b32d913a2	[minor] fetch supplier address, address_display on supplier trigger	2017-04-13 11:55:20 +05:30
Rushabh Mehta	4b0381c820	[fix] tests	2017-03-31 17:36:48 +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
Nabin Hait	8bf58367b8	Fixed merge conflict	2017-03-27 12:30:01 +05:30
Rohit Waghchaure	414c0ab3bb	[fix] Quantity is not copying in the Received Qty during making of debit note	2017-03-17 17:19:17 +05:30
Kanchan Chauhan	6f7457a1b0	[Fix] Warehouse not required for Dropship	2017-03-16 16:03:41 +05:30
Rushabh Mehta	6d4a52562b	[fix] posting date, time is always current unless explicitly set	2017-03-14 17:06:51 +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	11fa7a9311	[fix] Removed customer, supplier and added link_name from website_list_for_contact file	2017-03-14 13:26:10 +05:30
Saurabh	4f4d0a8369	[fix] validate negative quantity while creating purchase receipt	2017-03-13 15:37:47 +05:30
Nabin Hait	52daaca885	Fixed merge conflict	2017-03-08 14:30:38 +05:30
Rohit Waghchaure	d05a8737f9	[Fix] Purchase return issue	2017-03-08 10:30:23 +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
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
Nabin Hait	6bbf141d57	Merge branch 'develop' into link_mrs	2017-02-28 15:55:35 +05:30
Nabin Hait	38c7ad2c69	Update supplier_quotation.json	2017-02-28 15:53:10 +05:30
Nabin Hait	491d2ad140	Update request_for_quotation.json	2017-02-28 15:52:43 +05:30
Nabin Hait	365ed5dea9	Update purchase_order.json	2017-02-28 15:51:00 +05:30
Nabin Hait	c642f76a4d	Fixed merge conflict	2017-02-27 14:40:53 +05:30
robert schouten	4766562ff0	fix typo on get product bundle	2017-02-27 13:30:18 +08:00
Ben Cornwell-Mott	08c1e86b1c	Moved link button. Creates new row for unlinked quantities	2017-02-25 23:16:54 -08:00
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
mbauskar	d6e409ea92	[minor] hide recurring section if document is in __local state	2017-02-22 18:22:14 +05:30
Kanchan Chauhan	f2803ac427	[Fix] Throw error if item is added multiple time	2017-02-22 10:40:38 +05:30
Nabin Hait	fd3ec066ce	Added fields in global search	2017-02-20 13:38:31 +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
Ben Cornwell-Mott	28945438f2	Created button to link buying items to material requests	2017-02-05 18:55:57 -08:00
Rushabh Mehta	587dd90182	[minor] removed customer status	2017-02-01 12:01:24 +05:30
Rushabh Mehta	87037bdd56	[minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568	2017-01-30 13:22:51 +05:30
mbauskar	51b1d6de48	[minor] moved the address_and_contact utils to frappe	2017-01-30 10:45:28 +05:30
mbauskar	83f4780f74	[Fixes] Address and Contact fixes	2017-01-30 10:45:28 +05:30
mbauskar	8271b4c564	[minor] fixes in address filters	2017-01-30 10:45:28 +05:30
mbauskar	cbc49e2989	[WIP] Address and Contact Fixes	2017-01-30 10:45:28 +05:30
Nabin Hait	9e294ee454	Merge branch 'rfq_supplier_pull' into develop	2017-01-17 12:26:09 +05:30
Nabin Hait	2ad62c2892	In RFQ, get items from material requests based on possible supplier	2017-01-17 12:25:33 +05:30
Rushabh Mehta	8d39fd9790	[fix] address queries + tests	2017-01-16 13:06:15 +05:30
Rushabh Mehta	95439db53f	[fixes] address and contact	2017-01-14 00:25:22 +05:30
Rushabh Mehta	b92087cb2d	[cleanup] move contact, address to frappe 💥	2017-01-13 18:54:47 +05:30
Ben Cornwell-Mott	1cd7e54822	Adds button to find MRs linked to Supplier	2017-01-11 03:05:49 -08:00
Nabin Hait	6e9d2a3c1f	fixed conflict	2017-01-09 17:21:34 +05:30
Nabin Hait	a9b9edd9bc	Merge pull request #7392 from frappe/bcornwellmott-patch-2 ... Fix number of digits on report	2017-01-09 15:48:04 +05:30
bcornwellmott	34e34ed1e8	Trigger Restart of build checks	2017-01-06 17:21:16 -08:00
Nabin Hait	91621639e8	Reload in_standard_filter property	2017-01-06 12:54:16 +05:30
bcornwellmott	a3e7c38734	Fix number of digits on report ... Currently the cells can show many digits.	2017-01-05 09:44:18 -08:00
Nabin Hait	59a67c3586	Update supplier_quotation.py	2017-01-05 14:58:30 +05:30
bhupen	107099aac9	you can make quotation from supplier quotation	2017-01-04 17:04:12 +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
Kanchan Chauhan	b7cc393eb8	Email ID renamed to Email Address	2017-01-03 16:45:38 +05:30
Rushabh Mehta	985cb8226d	[minor] dont get warehouse in opening entry #7353	2016-12-30 15:06:54 +05:30
Rushabh Mehta	e60c2c7b7a	[minor] dashboard cleanups	2016-12-27 12:14:37 +05:30
Nabin Hait	58667ab123	Fixed merge conflict	2016-12-09 15:49:24 +05:30
Nabin Hait	76a8508d2b	Unlink Quality Inspection from PR while cancelling QI	2016-12-09 15:09:11 +05:30
Nabin Hait	8e885163a3	Update quoted_item_comparison.py	2016-12-09 12:17:45 +05:30
Nabin Hait	ad4f1c7fd1	date is optional in get_exchange_rate	2016-12-09 12:14:47 +05:30
Kanchan Chauhan	5c031a3512	[Fix] Quoted Item Comparison	2016-12-08 17:29:04 +05:30
Nabin Hait	1cc55fbbcb	Fixed merge conflict	2016-12-08 14:09:23 +05:30
Rushabh Mehta	323c06ebbf	[minor] rename icons as per FontAwesome 4 (#7136)	2016-12-05 14:17:26 +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
KanchanChauhan	49a50fef63	Group same item in SO print (#6959)	2016-11-18 13:57:53 +05:30
Manas Solanki	34feab1b25	[Fix] Redesign of quality inspection doctype	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
rohitwaghchaure	7be942db54	[Fix] Status updater for sales order in purchase order (#6944)	2016-11-16 11:14:32 +05:30
Rushabh Mehta	13fc52d713	[minor] added default standard filters (#6854)	2016-11-07 17:19:19 +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
Rohit Waghchaure	0d2f7e62c0	set remember last selected value as true for company field	2016-11-03 16:19:34 +05:30
bcornwellmott	3af67fb2c3	Fix syntax	2016-10-31 08:53:37 -07:00
bcornwellmott	8d083f0d10	[fix] Change communication to Linked ... Currently, the Request for Quotation emails are not linked to the RFQ document. This resolves that issue. https://discuss.erpnext.com/t/open-communications-for-rfq/17184	2016-10-31 06:54:01 -07:00
Shreyas Patil	6c7d6e095b	Update purchase_order_item.json	2016-10-26 12:47:35 +05:30
shreyas	fd04d62c2e	[Minor] Added expected_delivery_date to purchase order item doctype	2016-10-26 12:38:31 +05:30
shreyas	99e063f831	[Fix] Make purchase order item reqd_date modifiable after submit	2016-10-25 12:44:27 +05:30
Kanchan Chauhan	cce16b29b0	Group similar items in PO	2016-10-20 14:31:34 +05:30
Nabin Hait	fa1cdd5bf0	Fixed merge conflict	2016-10-18 15:37:33 +05:30
Nabin Hait	f32547a414	Merge pull request #6637 from nabinhait/cost_center_fix ... Set cost center while creating invoice from SO/PO	2016-10-18 15:18:16 +05:30
Rushabh Mehta	17f6874450	[minor] [fix] doctype_dasboard.py files, move data to get_data	2016-10-18 14:54:39 +05:30
Nabin Hait	55a8797919	Set cost center while creating invoice from SO/PO	2016-10-18 14:54:17 +05:30
Rohit Waghchaure	a26f685b9f	[Enhancement] Added supplier quotation link on rfq	2016-10-05 15:04:50 +05:30
Neil Trini Lasrado	3da7354ba4	removed supplier role from Request for Quotation	2016-09-29 11:57:23 +05:30
Rushabh Mehta	2d4f3bb04a	[fix] space	2016-09-22 15:17:04 +05:30
Nabin Hait	be4c527453	Merge pull request #6426 from rohitwaghchaure/supplier_portal_enhancement ... [Enhancement] Supplier quotation added on supplier portal	2016-09-21 18:41:21 +05:30
Rohit Waghchaure	a7e3d11077	[Fix] Image is copied when duplicate supplier, employee	2016-09-21 18:13:16 +05:30
Rohit Waghchaure	21499e820d	[Enhancement] Supplier quotation added on supplier portal	2016-09-21 17:07:25 +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
Rushabh Mehta	559aa3ab7c	[enhance] show customer, supplier billing and outstanding, fixes #6078	2016-09-19 16:04:58 +05:30
Rushabh Mehta	bd15e31ea1	[minor] [enhance] fixes #6222	2016-09-19 15:27:09 +05:30
Chude Osiegbu	3c6a937a7c	Merge branch 'develop' into exchange_rate_modifications	2016-09-18 21:47:55 +01:00
Kanchan Chauhan	d1d129edf0	Actual Qty added to Material Request Item	2016-09-19 00:22:37 +05:30
Rohit Waghchaure	00295f2b8d	make supplier quotation from opportunity	2016-09-14 15:36:40 +05:30
Ben Cornwell-Mott	8d0b826840	Added supplier quotation filter for Quoted Item Comparison	2016-09-09 08:00:54 -07:00
Chude Osiegbu	fbf27b5031	Further corrections to Currency Exchange table	2016-09-07 03:06:08 +01:00
Rohit Waghchaure	b44efef094	[Issue] Fixed, supplier quotation item uom conversion	2016-09-06 17:21:38 +05:30
Rohit Waghchaure	560ba391f9	[Enhancement] Purchase return for rejected qty	2016-09-05 00:43:17 +05:30
Kanchan Chauhan	dd96cbd012	Coded column deleted, column added from UI	2016-08-26 14:32:38 +05:30
Rushabh Mehta	fcb793e4dd	[minor] language fields are now links	2016-08-23 16:51:18 +05:30
Nabin Hait	33bcaa8a07	Merge pull request #6080 from bcornwellmott/quoteditem_picksupplier ... Quoted Item Comparison: Button for setting the default_supplier	2016-08-17 11:36:55 +05:30
Rushabh Mehta	d973c1606a	[revert] is_sales_item, is_purchase_item back	2016-08-16 11:32:08 +05:30
Ben Cornwell-Mott	b739dd24b2	Added a button to assist in setting the default_supplier	2016-08-11 19:45:55 -07:00
Rushabh Mehta	6646960e31	Merge pull request #6045 from bcornwellmott/quotereportcurrency ... Quoted item currency	2016-08-10 14:26:25 +05:30
Rushabh Mehta	6252e935a0	Merge pull request #5844 from bcornwellmott/quoteditemplot-1 ... Added C3.JS Plot to compare quotes in Print view	2016-08-10 12:50:36 +05:30
Ben Cornwell-Mott	44f85fed26	Converted to a common currency (company)	2016-08-07 10:29:51 -07:00
Rohit Waghchaure	b77a1057ce	fixes and cleanups.	2016-08-06 12:45:02 +05:30
Nabin Hait	981f6ea34e	minor fix for item and employee link formatter	2016-07-31 11:44:43 +05:30
Nabin Hait	7bae70a993	[fix] Show supplier name field if it is different from supplier id	2016-07-28 17:19:35 +05:30
Ben Cornwell-Mott	590d2d524b	Updated html file to use c3.js instead of Google Charts	2016-07-25 18:03:01 -07:00
Rushabh Mehta	6c3ac9587e	[fix] quick entry	2016-07-25 15:03:39 +05:30
Ben Cornwell-Mott	fe11e71084	Removed hover tooltip	2016-07-22 10:02:41 -07:00
Ben Cornwell-Mott	2c76aec119	Added Google Chart to compare quotes in Print view	2016-07-22 09:56:29 -07:00
Rushabh Mehta	29517d0b8c	[fix] purchase order dashboard	2016-07-22 21:01:39 +05:30
Ben Cornwell-Mott	99e03f2371	Added new report for Supplier Quotation comparisons	2016-07-21 13:03:58 -07:00
Rushabh Mehta	5a39d41a0c	[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792	2016-07-20 22:53:23 +05:30
Rushabh Mehta	76b134192f	[fix] grid columns now restricted to 10	2016-07-18 14:30:27 +05:30
Rushabh Mehta	176b63b354	[fix] remove first row on mapping, fixes #5707	2016-07-14 17:43:48 +05:30
Rushabh Mehta	3ce24d64c2	[cleanup] payment entry form view	2016-07-11 16:08:46 +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	a9d3981c86	[fix] Condition for visibility of 'Get Items from Open Material Requests' in PO	2016-07-07 11:34:34 +05:30
Rohit Waghchaure	f154c611bb	[Fixes] RFQ contact and multiple creation of supplier quotation issue	2016-07-06 17:26:15 +05:30
Rohit Waghchaure	a71d9d33af	Rename prevdoc field in purchase order and purchase receipt doctype	2016-07-06 12:13:29 +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
Nabin Hait	13093b4b68	Make payment entry aginst order, payment request and patch to rename advance table fields	2016-07-04 11:42:24 +05:30
Nabin Hait	28a0528ae4	Advance Payment Entry adjustment against Invoice	2016-07-04 11:42:04 +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	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
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
Rushabh Mehta	cfb81205b3	Merge pull request #5612 from shubham7saxena/rfq-sidebar ... [minor][bug fix]added sidebar visibility to request for quotation link	2016-06-30 14:39:55 +05:30
shubham7saxena	778184e5e0	added sidebar visibility to request for quotation link	2016-06-30 14:27:28 +05:30
Rohit Waghchaure	a314872cb5	[RFQ] Enhancement and minor fixes	2016-06-30 02:26:02 +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
Nabin Hait	4cc7bcc412	Merge pull request #5495 from bcornwellmott/patch-3 ... Add "Get items from Material Request"	2016-06-25 13:58:50 +05:30
Rushabh Mehta	8a065e0028	[rename] Bulk Email to Email Queue	2016-06-22 12:58:39 +05:30
Nabin Hait	a531ebea8a	Merge branch 'master' into develop	2016-06-21 16:44:05 +05:30
Umair Sayyed	5918dc87f3	small fixes	2016-06-17 12:28:21 +05:30
bcornwellmott	9af68078f6	Add "Get items from Material Request" ... Allows users to pull items from multiple Material Requests into a Request for Quotation	2016-06-16 14:10:57 -07:00
Rushabh Mehta	d1eba515e9	[cleanup] fixes to v7	2016-06-13 17:47:13 +05:30
Anand Doshi	7f8142d30d	[fix] reuse user.reset_password in RFQ	2016-06-13 17:23:18 +05:30
Rushabh Mehta	dd7524f844	[minor] msgprint as alert	2016-06-12 11:16:23 +05:30
Rushabh Mehta	538607e6b6	[cleanup] a better message for insufficient stock	2016-06-12 11:03:00 +05:30
Rohit Waghchaure	2dd26055c9	[Fix] Shipping address's get_query not working on autocomplete.	2016-06-11 01:48:00 +05:30
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
Nabin Hait	9f98296c9c	minor fix	2016-06-01 16:21:43 +05:30
Nabin Hait	9a5cf6000e	[fix] Test cases and editable fields settings for request for quotation	2016-06-01 12:54:26 +05:30
Rushabh Mehta	aa60fd9037	[fix] new_doc to frappe.new_doc	2016-06-01 11:46:33 +05:30
Nabin Hait	b46d021f2a	Charts on reports / activity page, deprecated financial analytics report	2016-05-26 15:26:01 +05:30
Rohit Waghchaure	bc894428ca	Added today as default in transaction.	2016-05-23 15:22:36 +05:30
Rohit Waghchaure	6c60c164f1	[Fixes] material request's editable fields overriding with purchase common	2016-05-20 14:03:09 +05:30
Rushabh Mehta	532eedf411	[enhance] more editable grids	2016-05-19 18:22:49 +05:30
Rohit Waghchaure	29c7876e87	[Fixes] RFQ minor fixes	2016-05-11 19:38:29 +05:30
Anand Doshi	e00a20d99d	Merge pull request #5284 from kickapoo/develop ... Add (optional) Country field to Buying.Supplier DocType (fixes #5223)	2016-05-09 16:58:30 +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
Stavros Anastasiadis	5bd40db0ba	Add (optional) Country field to Buying.Supplier DocType (fixes #5223) ... Most companies have a headquarter country;	2016-04-28 18:06:45 +03:00
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	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
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	130c57b201	[fixes] code clean-up	2016-04-18 15:58:43 +05:30
Saurabh	4bd34a58ba	[fixes] fix perpetual inventory	2016-04-18 15:57:55 +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
Rushabh Mehta	0e2dd859b0	[cleanup] link dashboard for customer, supplier, item, employee and hide form by default	2016-04-13 17:22:09 +05:30
Rushabh Mehta	8bbca6fa2e	[enhancement] links menu in customer, supplier, item	2016-04-12 19:16:33 +05:30
Rushabh Mehta	5d0e8dee11	[fix] dashboard for customer, supplier	2016-04-11 17:34:49 +05:30
Rohit Waghchaure	b2e7a1f605	[Fix] Default letter head	2016-04-11 17:30:44 +05:30
Rushabh Mehta	f16f9c569b	[enhancement] add status in customer, supplier	2016-04-08 17:21:00 +05:30
Anand Doshi	e6e7cd90c9	Merge pull request #5143 from KanchanChauhan/somefixes ... [Minor Fixes] Findings in setting up erpnext	2016-04-08 16:20:11 +05:30
Kanchan Chauhan	017d30f465	[Minor Fixes] Findings in setting up erpnext	2016-04-06 19:28:50 +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