26211 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Saurabh	077e20f7ae	fix: valiadte customer while pulling information	2019-05-13 15:21:25 +05:30
Saurabh	73c6d2e44c	Merge pull request #17555 from Alchez/hotfix-lead-import-fix ... feat(crm): Allow leads to be imported without person name	2019-05-13 13:07:04 +05:30
Saurabh	d7a13ceb10	Merge pull request #17568 from Mangesh-Khairnar/event-fix ... feat(training-event): validate event period	2019-05-13 13:06:17 +05:30
Saurabh	6eadd6657d	Merge pull request #17574 from rohitwaghchaure/delayed_orders_summary_report ... feat: delayed order summary report	2019-05-13 13:05:40 +05:30
Saurabh	0c890a110d	Merge branch 'hotfix' into hotfix-lead-import-fix	2019-05-13 12:07:33 +05:30
Saurabh	0f420baaba	Merge branch 'hotfix' into event-fix	2019-05-13 11:46:29 +05:30
Aditya Hase	b32d96fc24	fix(accounts): Add missing field (#17571)	2019-05-13 10:21:41 +05:30
Suraj Shetty	cfc9e18749	Merge pull request #17532 from surajshetty3416/fix-rename-account ... fix: Show "Merge Account" button only to users with write access	2019-05-13 10:03:16 +05:30
Rohan	7178218821	Merge branch 'hotfix' into hotfix-shipping-override	2019-05-12 22:28:45 +05:30
Deepesh Garg	25d6d08329	Merge pull request #17576 from deepeshgarg007/territory_items_hotfix ... fix: Show all territories and items in inactive sales item report	2019-05-12 20:44:06 +05:30
Deepesh Garg	9bf4c754c8	Merge branch 'hotfix' into territory_items_hotfix	2019-05-12 18:40:54 +05:30
deepeshgarg007	79b02db156	fix: Indentation fixes	2019-05-12 18:27:52 +05:30
Rohit Waghchaure	e55dd7233d	feat: delayed order summary report	2019-05-12 17:17:55 +05:30
rohitwaghchaure	3ba969ad58	Merge pull request #17573 from adityahase/fix-lead-make-quotation ... fix(lead): Map lead name to quotation party_name	2019-05-12 17:10:14 +05:30
rohitwaghchaure	f93cb0a6ba	Merge pull request #17567 from rohitwaghchaure/fixed_multiple_bank_reconciliation_issues ... fix: fixed multiple bank reconciliation issues	2019-05-12 17:04:58 +05:30
Aditya Hase	e23cfd22ca	fix(lead): Map lead name to quotation party_name	2019-05-12 16:20:31 +05:30
Raffael Meyer	9eef60754d	remove unused import	2019-05-12 02:24:39 +02:00
Mangesh-Khairnar	0d1b022ea0	feat(training-event): validate event period	2019-05-11 23:30:52 +05:30
deepeshgarg007	aca3772f7d	fix: Show all territories and items in inactive sales item report	2019-05-11 21:12:51 +05:30
deepeshgarg007	569815b5ad	fix: Standard filter and dashboard fixes in quotation and opportunity	2019-05-11 20:09:29 +05:30
Rohit Waghchaure	80b696ce25	fix: wrong journal entries are showing in the reconcilliation section	2019-05-11 14:58:25 +05:30
rohitwaghchaure	ab7570b7e5	Merge pull request #17558 from rohitwaghchaure/incorrect_stock_balance_showing_in ... fix: incorrect stock balance showing in the warehouse tree view	2019-05-11 11:30:24 +05:30
NahuelOperto	c87f8c6f00	fix codecay	2019-05-10 10:46:41 -03:00
Rohit Waghchaure	c5c4de885b	fix: bank reconciliation not showing as Settled instead of Reconciled	2019-05-10 19:08:41 +05:30
NahuelOperto	a970bcc56d	fix identation	2019-05-10 09:17:52 -03:00
NahuelOperto	5e2d822509	fix error when the product bundle does not have the original item name	2019-05-10 09:00:46 -03:00
Rohit Waghchaure	6be1475882	fix: incorrect stock balance showing in the warehouse tree view	2019-05-10 17:19:50 +05:30
Rohan Bansal	43f05d1de1	feat(crm): Allow leads to be imported without person name	2019-05-10 16:03:16 +05:30
rohitwaghchaure	26bb028ec4	Merge pull request #17549 from sunhoww/pos_batch ... fix: POS batch not set correctly	2019-05-10 14:14:44 +05:30
Rohit Waghchaure	1637f0aeaf	fix: test cases	2019-05-10 13:42:38 +05:30
Saurabh	353f64caf8	Merge pull request #17541 from rohitwaghchaure/project_update_statue_emails_sending_frequestly ... fix: project update status emails are sent frequently	2019-05-10 13:24:24 +05:30
Saurabh	5afb00a7f4	Merge branch 'hotfix' into fix-rename-account	2019-05-10 12:40:00 +05:30
Saurabh	b0ec0f545e	Merge pull request #17540 from surajshetty3416/fix-slow-item-search ... perf: Index show_in_website field for faster item search	2019-05-10 12:38:06 +05:30
rohitwaghchaure	7088513da9	Update project.py	2019-05-10 12:04:21 +05:30
Mohammad Noureldin	8908d4ee8f	17547: ... - Filling in 'customer' arg field if not already set and if 'party_name' is available - This will fix the logic during which Pricing Rule is constructing the SQL query to list all Pricing Rules related to an item - The reason to put it in accounts_controller is: -# This is the palce when args are made before making call which will end using Pricing Rule logic, which means we don't have to go all over the place to add the proper arg field -# IMHO, it is clean enough in contrast to the case where that code is added to pricing_rule.py for example, cause doing this exposes Pricing Rule to the knowledge about a field called 'party_name' while a Pricing Rule document doesn't have any	2019-05-09 18:21:32 +02:00
Sun Howwrongbum	8133970944	fix: POS batch not set correctly	2019-05-09 20:45:19 +05:30
Rohit Waghchaure	dac7ede911	fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount	2019-05-09 19:50:00 +05:30
Rohit Waghchaure	b052498348	fix: project update status emails sent frequently	2019-05-09 19:04:58 +05:30
Aditya Hase	d62de6c8e5	fix(hr): Use event_status instead of status ... Training Feedback DocType has event_status field (not status) This was broken since PR #10379, PR #17197 made this failure explicit.	2019-05-09 19:01:00 +05:30
Suraj Shetty	d37cc9a5d0	perf: Index show_in_website field for faster item search	2019-05-09 18:49:57 +05:30
Suraj Shetty	c7062d8be7	fix: Check permissions before renaming the account	2019-05-09 14:18:41 +05:30
Suraj Shetty	1435e30ad5	fix: Show "Merge Account" button only to users with write access	2019-05-09 14:16:49 +05:30
Raffael Meyer	3799aabc46	Merge branch 'hotfix' of https://github.com/frappe/erpnext into datev_report	2019-05-09 04:04:33 +02:00
Raffael Meyer	4b2901704c	Add download button	2019-05-09 04:03:23 +02:00
Raffael Meyer	e5f7af9e9f	Use pandas, more columns, filter by date	2019-05-09 03:54:49 +02:00
Anurag Mishra	6fc136fcb8	Merge branch 'hotfix' into copy_payment_schedule_from_quot_to_SO	2019-05-08 23:07:31 +05:30
rohitwaghchaure	b2ff0bda32	Merge pull request #17526 from rohitwaghchaure/allow_data_import_for_salary_slip ... fix: allow data import for salary slip	2019-05-08 22:20:20 +05:30
Rohit Waghchaure	ff42d7b5ed	fix: allow data import for salary slip	2019-05-08 20:17:47 +05:30
Anurag Mishra	35a4cae2f6	feat: Adding action Stop or Warn for Quality inspection if it is not submitted ... * feat: added action on quality inspection * feat: added action on quality inspection * feat: Allow the user to by pass inspection if action is warn ad stop when action is to warn * patch: for setting default action to 'Stop' * fix: resolve conflicts * fix: travis * Update stock_controller.py	2019-05-08 17:41:04 +05:30
rohitwaghchaure	a76cafecb0	Merge pull request #17521 from rohitwaghchaure/fixed_get_invoiced_item_gross_margin ... fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin	2019-05-08 16:17:11 +05:30