brotherton-erpnext

Author	SHA1	Message	Date
Deepesh Garg	15ff6a594b	feat: Inter warehouse stock transfer on valuation rate with taxation (#20083 ) * fix: Validation for target warehouse * feat: Get items on valuation rate in delivery note on Internal transfers * fix: Create Inter company purchase receipt from delivery note * feat: Inter company stock transfer on valuation rate with taxation * fix: Add from warehouse in purchase invoice * fix: Use get_value instead of get_cached_value * fix: Get incoming rate instead of valuation rate * fix: GL entry for from warehouse in purchase receipt * fix: GL Entries fixes in purchase invoice * fix: Address and tax fetching fixes * fix: Add test case for stock transfer via purchase receipt * fix: Code cleanup, added validations and test cases * fix: Validation for supplier warehouse * fix: Test Cases * fix: Change validation condition * fix: Address fixes while creating Purchase Receipt from delivery note * fix: Set taxes while creating Purchase Receipt from Delivery Note * fix: Update set_missing_value function Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-18 12:28:41 +05:30
marination	e143983819	fix: Stock Quantity not calculated on client side in Material Request Items.	2020-02-18 10:51:54 +05:30
Marica	db00270895	feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371 ) * feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order * fix: Query with filters, UX enhancements and cleanup	2020-02-17 15:58:08 +05:30
vishal	998de83d48	fix: filter serial no based on batch no	2020-02-11 12:24:44 +05:30
Parth Kharwar	2bccd7f717	fix: rename breadcrumb for Brand DocType from Selling to Stock	2020-01-30 12:12:42 +05:30
Rohit Waghchaure	067e8ad50d	fix: add serial no button not working	2020-01-23 15:49:39 +05:30
Nabin Hait	50cb49cb00	fix: Don't fetch price list rate on change of qty (#20363 )	2020-01-21 13:04:21 +05:30
Don-Leopardo	ccdf19314d	fix: min_qty and valid_from for the price selection (#20217 )	2020-01-09 12:24:43 +05:30
Deepesh Garg	ef0d26c161	feat: Validity for Item taxes (#20135 ) * feat: Validity for Item taxes * fix: Trigger for gst hsn code * fix: Sort taxes based on validity * fix: Validation for item tax template and filters based on validity * fix: Add missing semicolon * fix: Validate tax template only if item code available * fix: Do not validate or filter item tax template if no item taxes applied * fix: Consider item group for validating taxes * fix: Test cases for item tax validation * fix: Item tax template filtering fixes * fix: Add missing semicolon * fix: Remove unnecessary query	2020-01-06 15:34:15 +05:30
Rohit Waghchaure	660a78b877	fix: ignore pricing rule for other item group	2020-01-02 17:31:09 +05:30
Mangesh-Khairnar	cca6fb2794	Merge branch 'develop' into publish-item	2019-12-27 12:55:28 +05:30
Rohan	e944f7ac05	fix: Add Serial No button prompt (#20099 )	2019-12-27 12:34:36 +05:30
Nabin Hait	8f3fea63b1	Merge branch 'develop' into publish-item	2019-12-27 12:19:02 +05:30
Mangesh-Khairnar	d19bd8f0dd	Merge branch 'develop' into publish-item	2019-12-25 22:10:33 +05:30
Nabin Hait	f32fc230f7	fix: rounding adjustment while both inclusive tax and discount amount present	2019-12-25 14:01:38 +05:30
Rohan	7372672044	fix: pull serial numbers linked to batches + pull warehouse correctly (develop) (#19022 ) * fix: pull serial numbers according to set warehouses * fix: handle purchase returns	2019-12-24 18:19:58 +05:30
DeeMysterio	df3b4e48fe	fix(adress): get the address title at the top and mandatory in display (#20074 )	2019-12-24 18:10:18 +05:30
Mangesh-Khairnar	7a5b9a7bbe	fix: translations and route fixes	2019-12-24 17:39:15 +05:30
Saqib	0ad7449ae3	feat: allow adding & deleting of items in submitted SO & PO (#19911 ) * feat: allow adding of items after quotation submission * feat: allow deletion of items from submitted SO & PO * fix: case when items are added and deleted at once * fix: add test cases * For deletion of items while Updating Items after submitting PO & SO	2019-12-24 16:42:30 +05:30
Deepesh Garg	58408217f6	Merge pull request #19822 from Mangesh-Khairnar/edit-item-details feat(marketplace): edit item details	2019-12-24 13:02:20 +05:30
Prssanna Desai	4f72c0b8b5	fix: wrong items in table being deleted (#19994 )	2019-12-23 18:27:12 +05:30
Marica	93cb64ee30	enhancement`: Added Set Reserve Warehouse field in Purchase Order. (#19991 )	2019-12-23 18:24:56 +05:30
Rucha Mahabal	0e83a5754b	fix: remove illustrations from onboarding slides (#19872 ) * fix: remove illustrations from onboarding slides * fix: change Welcome slide's description * fix: justify text in slide	2019-12-23 08:24:46 +05:30
Mangesh-Khairnar	c1a1e7d503	style: formatting changes	2019-12-19 20:11:37 +05:30
Rohit Waghchaure	2ae79b8ac2	fix: Pricing Rule Discount for Product	2019-12-18 17:53:21 +05:30
Rohit Waghchaure	21fe97e723	fix: pricing rule not working for production discount	2019-12-16 11:15:53 +05:30
Deepesh Garg	d10cefa37e	Merge pull request #19893 from marination/rounded_total fix: Disable Rounded Total always showing field default value	2019-12-11 18:40:56 +05:30
marination	ca6dbad7cb	fix: Disable Rounded Total always showing field default value	2019-12-11 12:10:05 +05:30
Deepesh Garg	6e2c13f4c8	feat(regional): Auto state wise taxation for GST India (#19469 ) * feat(regional): Auto state wise taxation for GST India * fix: Update gst category on addition of GSTIN * fix: Codacy and travis fixes * fix: Travis * fix(test): Update GST category only if GSTIN field available * fix: Test Cases * fix: Do not skip accounts if place of supply is not present * fix: Auto GST taxation for SEZ Party types * fix: Automatic taxation for multi state * fix: Codacy and travis fixes * fix: Auto GST template selection in Sales Order * fix: Move inter state check and source state to tax category * fix: Remove unique check from tax template * fix: Remove unique check from tax template * fix: Address fetching logic in Sales * fix: fecth tax template on company address change * fix: fetch company gstin on address change * fix: company_gstin set value fix * fix: Mutiple fixes and code refactor * fix: Add missing semicolon * fix: Company address fetching in sales invoice * fix: Remove print statement * fix: Import functools * fix: Naming fixes and code cleanup * fix: Iteritems compatibility for python 3	2019-12-10 15:55:05 +05:30
Mangesh-Khairnar	0cb2783f80	fix: create unpublish log on the hub	2019-12-09 19:24:29 +05:30
Deepesh Garg	88c4514024	Merge pull request #19864 from nextchamp-saqib/report-col-fix fix: column data not visible after manual selection of columns	2019-12-09 17:57:12 +05:30
Mangesh-Khairnar	ba48546678	fix: display new item value	2019-12-09 16:31:14 +05:30
Mangesh-Khairnar	d249d4c947	style: change formatting	2019-12-09 15:44:31 +05:30
Faris Ansari	317bf5a321	feat(marketplace): Add category wise search (#19760 ) feat(marketplace): change route for category wise search	2019-12-09 13:59:30 +05:30
Rucha Mahabal	690068142b	feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813 ) * feat: added illustrations for onboarding * refactor: change help label for supplier * refactor (breaking): rename Setup Wizard slide to Onboarding Slide * chore: code cleanup for the old doctype Setup Wizard Slide * fix: added a 'Continue' type slide * fix: change text in continue slide * fix: change text for continue slide	2019-12-06 20:58:26 +05:30
Mangesh-Khairnar	6d4f4bef7e	fix(marketplace): autocomplete hub category	2019-12-05 01:01:01 +05:30
Mangesh-Khairnar	e4274cbfa6	fix: change formatting	2019-12-04 17:51:08 +05:30
ronelvcabrera	370cdc0170	feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612 )	2019-12-04 16:07:11 +05:30
Mangesh-Khairnar	fa170e3c84	fix(marketplace): add watcher for route change to fetch new items	2019-12-04 15:59:17 +05:30
thefalconx33	a639f16dc9	fix: column data not visible after manual selection of columns	2019-12-04 09:46:42 +05:30
Mangesh-Khairnar	c131bd1b25	feat(marketplace): edit item dialog	2019-12-02 01:09:59 +05:30
Mangesh-Khairnar	ad66677029	fix: add conditional message in template string	2019-11-29 23:59:02 +05:30
Mangesh-Khairnar	8287c3d05a	feat(marketplace): unpublish item from hub	2019-11-29 15:52:29 +05:30
Mangesh-Khairnar	2597817cde	fix: add new routes to handle category wise search	2019-11-28 18:57:42 +05:30
Rucha Mahabal	58928e8eae	Merge branch 'develop' into setup_wizard	2019-11-27 11:55:53 +05:30
Mangesh-Khairnar	647331bbd7	feat: add search in category	2019-11-25 13:56:00 +05:30
Nabin Hait	1ed1c4e6a4	fix: make journal entry to sync stock and account balance	2019-11-25 12:33:40 +05:30
Rucha Mahabal	00677f334e	fix: user progress code cleanup	2019-11-25 11:58:14 +05:30
Nabin Hait	aff4a67954	Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error	2019-11-22 15:14:32 +05:30
Rucha Mahabal	3cf2c2b3d5	feat: slides for onboarding wizard in ERPNext	2019-11-21 20:47:08 +05:30
rohitwaghchaure	a85ddf2fb4	fix: performance issue of sales invoice while save/submit (#19598 ) * fix: performace issue of sales invoice while save/submit * Cached price list data, item group child data, added indexing for blanket order	2019-11-19 18:47:48 +05:30
marination	6ef057a2a3	fix: Prefilled JV via Account Balance and Stock Value mismatch error message - Make JV button will route to Journal Entry and add rows in child table	2019-11-18 15:55:32 +05:30
Marica	29a2e16f62	fix: Add Serial No. button not responding (#19550 )	2019-11-12 14:43:41 +05:30
rohitwaghchaure	5d0362669d	Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch fix: not able to select the zero qty batch while making the sales ret…	2019-10-23 18:35:58 +05:30
Rohit Waghchaure	d8ddd1e2ec	fix: not able to select the zero qty batch while making the sales return entry	2019-10-22 14:05:13 +05:30
Rohit Waghchaure	a20fb650fe	code cleanup	2019-10-15 14:42:09 +05:30
ashish-greycube	74dc3c99de	feat: coupon_code and referral_sales_partner functionality	2019-10-15 11:44:45 +05:30
Faris Ansari	38ac7f7350	Enhancements to Supplier Portal (#19221 ) * fix: Add Purchase Order to portal * fix: Create Customer or Supplier on first login Based on default role set in Portal Settings, a Customer or Supplier will be created when the user logs in for the first time. * fix: Styling for transaction_row * fix: Styling for RFQ page * fix: Add Purchase Invoice route - Make Purchase Invoice from PO * fix: minor - Admissions for Student role - Remove print statement	2019-10-09 11:41:33 +05:30
Himanshu Warekar	46831c4c20	fix: show mobile no	2019-09-30 14:34:56 +05:30
Rohit Waghchaure	1f9a84f165	fix: removed mandatory property for address field in quick entry	2019-09-20 12:18:23 +05:30
Faris Ansari	8beca68948	feat: Scan Barcode using Camera in mobile (#19033 ) * feat: Scan Barcode using Camera in mobile * fix: Use input-group for scan button * fix: Muted camera button	2019-09-16 15:20:10 +05:30
Rucha Mahabal	2818b5bbe7	fix: 'link to material request' button not showing any message if no Material Request found (#19064 )	2019-09-16 15:16:38 +05:30
Suraj Shetty	cdce6c746f	fix: Make -> Create	2019-09-12 22:04:49 +05:30
Mangesh-Khairnar	7bcb24efbf	fix(purchase-invoice): Update paid amount on creation of debit note (#18830 ) * fix(purchase-invoice): set paid amount for purchase return * fix(purchase-invoice): remove payment schedule on creation of debit note	2019-09-11 10:49:33 +05:30
Suraj Shetty	0254217314	fix: Make address fields mandatory (#18979 )	2019-09-10 14:07:05 +05:30
Anurag Mishra	ac0c1edd23	feat: added date filter based on billing date and based date (#18936 )	2019-09-06 12:10:10 +05:30
Himanshu	fffdb6f575	feat(Contacts): Multiple Emails in a Contact (#18675 ) * feat: render multiple addresses * feat: move to newer contacts structure * fix: iterate over valid variable * fix: use primary label instead of bold letters * fix: call popup get contact name from number * fix: make contact structure call popup compatible * fix: query * fix: add city, state and country * fix: display address * fix: get address in single line * fix: review fixes * fix: translation strings * fix: fix query for contacts * fix: remove references of mobile_no	2019-09-02 15:57:45 +05:30
Sahil Khan	5f2c030ddc	Merge branch 'version-12-hotfix' into merge_v12_hotfix_1	2019-08-20 16:22:49 +05:30
deepeshgarg007	0a2ed6da37	fix: Add missing semicolon	2019-08-16 15:50:17 +05:30
deepeshgarg007	8d0b6f9a60	fix: Handling if no default dimension exists	2019-08-16 14:00:26 +05:30
deepeshgarg007	2fb6bc9867	fix: Default dimensions in child doctypes	2019-08-15 17:06:32 +05:30
Suraj Shetty	b282f1f154	Merge branch 'develop' into refactor-call-popup	2019-08-09 18:18:17 +05:30
rohitwaghchaure	ed6fb66a90	Merge pull request #18679 from Anurag810/get-item-from-product-bundle fix: get item from product bundle	2019-08-09 15:17:42 +05:30
Anurag Mishra	8d4b04e719	fix: get item from product bundle	2019-08-09 14:34:09 +05:30
Anurag Mishra	24c3b4e00f	fix: get item from product bundle	2019-08-09 13:27:59 +05:30
Suraj Shetty	0957480305	fix: Show popup to employees with same phone number	2019-08-05 11:32:51 +05:30
Suraj Shetty	35c4b78e66	Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup	2019-08-04 22:23:03 +05:30
Rohit Waghchaure	dadd049cbf	fix: add serial no button not working for the delivery note	2019-08-02 19:11:31 +05:30
Deepesh Garg	d301d26fda	fix: Enhancement in credit note (#18511 ) * fix: Credit note enhancement * Fix: Print format for Sales Invoice Return * fix: Zero quantity validation fix for credit note	2019-07-31 15:58:19 +05:30
Deepesh Garg	b65c761b16	fix: Enhancement in credit note (#18510 ) * fix: Credit note enhancement * Fix: Print format for Sales Invoice Return * fix: Zero quantity validation fix for credit note	2019-07-31 15:58:01 +05:30
deepeshgarg007	f37fb82069	fix: Code cleanup	2019-07-29 12:14:49 +05:30
deepeshgarg007	82661372f7	fix: Add accounting dimensions to subscription and opening invoice tool	2019-07-29 12:14:49 +05:30
deepeshgarg007	f1f79ff1e1	fix: Remove dimensions from boot	2019-07-29 12:14:49 +05:30
deepeshgarg007	7d270edf79	fix: Added default dimension and filter in bootinfo	2019-07-29 12:14:49 +05:30
deepeshgarg007	b590f89310	fix: Default Accounting Dimensions in doctypes	2019-07-29 12:14:49 +05:30
deepeshgarg007	ec421df4e4	fix: Code cleanup	2019-07-29 08:58:56 +05:30
deepeshgarg007	dda6b5cd53	fix: Add accounting dimensions to subscription and opening invoice tool	2019-07-26 09:14:42 +05:30
deepeshgarg007	6dd5f74671	fix: Remove dimensions from boot	2019-07-26 09:14:42 +05:30
deepeshgarg007	ada1ac8013	fix: Added default dimension and filter in bootinfo	2019-07-26 09:14:42 +05:30
deepeshgarg007	efd6307bc4	fix: Default Accounting Dimensions in doctypes	2019-07-26 09:14:42 +05:30
Suraj Shetty	4177ecb6b2	Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup	2019-07-22 15:18:03 +05:30
Rucha Mahabal	65a627cb5b	fix: module changes for Auto Repeat from Desk to Automation (#18356 )	2019-07-17 13:50:32 +05:30
Suraj Shetty	f5dd494716	fix(call popup): Multiple changes - Remove summary from call log use comments instead - Add contact and lead if matched to the call log - Add received by field with Employee Link - DocPerm to allow Employees to have read access on call log - Remove unwanted code - Add a method to get lead just by providing phone number - Show popup only to Employee to which the system is trying to connect. - Remove custom code from call popup dialog and replace it with standard fields - Increase timeout to hide popup after the call has been disconnected.	2019-07-16 11:07:25 +05:30
Deepesh Garg	ce3594796c	Merge pull request #18320 from deepeshgarg007/quo_opp_address_fix_develop fix: Address fixes in quotation and opportunity	2019-07-16 08:42:18 +05:30
rohitwaghchaure	e9f0e88f9b	fix: taxes sequence if shipping rule is set in the sales invoice (#18329 )	2019-07-15 18:57:25 +05:30
Nabin Hait	868766ddf0	refactor: Refactored over delivery/receipt/billing fields (#17788 ) * refact: Refactored over delivery/receipt/billing fields * fix: test case	2019-07-15 18:02:58 +05:30
deepeshgarg007	d5fcab5f81	fix: Set taxes fix for lead	2019-07-15 12:44:11 +05:30
Suraj Shetty	ef1d0d1d14	Merge branch 'develop' into breadcrumbs-module-map-2	2019-07-11 15:02:42 +05:30
Nabin Hait	fca86c48c8	fix: Revert #frappe/erpnext/17896 (#18251 )	2019-07-11 14:39:24 +05:30
rohitwaghchaure	4870e95b83	fix: po, rate set as zero against the item (#18242 )	2019-07-11 10:03:35 +05:30
Suraj Shetty	7837fbe231	style: Add missing semicolon	2019-07-10 19:39:40 +05:30
Faris Ansari	a7a6987c42	fix: Add Shopping Cart and Contacts	2019-07-10 19:27:57 +05:30
Faris Ansari	ab46f0f5bb	fix: Add module map for breadcrumbs	2019-07-10 19:27:44 +05:30
Suraj Shetty	838697261d	fix: Call popup avatar Avoid getting session users image if customer doc has no image	2019-07-10 10:39:43 +05:30
Deepesh Garg	62911ec198	Merge pull request #18206 from Anurag810/sending_sms_from_quotation fix: sending sms from quotation	2019-07-10 09:18:43 +05:30
Anurag Mishra	e9dd9b842e	Update erpnext/public/js/sms_manager.js Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2019-07-09 17:54:00 +05:30
deepeshgarg007	890ea195f3	fix: Tree filter fixes for erpnext dimensions	2019-07-09 16:56:56 +05:30
Anurag Mishra	de13faf19a	fix: sending sms from quotation	2019-07-09 14:27:20 +05:30
deepeshgarg007	6bb5ade667	fix: Add accounting dimensions to various reports and fixes	2019-07-07 21:24:45 +05:30
karthikeyan5	7fc6021ca5	feat(setup): adding selling buying filter in terms and conditions	2019-07-04 22:46:16 +05:30
rohitwaghchaure	03db4c0efc	Merge pull request #18166 from netchampfaris/send-sms-bom fix: Don't show Send SMS in BOM	2019-07-04 19:11:42 +05:30
Faris Ansari	a5d975d867	fix: Don't show Send SMS in BOM	2019-07-04 17:47:28 +05:30
Anurag Mishra	841d852f41	refactor: added missing translation functions (#18143 ) * fix: Translating Error and Messages * Update erpnext/controllers/item_variant.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com> * Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>	2019-07-03 15:15:08 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997 ) * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Deepesh Garg	78a86af7fd	fix: Fiter passing fix in get batch query (#18131 )	2019-07-02 10:10:55 +05:30
Mangesh-Khairnar	fc3731f15e	Merge pull request #18107 from Mangesh-Khairnar/mapped_doc_fix fix: clear duplicates in mapped doc	2019-07-01 17:04:12 +05:30
Suraj Shetty	502565ff56	fix: Make required changes	2019-07-01 14:28:59 +05:30
Suraj Shetty	19e4fde737	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-06-30 15:30:59 +05:30
Mangesh-Khairnar	e493490702	fix: mapped doc	2019-06-28 19:22:51 +05:30
Himanshu	ea4c42d47b	fix(Utils): Do not add duplicate items (#17896 ) * fix: do not add duplicate items * Update erpnext/public/js/utils.js Co-Authored-By: Rohan <Alchez@users.noreply.github.com> * fix: compare warehouses, batch and qty for an item * fix: code fixes * Update utils.js * fix: check required_date and delivery_date * Update utils.js * fix: mixed tabs and spaces	2019-06-28 14:13:13 +05:30
Deepesh Garg	fb29ffc90c	fix: Usability fixes to Serial No and batch selector (#18071 ) * fix: Usability fixes to Serial No and batch selector * fix: Codacy * Update sales_common.js	2019-06-28 14:08:08 +05:30
Mangesh-Khairnar	3b60fac3b7	fix: open department in tree view via awesome bar	2019-06-27 11:43:22 +05:30
Deepesh Garg	d11e481888	Merge pull request #18011 from surajshetty3416/fix-accounting-dimension-permission fix: Get Accounting Dimension only if user has read permission on it	2019-06-20 19:44:59 +05:30
Suraj Shetty	01f56b867e	fix: Return empty array to avoid failure	2019-06-20 18:07:58 +05:30
Suraj Shetty	b663966c68	fix: Use can_read API	2019-06-20 18:00:19 +05:30
Rushabh Mehta	55c7b69afb	Merge pull request #17998 from netchampfaris/app-logo-url fix: App logo URL	2019-06-20 17:53:40 +05:30
Suraj Shetty	da629810ad	fix: Get accounting dimensions only if user has access	2019-06-20 17:20:19 +05:30
Faris Ansari	357592f55e	fix: Remove logo replace logic	2019-06-19 19:17:50 +05:30
rohitwaghchaure	d849ce7ce0	Merge pull request #17980 from adityahase/fix-buying-items-rate fix: Consider discount_amount only when provided to calculate rate	2019-06-19 14:47:06 +05:30
Faris Ansari	2632107129	fix: User MultiSelectList control for Party filter (#17943 ) * fix: User MultiSelectList control for Party filter The comma based filter wouldn't work for values that had comma in them * fix: Replace with MultiSelectList in reports * fix: Parse json instead of string split	2019-06-19 12:15:37 +05:30
Aditya Hase	48585c94ff	fix: Consider discount_amount only when provided to calculate rate After selecting item_code in items table and not entering rate, Clicking elsewhere will set rate to NaN. All DocTypes on buying side have this bug.	2019-06-18 19:11:17 +05:30
Suraj Shetty	5b52aba8df	Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog	2019-06-18 11:28:20 +05:30
Suraj Shetty	a28b96493f	fix: Make field labels translatable	2019-06-18 11:28:14 +05:30
Suraj Shetty	a367a85a78	Merge branch 'develop' into call-summary-dialog	2019-06-18 11:09:29 +05:30
deepeshgarg007	946eefe039	fix: Codacy fixes	2019-06-17 23:10:36 +05:30
deepeshgarg007	dfe006be19	Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes	2019-06-17 15:26:05 +05:30
deepeshgarg007	d1e0f42fea	fix: Styling fix	2019-06-17 12:47:39 +05:30
deepeshgarg007	7e3a98ba33	fix: Is group filter fixes in dimensions	2019-06-17 12:44:49 +05:30
Suraj Shetty	eb0ca67ced	fix: Caller name in call popup	2019-06-17 08:59:12 +05:30
Suraj Shetty	5ea6a5e33a	fix: Decouple call popup from exotel	2019-06-17 08:46:38 +05:30
Faris Ansari	8e99aaf605	fix: Add erpnext website theme import	2019-06-14 20:06:54 +05:30
Suraj Shetty	2f84779667	fix: Last Communication for lead - Remove unused code - Remove unused import	2019-06-12 10:31:07 +05:30
Suraj Shetty	7ff124db95	fix: Show lead name when the lead calls	2019-06-11 14:21:48 +05:30
Suraj Shetty	28f7c3ca3f	fix: Add Make contact button	2019-06-11 12:21:30 +05:30
Suraj Shetty	6013375fbb	fix: Improve call popup UX - Close modal after 10 secs if user is has not entered any call summary - Show alert once the summary was saved	2019-06-11 08:03:55 +05:30
deepeshgarg007	9297829804	fix: Codacy	2019-06-10 17:50:52 +05:30
deepeshgarg007	30f7e7be87	fix: Available qty not shown in item batch selector for batch	2019-06-10 17:46:16 +05:30
Suraj Shetty	13770ccf7a	fix: Codacy	2019-06-10 09:52:53 +05:30
Suraj Shetty	54bb3e4b9f	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-06-10 09:25:39 +05:30
Suraj Shetty	f1ffdb3c12	feat: Add call sound effects	2019-06-07 12:48:13 +05:30
Suraj Shetty	6a87e3338b	fix: Call popup UI	2019-06-07 11:52:39 +05:30
Suraj Shetty	c8c17422f7	fix: Change call log fieldname and some cleanups	2019-06-07 10:22:50 +05:30
Rohit Waghchaure	3cf24366a9	feat: provision to set multiple manufacturer in the item master	2019-06-06 19:53:32 +05:30
Shivam Mishra	76fe1b1e9f	Merge pull request #17674 from scmmishra/lms-refactor refactor: lms	2019-06-06 16:32:17 +05:30
Suraj Shetty	97780613ad	fix: Improve call popup UI	2019-06-06 14:48:37 +05:30
Suraj Shetty	cf270845f2	fix: Indicator toggler	2019-06-05 10:04:51 +05:30
Rushabh Mehta	6744febedd	Merge pull request #17769 from deepeshgarg007/dimensions feat: Configurable Accounting Dimensions	2019-06-03 17:00:58 +05:30
Shivam Mishra	8ddb63adae	feat: added auto course enrollment for enrolled programs	2019-06-03 14:40:52 +05:30
Nabin Hait	49133c5620	Merge pull request #17835 from deepeshgarg007/serial-no-devlop fix: Serial no filtering issue for delivered items	2019-06-03 14:24:56 +05:30
Nabin Hait	37fdeee367	Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev fix: Rounding adjustment while additional discount amount is applied on grand total	2019-06-03 13:09:04 +05:30
deepeshgarg007	545fef9934	fix: Pass delivery document no as empty string	2019-06-03 13:06:37 +05:30
Shivam Mishra	d1a252190b	refactor: refactored quiz api and added quiz.js	2019-06-03 12:57:38 +05:30
Suraj Shetty	d1668e22d1	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-06-03 12:36:45 +05:30
Suraj Shetty	e9bfecf405	fix: Add code to update call summary	2019-06-03 12:27:02 +05:30
deepeshgarg007	853a561f11	fix: Serial no filtering issue for delivered items	2019-06-03 12:11:54 +05:30
deepeshgarg007	55b894bfef	Merge branch develop into dimensions	2019-06-01 23:13:36 +05:30
Suraj Shetty	893a0c24bb	fix: Add call summary	2019-05-31 13:42:22 +05:30
Rohit Waghchaure	4fd704dbb6	fix: POS cash mode of payment css	2019-05-30 23:25:41 +05:30
deepeshgarg007	52ea2874ec	fix: Multiple fixes in accounting dimensions	2019-05-30 22:09:36 +05:30
Shivam Mishra	253a2bd260	refactor: goodbye Vue 👋	2019-05-30 18:54:11 +05:30
Nabin Hait	d060890817	fix: Rounding adjustment while additional discount amount is aplied on grand total	2019-05-30 16:05:30 +05:30
deepeshgarg007	ffec8be85f	fix: Styling and test case fixes	2019-05-28 17:56:07 +05:30
deepeshgarg007	e025aabef0	fix: Indentation fixes	2019-05-28 16:25:55 +05:30
deepeshgarg007	a8cb00f31f	fix: Styling and test case fixes	2019-05-28 16:03:08 +05:30
deepeshgarg007	acc2422167	Merge branch develop into dimensions	2019-05-28 12:18:32 +05:30
deepeshgarg007	f5b6ee9ae7	fix: Multiple fixes in accounting doctype	2019-05-28 12:15:56 +05:30
deepeshgarg007	50ea99e35b	fix: Is group filter for dimensions for doctype	2019-05-28 12:13:53 +05:30
Nabin Hait	aafd64d9b4	fix: On change of currency, set margin amount based on exchange rate (#17712 )	2019-05-27 17:15:47 +05:30
Suraj Shetty	bd03a51e8f	fix: Handle end call	2019-05-27 15:30:41 +05:30
Suraj Shetty	39a4d59cf6	fix: Call popup modal	2019-05-27 10:38:43 +05:30
deepeshgarg007	e9c6e644f7	fix: Multiple changes in dimension creation logic	2019-05-26 12:34:13 +05:30
deepeshgarg007	d330519f7c	fix: Merge branch develop into dimensions	2019-05-25 18:18:08 +05:30
Suraj Shetty	591ad37894	fix: call popup [wip]	2019-05-24 10:11:48 +05:30
Suraj Shetty	07fe299628	fix: Make changes to fix call flow and popup trigger	2019-05-22 15:48:57 +05:30
Nabin Hait	318ba2b538	Merge branch 'develop' into lms-refactor	2019-05-22 15:15:51 +05:30
Suraj Shetty	ee7d6e4598	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-05-22 14:55:48 +05:30
Suraj Shetty	fb1964aa18	fix: Changes to fix popup	2019-05-22 06:38:25 +05:30
Rushabh Mehta	8c78299158	fix(readme): logo	2019-05-21 11:57:33 +05:30
Suraj Shetty	863b93c32d	refator: Rename files and move code	2019-05-21 07:57:06 +05:30
Shivam Mishra	823c79588b	feat: Moving to Jinja	2019-05-19 16:01:45 +05:30
Suraj Shetty	8a178d6f30	fix: Update call summary dialog	2019-05-18 16:11:29 +05:30
Suraj Shetty	dd6b70c7cd	feat: Show contact on incoming call	2019-05-16 23:55:35 +05:30
Shivam Mishra	8a976ba8ab	feat: LMS is now compatible with Frappe Theme (#17600 ) * style: UI fixes for frappe_theme compatibility * chore: minor ui fixes	2019-05-16 16:38:13 +05:30
Nabin Hait	3fccfaa7ce	feat: Added 'Add Multiple' options in all sales / purchase transactions	2019-05-16 14:54:05 +05:30
Suraj Shetty	03c3bd5f4a	feat: Open modal in realtime for incoming call	2019-05-16 13:39:50 +05:30
Suraj Shetty	d382f1d470	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-05-16 09:47:17 +05:30
deepeshgarg007	60f4dd0736	Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions	2019-05-14 15:51:12 +05:30
Shivam Mishra	f82d0a6074	fix: show video duration and publish date only if data exists	2019-05-14 12:02:51 +05:30
Shivam Mishra	2430fd3a4c	chore: show description on course card	2019-05-14 11:24:51 +05:30
deepeshgarg007	e64c357216	fix: Commified function to get dimensions	2019-05-14 08:50:45 +05:30
deepeshgarg007	d83cf65be1	fix: Added dimensions in financial reports and general ledger	2019-05-12 18:34:23 +05:30
Faris Ansari	cb03bb1c00	fix: Allow variant attributes to be optional	2019-05-03 13:41:50 +05:30
Suraj Shetty	8b0588deaf	feat: Init call summary popup	2019-05-02 14:59:44 +05:30
Nabin Hait	b8103ac077	Merge branch 'develop' into item-discount	2019-05-01 12:23:30 +05:30
Faris Ansari	1e55c2e713	Remove old style custom scripts (#17077 ) * fix: Move Newsletter script from frappe to erpnext * fix: Remove old style client scripts * C-Form * fix: Cost Center * fix: Fiscal Year * fix: Monthly Distribution * fix: Payment Gateway Account * fix: Pricing Rule * fix: Missing semicolon	2019-04-30 10:18:09 +05:30
Suraj Shetty	c87b47a575	fix: Price list conversion for other UOM from stock UOM item price (#17386 ) * fix: Price list for UOM other than stock UOM -Fixes conversion from default UOM item price to other UOMs * fix: Typo	2019-04-29 23:18:47 +05:30
Shivam Mishra	9fe7257bfc	fix (ui): refactored breadcrumbs	2019-04-25 19:44:37 +05:30
Shivam Mishra	2428485ebb	fix (ui): Card layout	2019-04-25 19:33:22 +05:30
scmmishra	bf7d13a7be	Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2	2019-04-24 09:50:19 +05:30
Nabin Hait	593242fa5c	fix: Calculate rate based on discount on server side only if not rate or pricing rule applied	2019-04-23 13:22:38 +05:30
Rushabh Mehta	77b82894ff	fix(style): buttons in address and contact	2019-04-23 07:57:31 +05:30
scmmishra	68b3203366	chore: Moved `get_quiz_progress` and `get_program_progress` to a class function in `program_enrollment`	2019-04-22 18:50:08 +05:30
scmmishra	804a74c01c	fix (ui): UI fixes to Video page	2019-04-22 17:52:48 +05:30
scmmishra	6c8f23b27e	fixed (ui): Fixed cards with better buttons	2019-04-22 17:51:30 +05:30
Rohit Waghchaure	270d4e9f4e	fix: moved erpnext related methods from frappe to erpnext	2019-04-22 14:11:43 +05:30
scmmishra	4add826703	chore: Minor code improvements - Changed variable name in `get_content` function - Added proper exceptions for `get_topic` and `get_content` functions in lms	2019-04-22 12:28:13 +05:30
scmmishra	da2c90cd18	chore: renamed `get_program` api functions - `get_program` is renamed to `get_program_and_enrollment_status` - `get_program_detail` is renamed to `get_program` - Minor code improvements	2019-04-22 12:21:40 +05:30
scmmishra	d78c326f95	chore: renamed `get_topic_meta` to `get_student_topic_details`	2019-04-22 12:06:28 +05:30
scmmishra	d5973fe4bc	chore: renamed `get_course_meta` to `get_student_course_details`	2019-04-22 12:05:22 +05:30
scmmishra	823d89cf66	fix (linting): codacy fixes	2019-04-22 11:46:22 +05:30
Shivam Mishra	f3cc87455a	Merge pull request #17249 from scmmishra/auto-fetch-serial feat: Auto fetch serial numbers	2019-04-17 17:15:27 +05:30
scmmishra	fed4fd0f02	style: linting issue fixed	2019-04-17 15:46:15 +05:30
scmmishra	5522cf8c26	fix: codacy linting	2019-04-17 10:26:21 +05:30
scmmishra	6d3302b0cc	style (codacy): code formatting fixes	2019-04-16 18:25:53 +05:30
scmmishra	ed4b052df8	style (codacy): code formatting fixes	2019-04-16 17:03:25 +05:30
scmmishra	46901076be	feat: Use standard serial picker to add as well as update serial numbers	2019-04-16 17:01:01 +05:30
scmmishra	61d6b677e4	feat: Show standard serial number selector in item grid form	2019-04-16 15:17:27 +05:30
scmmishra	407496b528	chore: minor changes to labels	2019-04-16 13:32:41 +05:30
scmmishra	19a41ed16d	chore: code cleaning	2019-04-16 12:51:05 +05:30
scmmishra	41cf945247	feat (UX): Refactored batch selector	2019-04-16 12:47:39 +05:30
scmmishra	b98612ff5b	feat: Added auto fetch logic and button for client	2019-04-16 12:20:42 +05:30
Rushabh Mehta	44b0cb6383	Merge pull request #17194 from rmehta/dashboard-refactor fix(dashboard): as per new features	2019-04-15 16:52:54 +05:30
scmmishra	5b9df676a4	fix: minor bug in breadcrumb routing	2019-04-13 18:53:49 +05:30
Rohit Waghchaure	72cc37e8da	fix: Taxes and charges table not clear the existing rows if the template is changed	2019-04-11 18:35:15 +05:30
Rushabh Mehta	d625c32ab1	fix(dashboard): for frappe updates, and a new splash logo	2019-04-11 16:13:58 +05:30
scmmishra	bae2d669b5	fix: codacy linting issues	2019-04-09 12:57:56 +05:30
scmmishra	b7d9efe901	Merged develop in lms	2019-04-09 11:39:12 +05:30
scmmishra	88f0c464b4	feat: Added breadcrumbs	2019-04-08 19:56:21 +05:30
Rushabh Mehta	fbc56c6d97	fix(style): left padding in marketplace view	2019-04-08 17:02:22 +05:30
cjpit	0c87895afc	fix(node_modules): remove hardcoded symlink (#16975 ) * add node_modules directory to gitignore * remove node_modules symlink	2019-04-05 00:12:26 +05:30
Nabin Hait	b861c4bc46	Merge pull request #16895 from Alchez/hotfix-shipping-charge-override fix(transaction): Fix shipping rule charge override by tax template	2019-04-04 11:48:48 +05:30
scmmishra	d3bae4e8b5	feat: better cards in lms	2019-04-01 15:38:56 +05:30
Rohit Waghchaure	70b996af73	fix: test cases	2019-03-31 20:34:52 +05:30
Rohit Waghchaure	e540534e42	fix: Pricing rule not working for POS	2019-03-31 17:13:18 +05:30
scmmishra	2b7e158e50	feat: Quiz attempt limits is configurable - Added a 'no limit' check to `check_quiz_completion` in utils.py - Added disabled flag for questions in quiz component - Refactored `get_quiz_without_answers` to send attempt limit data to client	2019-03-29 12:45:08 +05:30
scmmishra	d4ed56af02	fix: navbar login bug	2019-03-29 11:03:34 +05:30
scmmishra	cea851522f	feat: Added custom navbar	2019-03-28 15:33:08 +05:30
scmmishra	6123ff3251	fix: styled program card	2019-03-28 15:32:54 +05:30
scmmishra	9b7ac3e7d2	fix: fixed joining date bug on lms profile	2019-03-28 14:47:22 +05:30
scmmishra	281902f530	chore: clean up	2019-03-28 14:35:15 +05:30
scmmishra	394e93c2bf	chore: Minor fixes on profile page	2019-03-28 14:34:23 +05:30
scmmishra	209250ccae	fix: Profile page cards - Only show attempted quizzes - Show 0 percent complete if program is enrolled but unattempted	2019-03-28 14:27:51 +05:30
scmmishra	c03db190d2	fix: layout for hero image of program card	2019-03-28 14:15:30 +05:30
scmmishra	29aaee1488	feat: Added youtube video component	2019-03-28 13:44:25 +05:30
scmmishra	92e311d9d7	feat: refactored YoutubePlayer component	2019-03-28 13:44:05 +05:30
scmmishra	15f6faad9b	fix: Video stops on closing modal	2019-03-28 13:11:00 +05:30
scmmishra	526af9d268	feat: added Youtube Video component	2019-03-28 13:10:42 +05:30
scmmishra	9bfe3a0315	feat: Added Program Intro Video modal	2019-03-28 12:20:24 +05:30
scmmishra	233db67451	Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2	2019-03-27 18:27:05 +05:30
scmmishra	f04ceaec95	chore: removed commented code	2019-03-27 18:14:59 +05:30
scmmishra	5b57d977d8	fix: single primary action on LMS home	2019-03-27 18:14:41 +05:30
scmmishra	3d39b88e7c	feat: LMS now supports multiple correct choice questions	2019-03-27 18:01:14 +05:30
Frappe Bot	b07a5d449d	Merge branch 'master' into develop	2019-03-23 07:25:03 +00:00
Rushabh Mehta	c0de5b741e	fix: remove gitter chat	2019-03-22 14:32:00 +05:30
scmmishra	43e9375642	feat [WIP]: Added multiple choice question component	2019-03-20 13:25:02 +05:30
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
scmmishra	000e706337	feat: Only student progress is recorded in LMS Changes - Instructors can freely audit the course and their progress will not be recorded - Added check for super access for get_program in utils.py - Guests can view topics page - Instructors can see explore topic button - Content Activity is only saved for a student in lms.py - Modified variable names in topic.py	2019-03-19 12:30:43 +05:30
Faris Ansari	5f8b358fd4	Website: Product Configurator and Bootstrap 4 (#15965 ) - Refactored Homepage with customisable Hero Section - New Homepage Section to add content on Homepage as cards or using Custom HTML - Products page at "/all-products" with customisable filters - Item Configure dialog to find an Item Variant filtered by attribute values - Contact Us dialog on Item page - Customisable Item page content using the Website Content field	2019-03-19 11:48:32 +05:30
scmmishra	e3dea29f58	fix: Minor UI fix	2019-03-18 15:44:55 +05:30
scmmishra	14d70ce444	chore: updated education config	2019-03-14 12:31:25 +05:30
Rohan Bansal	90972cfbf9	fix(transaction): Avoid shipping rule charge override by tax template	2019-03-11 15:00:48 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
rohitwaghchaure	d4754619d0	Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table fix: scan barcode not adding the barcode value in the items table	2019-03-07 11:29:56 +05:30
scmmishra	18a1a8d4f4	style: Fixed route.js	2019-03-06 10:55:21 +05:30
Frappe Bot	8f0660ab31	Merge branch 'master' into develop	2019-03-01 09:22:36 +00:00
scmmishra	471140c6d4	fix: Minor changes	2019-02-28 18:14:25 +05:30
scmmishra	f0a56b977a	feat: Minor fixes to profile page	2019-02-28 18:11:46 +05:30
scmmishra	ab8fc8c2bf	feat: Quizzes fixed	2019-02-28 16:42:37 +05:30
scmmishra	b793cc8e1e	fix: Minor changes	2019-02-28 16:33:38 +05:30
Rohit Waghchaure	c21cda2790	Removed validation for group by voucher in general ledger	2019-02-28 16:20:45 +05:30
scmmishra	5e61b17cf8	fix: Routing after finishing a course topic	2019-02-28 15:43:33 +05:30
scmmishra	de5f71ae9e	fix: Showing Topic Progress	2019-02-28 15:40:49 +05:30
scmmishra	b17d289bda	fix: Course card progress	2019-02-28 15:21:43 +05:30
Rohit Waghchaure	ab4ff984c4	fix: scan barcode not adding the barcode value in the items table	2019-02-28 13:31:02 +05:30
scmmishra	56ad5da090	fix: Minor Changes	2019-02-27 15:32:36 +05:30
scmmishra	e6735e418f	fix: Content navigation	2019-02-27 12:46:23 +05:30
scmmishra	8747900aa1	Fix: Content title fields	2019-02-27 12:34:53 +05:30
scmmishra	47ccad9661	fix: Reloading bug on Content page	2019-02-27 12:24:17 +05:30
scmmishra	23880ae567	fix: Content fetching for articles and videos	2019-02-27 12:09:57 +05:30
scmmishra	628659e02a	fix: Routing for course	2019-02-27 12:09:28 +05:30
scmmishra	90b503621b	fix: Content Routing	2019-02-26 17:20:38 +05:30
scmmishra	7e1678e287	fix: TopicMeta fixes	2019-02-26 17:11:01 +05:30
scmmishra	03c4c635e0	fix: list title on CoursePage	2019-02-26 16:54:32 +05:30
scmmishra	c011b08699	fix: Fixed UI and API for course page	2019-02-26 16:49:38 +05:30
scmmishra	fed9adbc77	fix: Fixed API and UI for topic card	2019-02-26 16:49:15 +05:30
scmmishra	5ae51dc849	fix: Minor UI fixes	2019-02-26 16:48:49 +05:30
scmmishra	b5ba518bdb	style: Minor code formatting	2019-02-26 16:48:12 +05:30
scmmishra	a8ef773978	fix: Course Card shows topic list	2019-02-26 16:47:54 +05:30
scmmishra	a2ca8dd92f	fix: Route for course page	2019-02-26 16:47:10 +05:30
Saurabh	3dd7ddd838	Merge branch 'master' into develop	2019-02-21 18:25:29 +05:30
deepeshgarg007	0d64d622e5	fix: filter only unique values for tree options	2019-02-20 17:55:14 +05:30
scmmishra	62968b318f	wip	2019-02-19 18:25:07 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
scmmishra	cb8ef96f6b	chore (css): Switched to frappe navbar	2019-02-19 17:03:16 +05:30
scmmishra	1682aa8a36	fix (css): Removed container class	2019-02-19 17:01:31 +05:30
scmmishra	765529241e	[Major][Breaking] More changes	2019-02-19 13:06:33 +05:30
scmmishra	689500d081	Minor UI Fixes	2019-02-19 13:06:33 +05:30
scmmishra	d02fd13bf0	UI Improvements: Added Custom Navbar	2019-02-19 13:06:33 +05:30
scmmishra	87df23b52d	Added quiz card on profile page	2019-02-19 13:06:33 +05:30
scmmishra	b3154efa84	UI Fixes	2019-02-19 13:06:33 +05:30
scmmishra	798f13be0d	More Improvements	2019-02-19 13:06:33 +05:30
scmmishra	02420bd4ba	Client side improvements	2019-02-19 13:06:33 +05:30
scmmishra	edc54cd5f6	Minor improvements for CardList.vue	2019-02-19 13:06:33 +05:30
scmmishra	2955851867	Built Student Profile Page	2019-02-19 13:06:33 +05:30
scmmishra	308f235859	Added Profile page	2019-02-19 13:06:33 +05:30
scmmishra	201fec3101	Minor Improvements	2019-02-19 13:06:33 +05:30
scmmishra	97c994f394	create course enrollment if not already enrolled for a program	2019-02-19 13:06:33 +05:30
scmmishra	cbb7c7ff23	ui fixes	2019-02-19 13:06:33 +05:30
scmmishra	788ffbd5b6	Minor improvements	2019-02-19 13:06:33 +05:30
scmmishra	9229f4fc92	UI fixes	2019-02-19 13:06:33 +05:30
scmmishra	fdbabde80a	UI fixes for course card	2019-02-19 13:06:32 +05:30
scmmishra	be7fadc521	Renamed CoursePage to ContentPage	2019-02-19 13:06:32 +05:30
scmmishra	d93cec374d	Minor UI changes	2019-02-19 13:06:32 +05:30
scmmishra	a592f70d4a	Refactored Course Progression Logic	2019-02-19 13:06:32 +05:30
scmmishra	8951c165f0	Fixed major bugs	2019-02-19 13:06:32 +05:30
scmmishra	53c2d5db63	Refactored lms store	2019-02-19 13:06:32 +05:30
scmmishra	babb68d36c	Refactored server side code	2019-02-19 13:06:32 +05:30
scmmishra	80ecc56cbe	Using lms.call across the Vue app	2019-02-19 13:06:32 +05:30
scmmishra	0a4902f8b5	UI Changes	2019-02-19 13:06:32 +05:30
scmmishra	c5a1226e93	Refactored State management store	2019-02-19 13:06:32 +05:30
scmmishra	85c2feec0d	Added ListPage and other UI improvements	2019-02-19 13:06:32 +05:30
scmmishra	efb01c3f75	Renamed components	2019-02-19 13:06:32 +05:30
scmmishra	2596ea0816	Renamed Vue Files	2019-02-19 13:06:32 +05:30
scmmishra	0225642459	Renamed Pages	2019-02-19 13:06:32 +05:30
scmmishra	8ff1028665	Renamed AcademyRoot to lmsRoot	2019-02-19 13:06:32 +05:30
scmmishra	1fbe2d4b2b	Renamed academy to lms (Client Side)	2019-02-19 13:06:32 +05:30
scmmishra	44921a3ee9	Renamed default element for Vue to mount on	2019-02-19 13:06:32 +05:30
scmmishra	91bbe776c1	Modified `academy.call` to point to erpnext.www.lms	2019-02-19 13:06:32 +05:30
scmmishra	d7c993f028	Minor UI changes	2019-02-19 13:06:32 +05:30
scmmishra	f9b2fb6717	Fixed course and content page	2019-02-19 13:06:32 +05:30
scmmishra	708756ed40	Added academy namespace	2019-02-19 13:06:32 +05:30
scmmishra	cc166c01eb	Improved Client implementation	2019-02-19 13:06:31 +05:30
scmmishra	8fa9adec37	More Bug fixes UI and Permissions	2019-02-19 13:06:31 +05:30
scmmishra	b409f7a388	Minor UI Changes and Fixes	2019-02-19 13:06:31 +05:30
scmmishra	86897b3cc8	UI: Kinda fixed "Completed" button render issue	2019-02-19 13:06:31 +05:30
scmmishra	5611bf4e29	Minor change	2019-02-19 13:06:31 +05:30
scmmishra	25e42baeaf	Course completion logic complete	2019-02-19 13:06:31 +05:30
scmmishra	a920bca044	Minor UI fixes	2019-02-19 13:06:31 +05:30
scmmishra	0187b18c06	Added methods to saving Quiz attempts	2019-02-19 13:06:31 +05:30
scmmishra	a3afe2a998	Sending session data explicitly	2019-02-19 13:06:31 +05:30
scmmishra	cfce153ed4	Minor UI changes	2019-02-19 13:06:31 +05:30
scmmishra	1f4835b3b4	Added Video UI	2019-02-19 13:06:31 +05:30
scmmishra	6de9cbb52d	Solved minor issue (Last activity not being saved)	2019-02-19 13:06:31 +05:30
scmmishra	1a04f774d7	LMS: Saving Course Activity	2019-02-19 13:06:31 +05:30
scmmishra	ed5892c7a5	UI: Components rendered based on student progress	2019-02-19 13:06:31 +05:30
scmmishra	a054655442	Updated state functions for session management	2019-02-19 13:06:31 +05:30
scmmishra	8b8db54ef4	Added enroll function	2019-02-19 13:06:30 +05:30
scmmishra	15012c08a4	UI Fixes	2019-02-19 13:06:30 +05:30
scmmishra	72fd3bc0ea	Removed unnecessary watcher	2019-02-19 13:06:30 +05:30
scmmishra	3c412f56c9	UI: Changes to AcademyTopSection	2019-02-19 13:06:30 +05:30
scmmishra	bcafe84bb6	Adding session management to client	2019-02-19 13:06:30 +05:30
scmmishra	7a19b63837	Minor changes	2019-02-19 13:06:30 +05:30
scmmishra	e30f2eb297	Re-factored CourseCard UI	2019-02-19 13:06:30 +05:30
scmmishra	6678f5b88e	Added custom store for state management	2019-02-19 13:06:30 +05:30
scmmishra	cd0cab78a5	Quiz UI Working	2019-02-19 13:06:30 +05:30
scmmishra	f7029f084c	Quiz is now submittable	2019-02-19 13:06:30 +05:30
scmmishra	cfc35f4424	Quiz: Save responses as an object	2019-02-19 13:06:30 +05:30
scmmishra	d2e040b6f1	Added separate ContentTitle component	2019-02-19 13:06:30 +05:30
scmmishra	160d8b0914	Added separate ContentTitle component	2019-02-19 13:06:30 +05:30
scmmishra	d87ca178d8	UI for Quiz	2019-02-19 13:06:30 +05:30
scmmishra	7a59f9501e	UI for Content	2019-02-19 13:06:30 +05:30
scmmishra	bcafbea481	UI for Course page	2019-02-19 13:06:30 +05:30
scmmishra	b43ab3317c	UI for home page and program page	2019-02-19 13:06:30 +05:30
scmmishra	84297fa349	Starting with VueJS	2019-02-19 13:06:30 +05:30
scmmishra	1778b59efa	Started with Vue	2019-02-19 13:06:30 +05:30
Rushabh Mehta	f3b33f3ab2	Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features feat(marketplace): seller profile page	2019-02-18 11:24:01 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Faris Ansari	5631ffca68	fix: Barcode scanning UX	2019-02-12 17:12:48 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
karthikeyan5	4324dc6ea8	fix(marketplace): fixing hubmarket server specific error	2019-02-12 15:12:23 +05:30
karthikeyan5	4df6003bd9	feat(marketplace): seller profile page	2019-02-12 15:12:23 +05:30
karthikeyan5	2894f7935a	feat(marketplace): featured Items for sellers	2019-02-12 15:12:23 +05:30
karthikeyan5	88baf53cc1	feat(marketplace): navigation link to seller profile from item page	2019-02-12 15:12:23 +05:30
Prateeksha Singh	3423407314	feat(module_links): rearrange links	2019-02-07 09:58:22 +05:30
Faris Ansari	8ae5dbcac8	fix: Set barcode in Item row after scanning barcode (#16591 )	2019-02-07 07:09:49 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
karthikeyan5	4cb0a250a0	fix(marketplace): bug in filtering menu_items > UX improvment for incomplete feature	2019-02-05 18:07:48 +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
Deepesh Garg	a8cc4b105d	Merge branch 'staging-fixes' into pos_issue	2019-01-29 11:29:41 +05:30
Nabin Hait	7c0fbfab0a	Merge pull request #16482 from pipech/staging-fixes fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field	2019-01-29 11:23:05 +05:30
Nabin Hait	3ccc16e4e0	Merge pull request #16449 from scmmishra/remove-foundation feat: Deprecated In App Help	2019-01-29 11:20:23 +05:30
deepeshgarg007	49cca7ac76	fix: Customer based price_list in online POS	2019-01-25 16:41:01 +05:30
Shivam Mishra	67c338fd51	[fix] Fixed links Previous commit missed the links starting with `http://`	2019-01-25 15:17:44 +05:30
scmmishra	f44dfb1582	[fix] Formatting issues	2019-01-25 14:56:30 +05:30
scmmishra	d71de2a23e	[fix] Code formatting, removed trailing spaces	2019-01-25 14:27:23 +05:30
scmmishra	9731a02657	[feat] Added docsUrl variable to configure help_links	2019-01-25 13:14:11 +05:30
scmmishra	3f9b231f31	[fix] Links now redirect to erpnext.com	2019-01-25 12:56:27 +05:30
pipeCh	c16c7fffb4	fixed for "Select Serial Numbers" dialog won't fill mandatory field	2019-01-24 15:00:07 +07:00
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
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Nabin Hait	48fa697d54	Merge pull request #16439 from nabinhait/disable-rounded-total fix: Disable rounded total field's value honours docfield's default value	2019-01-22 09:58:06 +05:30
scmmishra	f2d0be7299	[feat] Modified help config	2019-01-21 19:35:46 +05:30
scmmishra	dd461636e3	[feat] Updated all help_links	2019-01-21 19:35:02 +05:30
Nabin Hait	a39f324682	fix: Disable rounded total field's value honours docfield's default value	2019-01-21 18:50:50 +05:30
Aditya Hase	442c85c006	fix(marketplace): Capitalize marketplace factory class to support router changes (#16428 )	2019-01-18 21:28:37 +05:30
Saif Ur Rehman	398f593e5f	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-01-18 17:33:19 +05:00
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Nabin Hait	158e7dcd8b	fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM	2019-01-16 16:00:25 +05:30
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
Saif Ur Rehman	2689dea72a	fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse	2019-01-09 13:43:06 +05:00
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 Ur Rehman	13a6c0aeff	Fix tests	2019-01-06 18:14:18 +05:00
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
deepeshgarg007	8300f5ede7	fix: Codacy issues and added test case	2019-01-01 20:28:49 +05:30
deepeshgarg007	78ad6c4cb7	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix	2019-01-01 19:46:08 +05:30
Saif Ur Rehman	eeead1d777	fix: Only load transaction's company's tax accounts in item tax map	2018-12-29 02:25:00 +05:00
Saif Ur Rehman	fd531a6b5e	feat: Tax Category based on Address	2018-12-29 01:49:11 +05:00
Saif Ur Rehman	e414a92d55	fix: Run get_item_tax_info and set_taxes serially	2018-12-28 04:59:42 +05:00
Saif Ur Rehman	aca374e478	feat: add_taxes_from_item_tax_template	2018-12-28 04:53:25 +05:00
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
deepeshgarg007	64238ee91f	(Codacy Fix) Fixed indenttion	2018-12-25 16:28:39 +05:30
deepeshgarg007	12f5cefc12	Loyalty program issue fix in customer dashboard	2018-12-25 16:06:19 +05:30
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	b2965001d1	Replace 'Make' with 'Create'	2018-12-23 13:25:58 +05:30
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
Suraj Shetty	5555bf82f8	Capitalize marketplace factory class to support recent router changes (#16238 )	2018-12-19 10:15:59 +05:30
Suraj Shetty	7ae2d59ffd	Merge branch 'staging-fixes' into permission-fixes	2018-12-18 15:41:03 +05:30
Rohan	159897d88d	fix(customer): Fix Total Unpaid amount in Customer dashboard (#16234 )	2018-12-18 14:52:23 +05:30
Saurabh	e165fc0e1b	Merge branch 'staging' into develop	2018-12-13 10:45:32 +05:30
Prateeksha Singh	c0f90beb7c	Rename 'Chat' to 'Gitter Chat'	2018-12-12 21:29:55 +05:30
Suraj Shetty	07e5786e1b	Fix user permission checks	2018-12-10 19:10:18 +05:30
Frappe Bot	5b50b2848d	Merge branch 'staging' into develop	2018-12-10 13:08:33 +00:00
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
Sagar Vora	4c5bd253a2	fix(party dashboard): empty array is truthy, check for length (#16184 )	2018-12-10 17:19:10 +05:30
Nabin Hait	3248e0bb3e	Merge pull request #16163 from netchampfaris/hotfix-setupwizard-abbr fix(setup-wizard): Validate abbr length before switching to next slide	2018-12-07 15:20:23 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
Frappe Bot	ee5d7e6d0f	Merge branch 'master' into staging-fixes	2018-12-06 09:26:42 +00:00
Nabin Hait	32c95c3292	Merge pull request #16113 from nabinhait/travis-fix fix(test): Fixed tests for discount with margin and period closing voucher	2018-12-06 11:58:56 +05:30
Faris Ansari	40c15348da	fix(setup-wizard): Validate abbr length before switching to next slide	2018-12-06 07:37:32 +05:30
Rohit Waghchaure	675567419b	[Fix] Permissions issue	2018-12-04 18:43:52 +05:30
deepeshgarg007	c981fb389b	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix	2018-11-29 14:57:50 +05:30
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
Nabin Hait	305c8b1fba	Merge pull request #16110 from shreyashah115/fix-timer [Timesheet] Element selector in Timer	2018-11-27 17:57:46 +05:30
Nabin Hait	96598936ad	fix(test): Fixed tests for discount with margin and period closing voucher	2018-11-27 17:48:13 +05:30
deepeshgarg007	c1a3c72b49	final dashboard design	2018-11-27 17:09:12 +05:30
deepeshgarg007	f31caffa74	Changes in get_dashboard_info	2018-11-27 15:04:12 +05:30
deepeshgarg007	6372fbba54	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix	2018-11-27 14:06:58 +05:30
shreyashah115@gmail.com	5281fe8e50	fix: Element selector	2018-11-27 13:11:30 +05:30
Nabin Hait	73e3138a5b	Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number	2018-11-26 20:20:22 +05:30
Rohit Waghchaure	b4a5993ece	On uncheck is return field clear the reference field	2018-11-26 20:02:01 +05:30
Saif Ur Rehman	147fa73d3f	Fixed incorrect use of 'this' causing errors calculating rate	2018-11-26 18:14:06 +05:00
deepeshgarg007	a1cffc3490	minor changes in dashboard	2018-11-23 16:51:35 +05:30
deepeshgarg007	0e8c36473a	Added colspan to indicators	2018-11-23 11:22:24 +05:30
deepeshgarg007	920dc1400f	Customer/Supplier dashboard fix for multi company setup	2018-11-23 10:17:28 +05:30
Ameya Shenoy	27a0c37963	css: build files in v10	2018-11-15 19:21:30 +00:00
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
Nabin Hait	367a076fa4	fix(discount): Fixed item discount amount calculation	2018-11-13 18:41:58 +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
Doridel Cahanap	2b14d6a058	Contract Manufacturing : Customer Provided Items (#15828 ) * Material Request from Production Plan for Customer provided parts * Test cases * Customer web portal for their material requests	2018-11-13 12:07:16 +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
Faris Ansari	bbc1cb274e	Merge pull request #15911 from netchampfaris/marketplace-fixes-3 Hub fixes	2018-11-05 19:19:44 +05:30
Faris Ansari	d6b664f7ee	fix(hub): Prevent registered actions	2018-11-05 19:18:48 +05:30
Faris Ansari	0d08da50c6	fix: Refresh PageContainer component based on current route	2018-11-05 15:47:26 +05:30
Faris Ansari	68dbf7f99c	fix: Use frappe.utils.make_event_emitter	2018-11-02 13:30:51 +05:30
Ameya Shenoy	df62296a26	Merge branch 'staging' into develop	2018-10-30 12:54:16 +00:00
Ameya Shenoy	6178b79555	Merge branch 'master' into staging-fixes	2018-10-30 12:48:45 +00:00
Faris Ansari	3df1327b94	fix: Delete button in POS mobile Delete button was covered by page-actions container	2018-10-29 15:15:10 +05:30
Ameya Shenoy	7658bdc00a	Merge branch 'staging' into develop	2018-10-23 08:06:15 +00:00
Ameya Shenoy	ca66c7ba14	Merge branch 'master' into staging-fixes	2018-10-23 08:01:13 +00:00
Rohit Waghchaure	55416e08f1	[Fix] Marketplace setting permission error	2018-10-23 11:52:06 +05:30
Rohit Waghchaure	aef7a6ec44	[Fix] User able to edit the rate in offline POS even if it has no permissions	2018-10-22 13:51:32 +05:30
Ameya Shenoy	c1231d65fd	Merge branch 'staging' into develop	2018-10-19 13:27:07 +00:00
Saif	3c9155e406	[Minor Fix] Force toggle display Net Total field when default taxes are fetched (#15532 ) * Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched * Prevent net_rate from becoming NaN * -Fixed problem that party_account_currency was not set in mapped document -Fixed problem that discount amount was not recalculated (in mapped document) -Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency	2018-10-18 17:57:56 +05:30
Ameya Shenoy	f5d3ce8846	Merge branch 'staging' into develop	2018-10-08 09:44:34 +00:00
Shreya Shah	4fb9230d16	Add missing method link_to_mrs to buying.js (#15613 )	2018-10-08 14:18:03 +05:30
Shreya Shah	95d93913ce	fix(link_to_mr): Add missing method to buying.js (#15616 )	2018-10-08 14:17:37 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
rohitwaghchaure	d6cacbe565	Merge pull request #15567 from rohitwaghchaure/fix_payment_request [Fix] Payment request not working	2018-10-03 16:03:48 +05:30
Rohit Waghchaure	210f4984f7	[Fix] Payment request not working	2018-10-03 15:55:51 +05:30
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
Faris Ansari	e0a148474d	fix: Translation string (#15561 )	2018-10-03 10:37:41 +05:30
Rushabh Mehta	11e2119670	style(icon): revert to old icon	2018-10-02 11:06:55 +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
Faris Ansari	6575e52942	fix: Refactor Review Area according to new Text Editor (#15536 ) - depends on https://github.com/frappe/frappe/pull/6159	2018-09-30 21:08:46 +05:30
Faris Ansari	7a8c5b0c2c	fix(setup wizard): Validate FY dates (#15473 )	2018-09-25 18:34:33 +05:30
Zarrar	e83ff38c10	[Enhance] Deferred Expense (#15437 ) * added section for deferred expense in item master * added default expense account field in Company master * added deferred expense section in purchase invoice item * validation and getter code added * scheduler event to book expense every month * codacy, import fix and other minor fixes * rectify debit credit logic for expense * commonify js code for deferred expense and revenue * remove deferred calculation and validation * common file to calculate deferred revenue and expense * codacy fixes * expense account root_type - Asset, specific method naming	2018-09-21 15:45:40 +05:30
Faris Ansari	aa856c474a	fix(setup wizard): Validate FY dates (#15419 ) - start date should be less than end date	2018-09-18 10:42:04 +05:30
rohitwaghchaure	713cfc786f	[enhance] Payment order (#15056 )	2018-09-11 17:40:37 +05:30
Faris Ansari	76b31deda5	Isomorphic marketplace (#15384 ) * feat: Make marketplace run on hub server in Guest mode * fix: Skip page actions on server * fix: Limit PageContainer to marketplace route * fix(eslint): Add hub variable to globals	2018-09-11 17:38:31 +05:30
Faris Ansari	9fb5e1c61b	fix(image): New Image component to consistently handle broken images - psuedo element hack didn't work cross browser	2018-09-07 23:17:29 +05:30
Nabin Hait	b479a87031	fix(report): Cost center filters in financial statements and general ledger	2018-09-07 13:17:23 +05:30
Sanjay Kumar	1b49f3a4e7	Allow cost center in entry of balance sheet accounts (#14972 ) * Allow Cost Center In Entry of Balance Sheet Account * Add parent cost center in get payment entry * Add Tests for Allow Cost Center In Entry of Balance Sheet Account * Add tests for cost center wise account and party balance * set parent cost center in taxes * 1. Remove copy parent cost_center to child 2. Improve update party and account balance functionality on cost_center change 3. Add cost_center filter to get_outstanding_documents * fix Codacy and Travis issue	2018-09-06 14:39:35 +05:30
Nabin Hait	ed643d5a12	fix(email digest): Income/expenses value in case of last period of a fiscal year (#15320 )	2018-09-05 17:18:59 +05:30
Prateeksha Singh	8a160684b7	[fix] filter() result in list	2018-09-04 10:59:20 +05:30
Faris Ansari	7be9c381d8	fix: Revert skeleton in Sidebar - sidebar items repeating for some reason	2018-09-04 00:12:47 +05:30
Faris Ansari	66321e6af7	feat: Add skeleton to Home and Sidebar	2018-09-03 19:39:19 +05:30
Prateeksha Singh	1265a26c0c	Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser	2018-09-03 18:50:25 +05:30
Prateeksha Singh	456c39336d	[hub] update settings after publish, fix route_map	2018-09-03 18:49:33 +05:30
Faris Ansari	2b80bbbe16	Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser	2018-09-03 17:50:06 +05:30
Prateeksha Singh	6ba9b3f4de	[hub] hide Contact Seller and Save Item in read-only	2018-09-03 17:49:11 +05:30
Faris Ansari	b592a76016	fix: Selling Messages	2018-09-03 17:49:11 +05:30
Prateeksha Singh	ad6948844e	Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser	2018-09-03 17:32:17 +05:30
Prateeksha Singh	b2eadfe31d	[hub] show become a seller button to all, but not dialog	2018-09-03 17:31:43 +05:30
Faris Ansari	d4bba297c2	fix: Container title	2018-09-03 17:12:22 +05:30
Faris Ansari	28652baacc	Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser	2018-09-03 16:54:04 +05:30
Faris Ansari	b296be041e	fix: email in profile dialog	2018-09-03 16:53:56 +05:30
Prateeksha Singh	bffb707c17	[fix] add message for admin users before register dialog - use is_registered api for page routes	2018-09-03 16:39:59 +05:30
Faris Ansari	ad0be6aaa2	fix: Messages - update messages according to new doctype - sync logo in seller registration - hub.is_seller_registered() and hub.is_user_registered() api - Add Users dialog	2018-09-03 15:43:09 +05:30
Prateeksha Singh	18e3c61109	[marketplace] Disallow unregistered routes if not registered	2018-09-03 15:22:13 +05:30
Prateeksha Singh	47cc30da85	[hub] ask company description in dialog	2018-09-03 13:11:23 +05:30
Prateeksha Singh	85563ddfd3	[hub] update publish hub api	2018-09-03 02:44:27 +05:30
Prateeksha Singh	5511e06f06	[hub][api] Update save and view api to be user specific	2018-09-03 02:25:41 +05:30
Faris Ansari	68129df74c	feat: Add add_user dialog and methods - wip	2018-09-02 18:29:00 +05:30
Prateeksha Singh	b2b745fc7a	[hub] simplify marketplace settings, remove company fields - Company attributes will be fetched/calculated to send to server - removed them as fields in settings - Added description in company, with existing logo field - TODO: for things like logo and description, ask user to set in master	2018-09-01 17:20:08 +05:30
Faris Ansari	255dd0e03d	feat: Add new registration flow	2018-09-01 14:30:46 +05:30
Prateeksha Singh	4e1fd0b417	[hub] register_seller -> register_marketplace - resgister_seller will be for subsequent users - make username and password readonly - check if password present before trying to create connection	2018-09-01 09:55:43 +05:30
Prateeksha Singh	a8065ff725	[hub] move register_seller to api, remove old code	2018-08-31 22:41:26 +05:30
Prateeksha Singh	c726fce4b1	[hub] set first user's password in marketplace users	2018-08-31 20:42:48 +05:30
Prateeksha Singh	ea2b9cbd1c	[hub] add user selection in register	2018-08-31 17:56:50 +05:30
Faris Ansari	c05bf262f1	Merge pull request #15279 from netchampfaris/marketplace-fixes-3 - feat: Add disable marketplace option in Hub Settings - fix: Rename Hub Settings -> Marketplace Settings	2018-08-31 16:52:26 +05:30
Faris Ansari	f9a66c1c36	fix: Rename Hub Settings -> Marketplace Settings	2018-08-31 16:30:34 +05:30
Faris Ansari	25f509ebd3	feat: Add disable marketplace option in Hub Settings	2018-08-31 15:35:32 +05:30
Faris Ansari	91ac26c2ff	fix(seller dialog): Email should be session user email (#15270 )	2018-08-30 19:19:57 +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
Nabin Hait	f6b784e39e	Test fixes	2018-08-30 18:42:35 +05:30
Prateeksha Singh	ecad873d19	[hub] remove item.js, fix seller decription condition	2018-08-30 16:21:26 +05:30
Prateeksha Singh	5797565dd0	Merge with upstream	2018-08-30 16:15:27 +05:30
Prateeksha Singh	ff52e93e69	[hub] Merge conflicts	2018-08-30 16:11:41 +05:30
Prateeksha Singh	997bfa4916	[hub] add review timeline element	2018-08-30 16:08:52 +05:30
Faris Ansari	f3034ae262	feat: Add Report Item dialog	2018-08-30 16:05:15 +05:30
Faris Ansari	8e04487253	fix: Rename 'Product' to 'Item'	2018-08-30 15:35:17 +05:30
Prateeksha Singh	dc36d52ef9	[hub] fix review send	2018-08-30 15:12:18 +05:30
Faris Ansari	6b695d32b2	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-30 14:36:14 +05:30
Faris Ansari	90265aec24	fix: Page container routing	2018-08-30 14:36:05 +05:30
Faris Ansari	062cd62484	fix: Add restrictions for session user who is not hub seller	2018-08-30 14:35:56 +05:30
Prateeksha Singh	bff2bdc858	[hub] UI and empty state in 'your products' to guide on publishing	2018-08-30 12:58:46 +05:30
Prateeksha Singh	47f5f0e608	[hub] remove See All from non expandable sections	2018-08-30 12:16:08 +05:30
Prateeksha Singh	b20c4e3184	[hub] remove client hub_settings scripts - multiline to single line messages to translate	2018-08-30 12:01:04 +05:30
Prateeksha Singh	04d051bb73	[hub] add review area	2018-08-30 02:42:13 +05:30
Faris Ansari	ff8f1c6120	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-29 15:02:47 +05:30
Faris Ansari	64202ad416	fix: Only a System Manager can register as a seller - every other user has read only access	2018-08-29 15:02:39 +05:30
Prateeksha Singh	02c176c0e6	[hub] fix code lint issues, styles	2018-08-29 14:27:47 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +05:30
Faris Ansari	8bc954ecc6	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-28 18:29:08 +05:30
Faris Ansari	b26381e6b8	fix: Scroll to top when route changes	2018-08-28 18:29:01 +05:30
Prateeksha Singh	bd7d964848	[hub] Merge Develop	2018-08-28 18:25:07 +05:30
Prateeksha Singh	2d45373f33	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-28 17:25:01 +05:30
Prateeksha Singh	1e02f00075	[hub] record views, update favourite api	2018-08-28 17:24:31 +05:30
Faris Ansari	6df06cac97	fix: Show empty state if there are no items	2018-08-28 17:19:35 +05:30
Faris Ansari	c12f48da2d	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-28 17:17:36 +05:30
Faris Ansari	5689494f9c	chore: Remove old messages page	2018-08-28 16:52:17 +05:30
Suraj Shetty	b92403fbed	Add 'Become Seller' as a primary key - Also remove some unwanted code	2018-08-28 15:04:33 +05:30
Suraj Shetty	f994e3ec6b	Remove 'Become Seller' option from sidebar	2018-08-28 15:03:01 +05:30
Suraj Shetty	ec12b34a79	Add margin below publish area	2018-08-27 20:37:06 +05:30
Suraj Shetty	49c37d5a8e	Add strip html filter	2018-08-27 20:31:29 +05:30
Faris Ansari	a4dcb6f548	fix: Add empty state in Selling	2018-08-27 19:57:12 +05:30
Faris Ansari	725603c0a9	feat: Selling Page - common Messages page for both buying and selling	2018-08-27 19:51:36 +05:30
Prateeksha Singh	bc859cbf1d	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-27 15:16:53 +05:30
Prateeksha Singh	872768d89f	[hub] merge conflicts	2018-08-27 15:16:19 +05:30
Suraj Shetty	dc7e8e6a26	Replace hub_item_code -> hub_item_name	2018-08-27 14:11:48 +05:30
Maxwell Morais	a2c1d92374	Revert "Fix shipping_address for DropShipping" (#15218 ) * Revert "Cleaned up welcome email code (#15175)" This reverts commit `771fbb8f01`. * Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)" This reverts commit `2b72d09948`. * Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)" This reverts commit `c5cf428d00`. * Revert "[Minor] Create default department on country setup (#15206)" This reverts commit `2b2712bb9e`. * Revert "Permissions issue in BOM tree" This reverts commit `8fe8d1758a`. * Revert "Fix indentation accounts_receivable.py (#15203)" This reverts commit `fbc3df3247`. * Revert "Fix shipping_address for DropShipping (#15202)" This reverts commit `4a394bcbf4`.	2018-08-27 12:05:41 +05:30
Prateeksha Singh	fa26899cd0	[hub] added DetailHeaderItem to detail pages, contact seller button	2018-08-27 10:49:42 +05:30
Prateeksha Singh	d0a952bcda	[hub] Register components, init Item Page - commonly used components are pre-registered - add DetailHeaderItem component - begin ItemPage	2018-08-27 10:12:45 +05:30
Faris Ansari	f089dad7c7	feat: Sidebar in vue	2018-08-26 22:20:16 +05:30
Faris Ansari	d37108d18e	fix: Add back link to Buying	2018-08-26 22:19:56 +05:30
Faris Ansari	23e45ada69	chore: Remove old messages files	2018-08-26 22:19:29 +05:30
Faris Ansari	ea82fb9f80	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-26 20:09:12 +05:30
Faris Ansari	caebd4a9b9	feat: Buying and BuyingMessages in vue	2018-08-26 20:09:02 +05:30
Faris Ansari	019bfd3940	feat: Add helper directives - v-route automatically route to a valid frappe route - v-img-src handle img loading and error handling	2018-08-26 20:08:40 +05:30
Faris Ansari	bf5cc7d823	feat: SectionHeader component	2018-08-26 20:00:42 +05:30
Faris Ansari	4a2ea993fd	fix(search-input): submit on enter	2018-08-26 19:49:20 +05:30
Faris Ansari	fad623eb27	feat: Add dynamic routes in PageContainer	2018-08-26 19:48:52 +05:30
Prateeksha Singh	fad0f64c94	[hub][vue] add action object in empty state, make NotFound page	2018-08-26 18:27:04 +05:30
Prateeksha Singh	5c9b13f5e5	[hub][vue] add skeleton state to DetailView	2018-08-26 18:06:25 +05:30
Prateeksha Singh	9e8d7bbeda	[hub][vue] Seller Page	2018-08-26 16:29:32 +05:30
Prateeksha Singh	80a8dfd6ba	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-26 13:09:52 +05:30
Prateeksha Singh	5e30beec86	[hub][vue] DetailView and Profile page	2018-08-26 13:09:19 +05:30
Faris Ansari	888dd606ff	feat: Add PageContainer	2018-08-26 12:41:02 +05:30
Suraj Shetty	0e59ec3ed2	Update messages UI	2018-08-26 10:07:00 +05:30
Suraj Shetty	88700cf2b9	Separate links for selling and buying messages - Add separate UI for selling messages - Remove some redundant code messages	2018-08-26 10:06:27 +05:30
Prateeksha Singh	de426cb543	[hub][vue] Home page, add section title in item key in v-for	2018-08-25 21:54:49 +05:30
Prateeksha Singh	53fada1ae9	[hub][vue] search page	2018-08-25 20:31:48 +05:30
Prateeksha Singh	0be2859f5b	[hub][vue] Category and Published Products pages	2018-08-25 15:54:43 +05:30
Prateeksha Singh	c31e5c0013	[hub][vue] replace page files, fix item 'seen' prop	2018-08-25 14:09:01 +05:30
Prateeksha Singh	00175eab8e	[hub][vue] Saved Products Page, remote item card - also undo unfavouriting items	2018-08-25 13:18:30 +05:30
Prateeksha Singh	fe41713974	[hub][vue] add import	2018-08-24 16:53:34 +05:30
Prateeksha Singh	40f7c4663a	[hub][vue] Publish Page	2018-08-24 16:38:34 +05:30
Prateeksha Singh	67e0374261	[hub] add data-driven notification message	2018-08-23 23:55:04 +05:30
Prateeksha Singh	b696b2965d	[hub][vue] add empty state and dynamic publish button	2018-08-23 21:25:53 +05:30
Prateeksha Singh	d7d2bb261b	[hub] add SearchInput	2018-08-23 13:52:41 +05:30
Prateeksha Singh	6e5b9a8f9b	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-23 12:23:09 +05:30
Prateeksha Singh	ff616b8845	[hub][vue] init item card container in vue	2018-08-23 12:22:20 +05:30
Maxwell Morais	4a394bcbf4	Fix shipping_address for DropShipping (#15202 ) This stretch of javascript go against the address definition for DropShipping. When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address. To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.	2018-08-23 11:08:37 +05:30
Suraj Shetty	341386e3a7	Add list view for messages	2018-08-22 21:31:16 +05:30
Suraj Shetty	d94701e5cc	Add recent message block to item_card	2018-08-22 16:47:50 +05:30
Suraj Shetty	b361c234b1	Remove unused message to avoid confusion	2018-08-22 16:44:55 +05:30
Suraj Shetty	7ee79498fc	Hide review option for unregistered user	2018-08-22 12:09:40 +05:30
Suraj Shetty	831ff42101	Stop event bubbling on clicking edit item	2018-08-22 11:52:20 +05:30
Suraj Shetty	12de0aec11	Fix publish button alignment	2018-08-22 11:50:23 +05:30
Suraj Shetty	7a040c4dd8	Show favorite button only for registered user	2018-08-22 11:32:49 +05:30
Faris Ansari	e745e85d98	feat: route to message room page after contact seller dialog	2018-08-21 19:48:42 +05:30
Faris Ansari	e7af44f1a6	fix: remove items with invalid image	2018-08-21 19:48:06 +05:30
Faris Ansari	a22aa60a17	Merge with upstream	2018-08-21 19:17:25 +05:30
Faris Ansari	ff189b6853	fix: publish items - Pass image data as a json - ignore duplicates while creating Hub Tracked Item	2018-08-21 19:14:44 +05:30
Faris Ansari	d29a3b3567	Highlight links with part route or full route	2018-08-21 19:12:10 +05:30
Prateeksha Singh	b0a3a106fc	[hub] profile email uneditable, style additions, base64 sync enable	2018-08-21 17:43:30 +05:30
Faris Ansari	d17aedb719	Add BuyingMessages page	2018-08-20 18:33:46 +05:30
Faris Ansari	8de6380648	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-20 15:58:58 +05:30
Prateeksha Singh	71b41b4771	[hub] response data in hub call event trigger	2018-08-20 15:42:48 +05:30
Prateeksha Singh	e72a2fa9de	[hub] emit hub call event to set category options while publishing	2018-08-20 14:18:07 +05:30
Prateeksha Singh	6faffa5007	[feat] new component: ItemPublishDialog	2018-08-20 14:02:33 +05:30
Prateeksha Singh	4ce54b0011	[feat] new component: NotificationMessage	2018-08-20 13:07:23 +05:30
Prateeksha Singh	42be665412	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-20 10:08:49 +05:30
Prateeksha Singh	96fdbd467d	[hub][feat] stateful publishing area	2018-08-20 10:07:56 +05:30
Prateeksha Singh	fe67508d60	[hub][feat] Edit your Profile, recycle profile dialog	2018-08-20 01:18:41 +05:30
Prateeksha Singh	305f7375d1	[hub] Register in a dialog instead of Page - in order to recycle it for Edit Profile - Also, the register page had too much custom code	2018-08-20 00:25:26 +05:30
Prateeksha Singh	a525d12f69	[hub] sync multiple image urls - using a simple multiselect currently	2018-08-19 22:31:33 +05:30
Prateeksha Singh	0a60d1cd96	[hub] Publishing Dialog, Sync category - Hub Category selection - Recycled	2018-08-19 19:39:00 +05:30
Faris Ansari	2ce2e1b6b0	feat(messages): split messages into buying and selling - messages will be organized by their purpose, i.e Buying and Selling - on clicking the buying item, the message room page will be opened where sellers can communicate - invalidate cache using event key	2018-08-17 18:39:36 +05:30
Faris Ansari	335c0f200f	feat: custom cache invalidation for hub calls In some cases, we know when to invalidate the cache. This feature allows to do just that. erpnext.hub namespace is now an EventEmitter instance.	2018-08-17 16:04:14 +05:30
Faris Ansari	c1fe1c45c7	feat: empty states for favourites and search page	2018-08-17 14:29:42 +05:30
Faris Ansari	aa46567439	refactor: rename hub-card-container to hub-items-container	2018-08-17 14:29:22 +05:30
Rushabh Mehta	8705371ef0	fix(product-listing): fix variant selection in website	2018-08-16 09:22:45 +05:30
Prateeksha Singh	460e2798cd	[hub] Favourites UI - remove from listing - add to favourites	2018-08-14 11:42:40 +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
Prateeksha Singh	1a0fb5b63a	Add detail page favourited state	2018-08-14 01:31:03 +05:30
Prateeksha Singh	c5a9972785	[refactor][major] Separate out Components - item_card - item_card_container - detail_view - search_bar - reviews - skeleton_state - empty_state - empty_state	2018-08-13 21:36:07 +05:30
Saurabh	20fb443f0c	[Resolved] merge conflicts	2018-08-10 17:11:30 +05:30
Prateeksha Singh	b777f3dbfd	[layout][iterate] item detail page actions	2018-08-10 10:38:28 +05:30
rohitwaghchaure	8356d4b892	[Fix] disable_rounded_total not found error (#15113 )	2018-08-09 15:51:11 +05:30
Rushabh Mehta	4d0b8da0e5	fix(style): modal for website	2018-08-08 14:48:02 +05:30
Solufyin	3be899caff	Item Alternate Image Features in e-commerce site. (#15044 ) * [ADD] Added Item Alternate Image Features in e-commerce site. * [IMP] Improved Code for Item Alternate Image Feature. * [IMP] Improved code for Item alternative image functionality. * Remove .css file and make a build for erpnext-web.css * Cleanup styling for item alternate image, also add delegated handler * Spaces -> Tabs * Spaces -> Tabs in item.html	2018-08-07 18:28:39 +05:30
Saurabh	824b388631	Resolved merge conflicts	2018-08-07 13:01:11 +05:30
Prateeksha Singh	28d52dfe0c	[hub][fix] Category page api call	2018-08-07 12:56:56 +05:30
Prateeksha Singh	318cca8cae	[hub] Add 'See All' for Category items - Also remove special `cursor: pointer` style - Set it for all elements having a data-route	2018-08-07 12:41:21 +05:30
Prateeksha Singh	82b9508622	Add Products by Seller	2018-08-07 12:02:14 +05:30
Prateeksha Singh	658d1bbae2	Fix product header styles	2018-08-06 19:13:10 +05:30
Prateeksha Singh	d3da401ef4	Home: Category-wise Items	2018-08-06 18:31:26 +05:30
Prateeksha Singh	a5f6e54b70	fix merge conflict	2018-08-06 13:56:53 +05:30
Prateeksha Singh	106856b1ab	Show View count on items	2018-08-02 02:07:04 +05:30
Prateeksha Singh	32a2148651	[hub] Company (Seller) page	2018-08-02 01:42:23 +05:30
Faris Ansari	eeedc3bb47	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-08-01 19:19:58 +05:30
Faris Ansari	2a81b4acd6	Messages: first cut	2018-08-01 19:19:53 +05:30
rohitwaghchaure	ae4ff5a403	[Fix] In words showing grand total instead of rounded total (#15065 )	2018-08-01 18:09:51 +05:30
Nabin Hait	041a5c2d3b	Get Advances and auto allocate (#14970 )	2018-08-01 18:07:39 +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
Prateeksha Singh	3aed5c219f	[hub] make get_items generic, add legacy.py	2018-08-01 17:32:13 +05:30
Prateeksha Singh	b4e9ec33cb	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-08-01 16:39:10 +05:30
Prateeksha Singh	6495d532a6	[restructure] make api.py	2018-08-01 16:38:39 +05:30
Faris Ansari	5249307f27	Prevent access of registered routes	2018-08-01 16:29:40 +05:30
Faris Ansari	2de046fbed	Add generic action handler to subpage	2018-08-01 15:57:28 +05:30
Faris Ansari	de85f24383	Rename base_page to subpage	2018-08-01 15:57:13 +05:30
Faris Ansari	fbe9a46d51	Add Marketplace link to user dropdown in toolbar	2018-08-01 15:56:39 +05:30
Faris Ansari	709a4a3f4e	Break marketplace.js into multiple files	2018-08-01 14:09:07 +05:30
Faris Ansari	c0a22a689e	Item Menu dropdown	2018-08-01 13:35:32 +05:30
Faris Ansari	057839298c	fix get_category call	2018-07-31 19:06:11 +05:30
Faris Ansari	300c07c3d9	Use hub.call for categories and favourites	2018-07-31 18:02:13 +05:30
Faris Ansari	1ff25279bf	Remove old hub styles	2018-07-31 17:59:03 +05:30
Faris Ansari	b1d6f94cdf	Merge branch 'hub-redesign' into hub-redesign-contact-seller	2018-07-31 14:54:58 +05:30
Faris Ansari	2ae80fd000	wip	2018-07-31 12:02:20 +05:30
Prateeksha Singh	425356c21c	[hub] remove test code	2018-07-31 10:45:53 +05:30
Prateeksha Singh	46df72d55d	[hub] test progress trigger	2018-07-30 13:24:01 +05:30
Prateeksha Singh	efbd2ee3f5	[hub] Realtime Sync Progress - Show progress from the migration plan - Show products being synced - Disallow publishing in sync state	2018-07-30 09:17:14 +05:30
Prateeksha Singh	811cc3f78f	[hub] resolve merge conflicts	2018-07-29 18:05:07 +05:30
Prateeksha Singh	d27b27f88a	Hub Seller Profile and Timeline - profile details fetched from server - timeline updates on publishing items	2018-07-29 16:52:16 +05:30
Prateeksha Singh	6f05ea124e	[hub] Track Hub Sync on the Server - Create a Hub Seller activity on start of Hub Sync - Store its name as remote_id in the Run - Update that activity remotely once the Run here is complete, status	2018-07-29 14:40:52 +05:30
Faris Ansari	296848cb69	Publish Page - Code cleanup - Separate local item card and hub item card - Use make_search_bar	2018-07-28 16:14:22 +05:30
Faris Ansari	abcc8ab8e5	Push review area to bottom	2018-07-28 13:57:16 +05:30
Prateeksha Singh	d0a1a4fe90	[hub] differentiate self-published items	2018-07-28 13:16:09 +05:30
Prateeksha Singh	f6f429fb10	[hub] Item page skeleton	2018-07-28 12:25:14 +05:30
Prateeksha Singh	dd8045759f	[hub] Published Products Page	2018-07-28 01:54:51 +05:30
Faris Ansari	19d40cafba	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-07-27 21:51:31 +05:30
Faris Ansari	b7a63ab81e	Homepage - show random items from each hub seller - show items from country - move add_review method on hub	2018-07-27 21:51:26 +05:30
Prateeksha Singh	f4fbf5215b	[hub][search] empty search and route fallback	2018-07-27 21:07:56 +05:30
Faris Ansari	44f7d2e62b	SearchPage	2018-07-27 15:33:00 +05:30
Faris Ansari	24d5f17255	NotFound page for marketplace	2018-07-26 19:22:58 +05:30
Faris Ansari	b5ce1976b8	Move marketplace code back to marketplace.js	2018-07-26 18:46:38 +05:30
Faris Ansari	521fe4d01d	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-07-26 18:39:34 +05:30
Faris Ansari	cae856cbda	Add marketplace back to hub_listing	2018-07-26 18:39:28 +05:30
Faris Ansari	f4884f8108	Marketplace - Cache hub calls - call_hub_method using FrappeClient connection - Become a seller UX fixes	2018-07-26 18:37:01 +05:30
Faris Ansari	2ca5afa214	Move marketplace ui to marketplace.js	2018-07-26 18:35:04 +05:30
Prateeksha Singh	d450c0ac08	[hub][publish] in_progress/empty state	2018-07-26 17:24:33 +05:30
Prateeksha Singh	b750425288	[hub] sync in progress	2018-07-26 16:25:22 +05:30
Prateeksha Singh	d1224ca662	[hub][init] add profile page	2018-07-26 13:39:06 +05:30
Prateeksha Singh	f26177bdbc	[hub] setup publish items flow	2018-07-26 10:38:11 +05:30
Prateeksha Singh	1d1696080e	[hub][publish] add search, fix multiple append	2018-07-26 08:36:33 +05:30
Prateeksha Singh	505f6f14e9	[hub][publish] select/deselect all items	2018-07-26 08:06:21 +05:30
Prateeksha Singh	9685d7c37a	[hub] registered vs read-only views	2018-07-26 01:12:00 +05:30
Prateeksha Singh	cf2d2a5c75	[hub][init] add publish items page	2018-07-25 20:02:12 +05:30
Faris Ansari	6b07898ef0	semicolon	2018-07-25 17:07:26 +05:30
Faris Ansari	ed1190126e	Fix Syntax Error in hub_factory.js	2018-07-25 16:51:01 +05:30
Prateeksha Singh	bc8caefc19	[hub] add register as a seller page	2018-07-25 11:08:23 +05:30
Faris Ansari	0fbaa72504	Add review area	2018-07-25 00:49:11 +05:30
Zlash65	617532b2cb	Factory: class.extend -> es6 class	2018-07-24 14:20:10 +05:30
Faris Ansari	ea2d1b0a19	New page: marketplace - subpages: home, favourites, item, category	2018-07-23 18:44:46 +05:30
Prateeksha Singh	ebb5662cb7	[revert] modules dropdown	2018-07-23 17:04:34 +05:30
Faris Ansari	f585197045	Cleanup homepage	2018-07-23 11:55:07 +05:30
Faris Ansari	789ad180ea	Merge pull request #14969 from netchampfaris/financial-statement-reports Financial Reports fixes	2018-07-21 12:28:31 +05:30
Prateeksha Singh	abca510f9a	Update conf.js	2018-07-20 16:07:50 +05:30
Faris Ansari	5986d59b01	Financial Reports - Update formatter for use with DataTable - Fetch Currency from filters and fallback to company currency	2018-07-20 15:11:55 +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
Nabin Hait	26786bd35d	minor route fix for general ledger	2018-07-17 15:59:15 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +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
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
Zarrar	c1225a84cc	fix css for coa dialog in setup wizard (#14793 )	2018-07-03 10:35:31 +05:30
Ranjith Kurungadam	a10f118ddd	Payroll Entry - Validate Attendance (#14738 )	2018-06-28 23:28:07 +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
Zarrar	254ce645b1	[ Enhance ] Setup Wizard - Chart of Accounts (#14698 ) * enable selection of coa for user Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart * read chart from file and make a tree render-able dict of it * tree method to return node data for coa setup wizard	2018-06-28 14:15:34 +05:30
Prateeksha Singh	5d227c9028	Revert "[hub] add link in modules"	2018-06-28 09:59:46 +05:30
Prateeksha Singh	84d358bd0a	Merge pull request #14708 from pratu16x7/hub-fixes [hub] add link in modules	2018-06-28 03:23:03 +05:30
Prateeksha Singh	2e0b5140e7	[hub] add link in modules	2018-06-28 03:17:39 +05:30
Rushabh Mehta	096b943b0c	[minor] fixes to moment.defaultDateFormat and daily work summary eplies	2018-06-25 22:38:20 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604 ) * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
Zarrar	e25dcd2737	[Minor] Report related fixes (#14620 ) * fix in query incase list is empty * periodicity not found error when called from consolidated financial statements and custom cash flow is activated * unset currency filter to apply default currency or so * python 2 - 3 fix	2018-06-21 10:53:12 +05:30
Charles-Henri Decultot	fc2292f08c	Email alert renamed to Notification (#14618 )	2018-06-21 09:17:52 +05:30
Saurabh	59798b4e88	resolved merge conflict	2018-06-20 15:23:25 +05:30
Nabin Hait	875c941f3d	fixes in setting itemised tax breakup	2018-06-18 17:41:27 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
Manas Solanki	2df1b31707	[minor] minor fixes along with the codacy	2018-06-14 15:55:38 +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
Rohit Waghchaure	f270567c45	[Fix] Test cases for asset	2018-06-12 12:20:52 +05:30
Prateeksha Singh	ea7533fa75	[tax-breakup] store itemized tax by item_name when can	2018-06-11 13:31:33 +05:30
Prateeksha Singh	00ab78d768	[hub] set page title dynamically	2018-06-07 14:13:00 +05:30
Prateeksha Singh	9a7f957ace	[hub] fix item page recursion	2018-06-07 12:40:40 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
Sushant Nadkar	64907e5083	Validate response message for frappe call (#14343 )	2018-06-05 10:33:04 +05:30
rohitwaghchaure	5ecc26bf15	[Fix] get_shipping_address() takes at least 1 argument (0 given) (#14328 )	2018-06-04 11:00:24 +05:30
Prateeksha Singh	8ac7dfee36	Merge pull request #14329 from pratu16x7/hub-fixes [hub][minor] remove links #14309	2018-06-04 10:28:47 +05:30
Prateeksha Singh	e73df88863	[hub][minor] remove links #14309	2018-06-04 10:26:49 +05:30
rohitwaghchaure	780952ea03	Show actual qty in warehouse link search (#14258 )	2018-05-31 09:29:18 +05:30
Prateeksha Singh	09e46a4e5f	Hub fixes (#14281 ) * [hub] remove list freeze * [hub] fix svg in icon * [hub] implement route options in hub list view	2018-05-30 15:12:20 +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
Valmik Jangla	b52d5b21a1	Add UOM to Item View with Price	2018-05-17 00:09:21 -07:00
Doridel Cahanap	e42192bb6c	[WIP] Alternative items (#13705 ) * Alternative Items in BOM * Alternative Items in Work Order	2018-05-16 10:58:39 +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
Saurabh	62a59301ef	[fix] resolved merge conflicts	2018-05-15 13:02:40 +05:30
Shreya	0db85067b2	Add For Buying and For Selling checkboxes in Currency Exchange	2018-05-15 12:48:10 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
Faris Ansari	404f39d373	[fix] apply price list in_apply_price_list flag remains true if server exception occurs	2018-05-14 15:46:45 +05:30
Zlash65	2e0809801d	controller and other changes	2018-05-14 11:45:38 +05:30
Nabin Hait	b9fed2aa38	Removed company from Finance Book and related changes	2018-05-09 15:10:29 +05:30
Gaurav Naik	8cbbdfdf30	Added finance book filter to financial_statements.js	2018-05-09 15:03:05 +05:30
Shreya Shah	204c3bc37e	Remove Production Planning Tool docs (#13946 ) * Remove Production Planning Tool docs * Remove Offer Letter Occurrences * Rename Employee Loan Occurrences	2018-05-07 18:21:03 +05:30
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +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
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
rohitwaghchaure	0065624fe0	Tax amount showing under wrong tax header in the report (#13843 )	2018-05-02 12:20:55 +05:30
Shreya	14bd43d5eb	minor changes	2018-04-30 15:30:42 +05:30
Shreya	a20157af17	on item, warehouse and batch triggers, fetch serial nos based on batch	2018-04-26 14:39:21 +05:30
Prateeksha Singh	420c79041e	[fix] company listing context	2018-04-05 14:44:16 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
Prateeksha Singh	b60a52b194	Hub Market (#13325 ) * [hub] enable hub with OAuth token from user's client ID * [hub] settings schema for adding users * [hub] image view style listing * [hub] broken image link fallback * [wip] * [hub] bootstrap timeline * [hub] setup quick view * [hub] reformat ratings, add companies autocomplete filter * [hub] common listing frames * [hub] setup sort selector * [hub] timeline * [hub] customize list header * [hub] genuine form fieldtypes * [hub] review products * [hub] suggest missing categories remotely * [hub] Wishlist; header and title templates * [hub] link wishlist, remove company migration * [hub] calculate ratings	2018-04-03 10:44:13 +05:30
Charles-Henri Decultot	6860036b01	Agriculture module corrections (#13438 ) * Agriculture module corrections * Update ternary_plot.js	2018-04-02 10:51:53 +05:30
Shreya Shah	5d71609f0b	Timer fixes (#13443 ) * alert for exceeded time only when dialog is open * fetch row having an activity without from_time * fixes if timesheet created from work order * reset timer limit exceeded	2018-04-02 10:32:39 +05:30
Manas Solanki	a7f5589564	fix for the update button in the sales invoice (#13435 )	2018-04-02 10:32:00 +05:30
Nabin Hait	ff2e4c898a	Fixed merge conflict	2018-03-29 13:57:39 +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
rohitwaghchaure	68ba4fd697	[Fix] Multi-batch selection issue in POS (#13407 )	2018-03-28 12:33:15 +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
Zarrar	7f4cd3f5ea	Update Docs for Work Order (#13403 ) * update docs * rename files, update pngs * update pngs for timesheet, leftover changes	2018-03-27 14:59:49 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
Shreya Shah	149f7ee875	[Fix] General Ledger Report (#13374 ) * error fix if party_type = student or shareholder * clear party filter when party_type changes to avoid error throw * dict with values of party_name in utils.js * fetch party_name from erpnext.utils.get_party_name * Update general_ledger.py	2018-03-27 11:29:25 +05:30
Shreya	8bb0f05451	added task field	2018-03-23 11:46:45 +05:30
Shreya	822ba21f38	codacy fix	2018-03-23 11:41:56 +05:30
Shreya	559011404a	removed timesheet.html, appended it as a helper function	2018-03-23 11:41:56 +05:30
Shreya	5bf24be704	minor fixes	2018-03-23 11:41:56 +05:30
Shreya	8f06266838	all fields editable	2018-03-23 11:41:55 +05:30
Shreya	68ec22a90c	moved timer.js to public/js	2018-03-23 11:41:55 +05:30
rohitwaghchaure	6a2d073fe1	Merge pull request #13353 from PawanMeh/fixes_13352 Add total qty to offline POS	2018-03-22 11:36:32 +05:30
Faris Ansari	34dd079a68	Remove unnecessary columns Analytics Reports (#13344 )	2018-03-22 11:12:02 +05:30
pawan	53a4d2c430	[fix] #13352	2018-03-21 09:19:36 +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	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Nabin Hait	c3889d85a1	Update shopping_cart.js	2018-03-09 16:28:25 +05:30
rohitwaghchaure	a32e57ae82	[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233 )	2018-03-08 16:21:13 +05:30
Raghavendra Kamath	6193b92b70	Add new logo in splash image and optimise pngs (#13206 )	2018-03-07 12:39:38 +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
Faris Ansari	7c744acc49	Changes for Rollup (#12924 ) * Changes for rollup * remove variables.less	2018-02-20 14:21:50 +05:30
Jay Parikh	33b2614377	[Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966 )	2018-02-16 14:45:40 +05:30
Zarrar	441a1e1b8a	Validate Bank name in Setup wizard on the same slide (#12968 ) * validate bank name before moving on to next slide * Update setup_wizard.js	2018-02-16 14:44:42 +05:30
Shreya Shah	3a9eec2e92	Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913 ) * pass bill_date as parameter and calculate due_date on that basis * calculate payment_schedule on the basis of bill_date if present else posting_date * add bill_date as an argument to get_party_details * pass bill_date on supplier trigger in purchase invoice	2018-02-16 13:05:21 +05:30
Shreya Shah	8b531c1ee6	Fix parenthesis in buying controller (#12923 )	2018-02-15 11:21:49 +05:30
Prateeksha Singh	387a242232	Merge pull request #12928 from pratu16x7/hub-pages Hub pages	2018-02-15 11:05:22 +05:30
Prateeksha Singh	9889899603	[hub] cleanups	2018-02-15 10:54:23 +05:30
Prateeksha Singh	1ad072f2a9	[hub] cleanups	2018-02-15 10:47:59 +05:30
Prateeksha Singh	2073959bb8	Update entity properties	2018-02-15 10:24:16 +05:30
Prateeksha Singh	6ee035ba5b	tree parent working	2018-02-15 08:50:31 +05:30
Prateeksha Singh	25d5a1d890	add company pages	2018-02-14 19:53:18 +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
rohitwaghchaure	8e675ebbe2	[Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898 )	2018-02-13 17:11:06 +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
tundebabzy	c89782502c	Report presentation currency (#12670 ) * Add new Select to filters * get the currencies from database rather than hardcoded * label report columns: - If presentation currency is available in filters, use it or - If company is available in filters, use it or - use default company currency * add new function - get_currency * tweak new function `get_currency` * add new function `convert` to convert a value to another currency * add new function `convert_to_presentation_currency` * clean up `get_currency` first pass * memoise the exchange rates * limit fetched GL entries to to_date * check if account type is p&l or not and use appropriate exchange rate based on that * change EXCHANGE RATE to a dict, use for memoisation * rename EXCHANGE_RATE * cache exchange rates and use them as needed * add docstrings * add presentation currency logic to financial statement reports * move new functions from `general_ledger.py` to new module * clean up * PEP 8 clean up * move function to util.py * PEP 8 clean up * remove presentation currency option from cashflow * adjust currency as needed * allow users to save presentation currency in Accounts Settings * add new function `get_presentation_currency_list` * refactor query_report modules with no promises * Revert "allow users to save presentation currency in Accounts Settings" This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b. * show print page in correct currency * Update utils.py	2018-02-12 15:04:50 +05:30
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
Britlog	be9a7231d4	Fix bootstrap layout and move checkout button upper (#12063 )	2018-02-12 11:28:57 +05:30
rohitwaghchaure	7e75165826	Merge branch 'develop' into fixes_12829	2018-02-09 12:01:41 +05:30
pawan	081f40c1bf	readded pos.css	2018-02-09 11:56:32 +05:30
pawan	1583120a54	remove pos.css	2018-02-08 20:00:12 +05:30
pawan	83b1b802d1	print hide and pos.less changes	2018-02-08 19:56:12 +05:30
pawan	735b8c6094	[fix] #12829	2018-02-08 16:20:46 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
Faris Ansari	f7717b9ec2	get_party_account only if company is set	2018-02-08 11:11:21 +05:30
Prateeksha Singh	152bf37e7f	Merge pull request #12813 from pratu16x7/hub-fixes Hub listing and entity page	2018-02-08 10:47:16 +05:30
Prateeksha Singh	4413ce1be1	company page, deprecate custom page	2018-02-07 23:50:01 +05:30
Nabin Hait	c224d34a2c	Merge branch 'master' into develop	2018-02-07 16:07:20 +05:30
Rohit Waghchaure	e8d22bb999	[Fix] Incorrect change amount if enabled rounded total	2018-02-05 18:13:29 +05:30
Prateeksha Singh	3eaccffbd9	[hub] items searchable via core filters	2018-02-05 12:58:30 +05:30
Prateeksha Singh	b8e9c9be08	[hub] form (info) view for items	2018-02-05 12:58:30 +05:30
Faris Ansari	9b64620bc0	[hub] hub page using BaseList	2018-02-05 12:57:49 +05:30
rohitwaghchaure	441032d39c	Merge branch 'develop' into develop	2018-02-01 16:54:10 +05:30
Cesar	d8b1927e8d	Allow no ZERO Payment Allow no ZERO Payment	2018-01-29 15:39:52 +01:00
Saurabh	d581ff40ea	Merge branch 'master' into develop	2018-01-29 17:42:37 +05:30
rohitwaghchaure	52beb77539	Don't validate payment terms for POS (#12692 )	2018-01-29 17:40:44 +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
Saurabh	fb2f97391f	resolved merge conflicts	2018-01-24 11:24:10 +05:30
Rushabh Mehta	b5a3df920c	[fix] primary button color for make	2018-01-23 16:08:52 +05:30
Saurabh	3959aeb848	[fix] parse value before setting it to dissable_rounded_total on Purchase Invoice	2018-01-23 15:40:43 +05:30
Maxwell Morais	7cffd618ab	Serial No, wont relates to the warehouse The serial no, picker wont follow the target serial no	2018-01-22 22:33:28 -02:00
Saurabh	ef31637549	Merge branch 'master' into develop	2018-01-22 15:29:15 +05:30
Shreya	39adc8f85f	calculate total when items are removed	2018-01-22 13:08:05 +05:30
Rohit Waghchaure	c987500e08	Merge branch 'master' into develop	2018-01-19 13:29:57 +05:30
rohitwaghchaure	c8e016522d	Merge pull request #12533 from rohitwaghchaure/pos_css_issue [Fix] POS css	2018-01-18 16:12:00 +05:30
Rohit Waghchaure	5c4f52ccf1	[Fix] POS css	2018-01-18 16:10:19 +05:30
Nabin Hait	570e29d5e7	Fixed merge conflict	2018-01-17 18:56:02 +05:30
rohitwaghchaure	da941af687	Set due date in purchase invoice based on suppler invoice date (#12395 )	2018-01-17 16:23:04 +05:30
Nabin Hait	2bfa1803e9	GL Entry on asset sale (#12514 ) * GL Entry on asset sale * Asset sale test case fixed	2018-01-17 14:39:05 +05:30
Saurabh	4b0dd8a159	Merge branch 'master' into develop	2018-01-15 18:36:35 +05:30
Nabin Hait	a2426fcc9e	Get default tax template only if tax template not selected or template is for other company (#12492 )	2018-01-15 17:45:46 +05:30
Saurabh	35d8ce4fbd	resolved merge conflicts	2018-01-12 16:58:32 +05:30
rohitwaghchaure	7b78f6bee6	Added rounded total in the POS and fix rounded issue in js side (#12457 )	2018-01-12 16:28:16 +05:30
Saurabh	892a7a6980	resolved merge conflicts	2018-01-09 12:05:20 +05:30
tundebabzy	da22167741	Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382 ) * add handler for due_date: if due_date is changed and payment terms template or payment schedule is set, ask user to clear them. * ui test cases * cleanup	2018-01-09 10:58:44 +05:30
Sachin Mane	64f48db406	Batch number selector bug fix (#12346 ) * 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"	2018-01-08 17:57:32 +05:30

... 15 16 17 18 19 ...

2509 Commits