brotherton-erpnext

Author	SHA1	Message	Date
Frappe Bot	e8c2fdfb8c	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
Frappe Bot	9a9c9c2ba3	bumped to version 10.1.76	2018-12-26 11:09:34 +00:00
rohitwaghchaure	56c5d8b784	Merge pull request #16286 from rohitwaghchaure/fixed_patch_rename_bom_wo_fields [Fix] Patch rename_bom_wo_fields	2018-12-26 16:26:19 +05:30
Rohit Waghchaure	8406720a7a	[Fix] Patch rename_bom_wo_fields	2018-12-26 16:25:44 +05:30
Charles-Henri Decultot	9c1db688d1	Ignore pricing rule for Travis	2018-12-26 10:33:42 +00:00
rohitwaghchaure	53a38e8edc	Merge pull request #16257 from surajshetty3416/permission-fixes Fix user permission checks	2018-12-26 14:49:01 +05:30
Charles-Henri Decultot	899b9b1ea7	Codacy correction	2018-12-26 08:56:11 +00:00
Charles-Henri Decultot	9d31452c25	Remove ununsed variable	2018-12-26 08:38:42 +00:00
Charles-Henri Decultot	ed94317df9	Test cases	2018-12-26 08:36:32 +00:00
deepeshgarg007	a1d015cc2f	Initialized loyalty_point_details	2018-12-26 11:01:02 +05:30
Rohit Waghchaure	52a692ee08	[Fix] Not able to delete customer if contact is available	2018-12-26 02:34:13 +05:30
Himanshu	0209ef0fc5	Quality Management System (#15893 ) * Added QMS to ERPNext * changes * fixed * code refracted * refracted * some bugs fixed * changes * changes * test case * bug fix unit test * bug fix * refracted code * test warning fix * test case bug fix * removed whitespace * indentation bug fix * unit test bug fix * fixed Tree * bug fix * bug fix * code refactor * fixed procedure tree * removed unnecessary fields * hide fields * removed depricated unit test method * sql injection bug fix * code refactor and added mandatory fields * Removed Add Child from TreeView * Unit Test crashes Fix * code refactor * Fixed Status of Action * removed add button from Chart of Procedure * Fixed Unit Test for Quality Action * Chamged Measurement Unit to UOM * Changed Measurement Unit to UOM * Quality Action Unit Test Fix * Renamed Chart of Procedures to Tree of Procedures * Changes Objective input type to Text * Code Refactor * Quality Action Status option changed to "Close" for consistency * fixed action status indicator * Removed vscode folder * unit tests optimization * unit test fixes * code refactor * gitignore * bug fixes and code refactor * code refactor * unit test changes * changed quality action unit test * code refactor * code refactor * code refactor * indentation * code refactor * corrected typo * Removed jQuery hide() * code refracted * remove grid elements * Removed unnecessary conditions * onload fixed in feedback * code refracted * Removed add row button from Review and Customer Feedback * made autofill feild read only * automated scheduling of review	2018-12-25 17:42:31 +05:30
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	19f8e6bcf8	Fix typo	2018-12-25 15:30:09 +05:30
rohitwaghchaure	136c4c4820	Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue [Fix] Tax Withholding, TDS is applying on the tax	2018-12-25 14:49:05 +05:30
Suraj Shetty	488aa86f70	Skip some codacy warnings	2018-12-25 14:46:44 +05:30
Suraj Shetty	8775204d63	Merge branch 'develop' into general-ui-fixes	2018-12-25 14:36:43 +05:30
Suraj Shetty	9180c48262	Fix patch entry	2018-12-25 14:34:38 +05:30
rohitwaghchaure	deb96dab3e	[Fix] Salary structure not saving (#16275 )	2018-12-25 13:58:20 +05:30
Suraj Shetty	8d9960bdad	Fix patch entry	2018-12-25 12:33:37 +05:30
Suraj Shetty	bcd8f31e43	Add an entry of a patch in patches.txt	2018-12-25 11:16:49 +05:30
Rushabh Mehta	fafbb0278f	fix: reload parent after setting children	2018-12-24 22:09:15 +05:30
Rushabh Mehta	c9b1a35ac3	fix: set explicit idx for new item in update_child_qty_rate	2018-12-24 20:55:35 +05:30
Suraj Shetty	b763893f22	Fix quotes issue in item.js	2018-12-24 19:43:31 +05:30
Suraj Shetty	a3f28d40b0	Remove _label	2018-12-24 19:39:45 +05:30
Suraj Shetty	9c3dcfea76	Add a patch to rename accounts desktop icon to accounting	2018-12-24 17:00:40 +05:30
Suraj Shetty	67b311e95e	Make -> Create	2018-12-24 16:16:13 +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
Rushabh Mehta	5d11abb0a2	fix(escaping): accounts_receivable.py	2018-12-24 16:03:24 +05:30
Suraj Shetty	242b16fdfd	Rename Accounts -> Accounting	2018-12-24 15:47:23 +05:30
frappe-pr-bot	67121f6c91	[Translation] Updated Translations	2018-12-24 11:57:19 +02:00
Rohit Waghchaure	94500a9d62	[Fix] TDS is applying on the tax	2018-12-24 15:13:52 +05:30
rohitwaghchaure	7ec5e80b70	[Fix] While making sales invoice from delivery note, system not remove the returned qty (#16141 )	2018-12-24 14:55:31 +05:30
Nabin Hait	5a9579bae4	feat(quality): Check quality status before receipt/delivery (#16169 )	2018-12-24 14:54:42 +05:30
Valmik	78bc405eeb	fix: set fieldname for frappe prompt (#16198 )	2018-12-24 14:54:06 +05:30
Navdeep Ghai	c4d38c0afc	Fix the disappears of image bug after uploading and saving the employee (#16217 ) * Fix image disappears of image after uploading and saving the employee * Fix the codacy issue	2018-12-24 14:53:19 +05:30
KanchanChauhan	1790a6faaa	Set ignore_user_permission 1 for Company field in Item Default (#16167 )	2018-12-24 14:48:09 +05:30
Rohan	349040db6d	fix(work_order): Set operations for Work Order when created from MREQ (#16154 )	2018-12-24 14:42:34 +05:30
Charles-Henri Decultot	052033a76e	[Fix] Pos bugs (#16256 ) * Remove hard-coded values * Fix change pos profile + add campaign * Test case for coveralls * Remove unnecessary method	2018-12-24 14:39:30 +05:30
rohitwaghchaure	4265c5a772	Rename BOM and Work order fields (#16209 ) * Rename BOM and Work order fields * Rearranged BOM fields	2018-12-24 14:38:49 +05:30
Mangesh-Khairnar	70c5aa5f5d	[Enhancement] Pending SO Items for Purchase Request Report (#16188 ) * deleted old purchase request query report * [Enhancement] pending so items for purchase request report refactor * comments and format fix * test and minor fixes * test fixes	2018-12-24 14:25:47 +05:30
Shreya Shah	91ddadeefa	fix: add currency to options (#16199 )	2018-12-24 14:25:12 +05:30
Frappe PR Bot	25fc5b879b	[Translation] Updated Translations (#16227 )	2018-12-24 14:22:35 +05:30
Charles-Henri Decultot	083f1c5370	Safe decode project name for languages with special characters (#16254 )	2018-12-24 14:21:33 +05:30
Shreya Shah	d2b9093ecc	fix: Check if items exist (#16248 )	2018-12-24 14:21:07 +05:30
Charles-Henri Decultot	9100740ba9	[Fix] FEC: Correction of the export function (#16252 ) * Correction of the export function * Improve JS code * Codacy corrections * Codacy corrections	2018-12-24 14:20:35 +05:30
Raffael Meyer	ed3561279d	Update README.md (#16224 )	2018-12-24 14:19:51 +05:30
rohitwaghchaure	1c1798c7f2	[Fix] Warehouse wise item balance age and value report not working (#16258 )	2018-12-24 14:19:27 +05:30
Deepesh Garg	3ae2517867	Removed subscriber option form module page (#16270 )	2018-12-24 14:16:57 +05:30
Suraj Shetty	83e3c4c0fa	Fix quote error	2018-12-24 11:11:04 +05:30
Suraj Shetty	772e8780b4	Merge branch 'staging-fixes' into permission-fixes	2018-12-24 10:35:12 +05:30
Suraj Shetty	b58c317abb	Fix daily_work_summary_settings migration patch	2018-12-24 10:26:39 +05:30
Suraj Shetty	b2965001d1	Replace 'Make' with 'Create'	2018-12-23 13:25:58 +05:30
Saif Ur Rehman	8ac261750b	Add and Modified DocTypes for Item Tax Template	2018-12-22 02:51:59 +05:00
Suraj Shetty	27c37e1b77	Minor fix	2018-12-21 12:43:46 +05:30
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
Frappe Bot	7067727c0c	bumped to version 11.0.3-beta.31	2018-12-21 05:46:22 +00:00
Suraj Shetty	89625b6eef	Rename learn to help	2018-12-21 11:04:32 +05:30
Suraj Shetty	b0a84f014e	Replace desktop icon for project list with desktop icon for projects module - Add a patch to fix already install instances	2018-12-20 20:12:37 +05:30
Charles-Henri Decultot	813485023b	Filter cancelled and draft payments	2018-12-20 14:04:00 +00:00
Nabin Hait	0866b2b75a	Update accounts_receivable.py	2018-12-20 14:11:20 +05:30
shreyashah115@gmail.com	ba8c041206	fix: Check if items exist	2018-12-20 13:23:51 +05:30
Suraj Shetty	7ed37ae6c3	Commonify code - use get_permitted_documents function to avoid code redundancy	2018-12-19 19:56:42 +05:30
deepeshgarg007	b645c2c75e	Rebase using staging-fixes and resolved conflicts	2018-12-19 18:47:36 +05:30
deepeshgarg007	530453e4fc	Added temp variables for outstanding, credit_note_amt instead of function calling	2018-12-19 18:43:07 +05:30
deepeshgarg007	5de603c6af	breaked up code into multiple functions	2018-12-19 18:43:06 +05:30
deepeshgarg007	4ac8fcf4af	Added test case for Accounts receivable report based on payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	a944f88b94	Removed column for pdc date	2018-12-19 18:43:06 +05:30
deepeshgarg007	17544d7ad6	Refactored accounts receivable report for payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	e7a91b9526	Credit note fix	2018-12-19 18:43:06 +05:30
deepeshgarg007	f98adf2be5	Changed columns and added currency conditions	2018-12-19 18:43:06 +05:30
deepeshgarg007	b6c083706a	Allocation of credit note amount and pdc in payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	24f8d3ed0c	Add columns based on payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	a8ab9b5c3d	Accounts Receivable report based on payment terms	2018-12-19 18:43:06 +05:30
Nabin Hait	a78947f2de	Merge pull request #16218 from deepeshgarg007/analytics-graph [Bug-fix] Analytics report graph skipping quarter values bug fix	2018-12-19 18:08:25 +05:30
Rohit Waghchaure	f6f503a1f6	[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice	2018-12-19 15:15:35 +05:30
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
Suraj Shetty	a8d9bfdcfd	Fix: currency symbol issue in delivery note list (#16233 )	2018-12-18 14:53:17 +05:30
Rohan	159897d88d	fix(customer): Fix Total Unpaid amount in Customer dashboard (#16234 )	2018-12-18 14:52:23 +05:30
rohitwaghchaure	c4921d235a	Merge pull request #16225 from rohitwaghchaure/not_able_to_make_po_from_mr [Fix] Get items from material request not working for PO	2018-12-17 18:52:46 +05:30
rohitwaghchaure	c5c2124bba	Merge pull request #16226 from shreyashah115/fix-list Fix employee separation list	2018-12-17 18:52:05 +05:30
shreyashah115@gmail.com	a5dc08ee8e	fix: remove paid_amount and modify query	2018-12-17 16:47:17 +05:30
shreyashah115@gmail.com	0543f03b58	fix: Remove date_of_joining from field list	2018-12-17 15:02:30 +05:30
rohitwaghchaure	37d7d25018	Merge pull request #16207 from Zlash65/fix-qi [Minor] Make Quality Inspection in query configurable	2018-12-17 13:55:26 +05:30
rohitwaghchaure	d6ca23b277	Merge pull request #16219 from Zlash65/fix-holiday-leave [Minor] Fix Leave Application as half day on Holiday validation	2018-12-17 13:54:16 +05:30
rohitwaghchaure	c963ac20a6	Merge pull request #16211 from Zlash65/fix-pp [Minor] Get items for Material Requests fix	2018-12-17 13:52:25 +05:30
Rohit Waghchaure	4ac9ea0e85	[Fix] Get items from material request not working for PO	2018-12-17 11:18:46 +05:30
Zlash65	c8337c6d83	fix check for leave on holiday for half day	2018-12-15 21:15:45 +05:30
deepeshgarg007	1ee19e4167	Analytics report graph fix	2018-12-15 15:36:09 +05:30
Faris Ansari	871f4e5df5	Merge pull request #16201 from netchampfaris/fix-product-search fix(product-search): Include variants in product search	2018-12-14 16:36:42 +05:30
Nabin Hait	22a1e281a9	fix(variant): Show attribute values on single variant creation (#16204 )	2018-12-14 14:22:45 +05:30
Faris Ansari	4994d84565	fix(pos-profile): Cleanup Form for POS Profile (#16208 ) - Remove pos_profile_name field and use `name` as Prompt - Reorganize form and label sections - Remove `apply_discount` which was not used	2018-12-14 14:19:14 +05:30
Nabin Hait	d8f497ce98	Merge branch 'staging-fixes' into pplan_fix	2018-12-13 16:59:15 +01:00
Nabin Hait	614559f234	fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse	2018-12-13 16:36:35 +01:00
Zlash65	82e01bc923	fix fetch material request items logic	2018-12-13 18:31:05 +05:30
Zlash65	9fde660aaf	make quality inspection in query configurable	2018-12-13 13:28:01 +05:30
Saurabh	e165fc0e1b	Merge branch 'staging' into develop	2018-12-13 10:45:32 +05:30
Saurabh	58a4f0e157	bumped to version 11.0.3-beta.30	2018-12-13 11:15:31 +06:00
Prateeksha Singh	4ba9594b04	[setup] domain not in array	2018-12-12 22:09:00 +05:30
Prateeksha Singh	9c5676292c	[setup] add defaults stage	2018-12-12 21:29:55 +05:30
Prateeksha Singh	58db3c1c7c	[setup] fix install_defaults	2018-12-12 21:29:55 +05:30
Prateeksha Singh	0e728972e9	[setup][minor] remove unused import	2018-12-12 21:29:55 +05:30
Prateeksha Singh	d59b61cbd9	[fixtures] re-add market_segments and sales_stages utils	2018-12-12 21:29:55 +05:30
Prateeksha Singh	4da8dced94	[setup] remove unused imports	2018-12-12 21:29:55 +05:30
Prateeksha Singh	b274f8cb2a	[fix] setup chart of accounts	2018-12-12 21:29:55 +05:30
Prateeksha Singh	47118ab72a	[setup] remove redundant code - [fix] domain setup from dictionary	2018-12-12 21:29:55 +05:30
Prateeksha Singh	9282e08099	[fix] >.< call setup_taxes	2018-12-12 21:29:55 +05:30
Prateeksha Singh	c3a49b9cad	[fix] set default_bank_account in company	2018-12-12 21:29:55 +05:30
Prateeksha Singh	c0f90beb7c	Rename 'Chat' to 'Gitter Chat'	2018-12-12 21:29:55 +05:30
Prateeksha Singh	1aee75aadc	[setup] separate out setup_company	2018-12-12 21:29:55 +05:30
Prateeksha Singh	8469b27c3a	[setup] add get_country_and_charts()	2018-12-12 21:29:55 +05:30
Prateeksha Singh	aeb8abf1ed	[setup] add market segments and sales stages	2018-12-12 21:29:55 +05:30
Prateeksha Singh	6f7233229e	[setup][fix] company fixtures	2018-12-12 21:29:55 +05:30
Prateeksha Singh	6bf22fa7d7	[setup][fix] get newly created root Territory for children	2018-12-12 21:29:55 +05:30
Prateeksha Singh	c1c057611e	[setup] bundle up fixtures and setup docs	2018-12-12 21:29:54 +05:30
Prateeksha Singh	dabf349599	[setup] don't premake company fixtures	2018-12-12 21:29:54 +05:30
Prateeksha Singh	b422458224	[setup] set the default fiscal year that was made	2018-12-12 21:29:54 +05:30
Prateeksha Singh	179d82702e	[setup] fetch setup config	2018-12-12 21:29:54 +05:30
Prateeksha Singh	39b8765961	[setup][init] setup as document records	2018-12-12 21:29:54 +05:30
Faris Ansari	907e9080c4	fix(product-search): Include variants in product search	2018-12-12 19:26:52 +05:30
Saif Ur Rehman	b53231595d	Using same filter for Sales Person from Accounts Receivable Added Customer/Supplier Ledger Summary in Accounts Module page	2018-12-12 15:46:50 +05:00
Saif Ur Rehman	b07d108bee	feat: Supplier Ledger Summary	2018-12-12 05:45:49 +05:00
Saif Ur Rehman	41236ed0e5	feat: Customer Ledger Summary report	2018-12-12 05:12:20 +05:00
Rushabh Mehta	eeab3ee5d3	fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192 ) * debug(test): test_payroll_entry * debug(test): test_payroll_entry * debug(test): use frappe.db.rollback to undelete fixture data	2018-12-11 22:37:29 +05:30
Frappe Bot	fb2fdc4f4e	Merge branch 'staging' into develop	2018-12-11 09:55:01 +00:00
Frappe Bot	caed845f3e	bumped to version 11.0.3-beta.29	2018-12-11 09:55:01 +00:00
Pawan Mehta	377511165e	Simple Trial Balance (#16060 )	2018-12-10 21:55:01 +05:30
Frappe Bot	8e1326f22f	Merge branch 'staging' into develop	2018-12-10 16:05:45 +00:00
Frappe Bot	ee97a46fde	bumped to version 11.0.3-beta.28	2018-12-10 16:05:45 +00:00
Rohan	c1eb94d37f	Revert "fix(delivery): update package total on validate (#16131 )" This reverts commit `f43433b43d`.	2018-12-10 20:27:14 +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
Frappe Bot	0509d82701	bumped to version 11.0.3-beta.27	2018-12-10 13:08:33 +00:00
Tyler Matteson	afc55ca821	De-clutter, Regionalize and Domainify Accounts Module Configuration (on staging-fixes) (#16117 )	2018-12-10 18:03:19 +05:30
Saif	b52bd9c093	AR/AP Report Enhancement (#16175 ) * Modified AR/AP print format * Filter Sales Person based on either Customer or Voucher's assigned Sales Person * -Added Sales Person column to Accounts Receivable Summary -Added all filters in AR/AP Summary Report as in AR/AP Report -Reordered filters for better grouping -Fixed a bug that customer_name was not unset after removing Customer from filter	2018-12-10 17:56:42 +05:30
Rohan	f43433b43d	fix(delivery): update package total on validate (#16131 )	2018-12-10 17:47:31 +05:30
rohitwaghchaure	5472fff027	Added disabled field in the address (#16114 )	2018-12-10 17:45:39 +05:30
Frappe Bot	65a9991d84	bumped to version 10.1.75	2018-12-10 12:14:33 +00:00
RicardoJohann	bc0ef0beca	Add Serial Number button in Delivery Note and Sales Invoice's Packing List (#16080 )	2018-12-10 17:43:03 +05:30
rohitwaghchaure	398e47ecad	Merge pull request #16189 from rohitwaghchaure/transferred_qty_issue [Fix] Transferred qty cannot be null	2018-12-10 17:37:02 +05:30
Rohit Waghchaure	57633b75ed	[Fix] Transferred qty cannot be null	2018-12-10 17:36:01 +05:30
Stavros Anastasiadis	3d82b74ea4	Update Items in Submit state can add new row (#15644 ) * Update Items in Sumbit state can add new row In Sales Order and Purchase Order when docstatus is submitted user can use Update Item btn to add new child Items * Remove unused code line * Remove blocking db save thread line * Remove Company as not standard Field in Purchase Order Item * Minor indentation fix * Add Unit Test, add new row in update_child_qty_rate * Codacy fix	2018-12-10 17:30:55 +05:30
Sagar Vora	4c5bd253a2	fix(party dashboard): empty array is truthy, check for length (#16184 )	2018-12-10 17:19:10 +05:30
Rohan	39b31ece31	fix(pos): Return empty dict if no results found (#16124 )	2018-12-10 17:16:39 +05:30
Deepesh Garg	0c3c148316	Linking company address to pos profile (#16142 ) * Linking company address to pos profile * Translation fix	2018-12-10 16:22:38 +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
Nabin Hait	da9c96e9f5	Merge pull request #16150 from rohitwaghchaure/what_is_the_use_of_this_code Removed unnecessary code	2018-12-07 15:18:11 +05:30
Nabin Hait	1b529d997c	Merge pull request #16146 from rohitwaghchaure/remove_tax_amt_from_the_billed_amt_in_project [Fix] In project, tax amount is added in the total billed amount(sales) field	2018-12-07 15:17:35 +05:30
Nabin Hait	2bd6ab9fba	Merge pull request #16140 from KanchanChauhan/staging-fixes [Minor]Method path fix in Material Request js	2018-12-07 15:08:44 +05:30
Deepesh Garg	6967b44ac8	Merge branch 'hotfix' into list_view	2018-12-07 08:30:20 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
Frappe Bot	4f1c659050	bumped to version 11.0.3-beta.26	2018-12-06 09:50:24 +00:00
Frappe Bot	ee5d7e6d0f	Merge branch 'master' into staging-fixes	2018-12-06 09:26:42 +00:00
Frappe Bot	be0a349a52	bumped to version 10.1.74	2018-12-06 09:14:35 +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
rohitwaghchaure	f85856d9f8	Merge pull request #16155 from rohitwaghchaure/changed_parent_for_item_attribute_value [Fix] Permissions issue	2018-12-04 18:45:07 +05:30
Rohit Waghchaure	675567419b	[Fix] Permissions issue	2018-12-04 18:43:52 +05:30
Rohit Waghchaure	e61430b471	Removed unnecessary code	2018-12-03 18:54:26 +05:30
Rohit Waghchaure	636d186d08	[Fix] In project, tax amount is added in the total billed amount(sales) field	2018-12-03 16:04:08 +05:30
deepeshgarg007	114cc810a0	List view currency bug fix	2018-12-03 15:13:06 +05:30
Kanchan Chauhan	9dc85153e0	[Minor]Method path fix in Material Request js	2018-12-03 14:39:43 +05:30
Nabin Hait	3ecb995485	Merge pull request #16006 from gbm001/gbm001-item-barcodes-pull fix/feat: Allow extension of barcode types (without validation)	2018-12-03 14:39:14 +05:30
Nabin Hait	94eafb6674	Merge pull request #16005 from ESS-LLP/pr_staging_fixes [Feature][Fix] Healthcare - Patient Appointment	2018-12-03 14:38:32 +05:30
Nabin Hait	046a99acf8	Merge branch 'staging-fixes' into supplier-customer-dashboard-fix	2018-12-03 14:36:38 +05:30
Nabin Hait	02aad03e74	Merge pull request #16022 from ESS-LLP/fix-patch fix: healthcare patch	2018-12-03 14:36:02 +05:30
Nabin Hait	6b93f2fe0a	Merge pull request #16139 from Zlash65/fix-assess [Minor] Assessment Result fix	2018-12-03 14:33:01 +05:30
Nabin Hait	0b4ea25f83	Merge pull request #16138 from rohitwaghchaure/user_permissions_issue_item [Fix] Permissions issue while making item variants	2018-12-03 14:32:40 +05:30
Nabin Hait	dd7b020b01	fix(test): Fixed tests for period closing voucher	2018-12-03 14:24:41 +05:30
Nabin Hait	dce68422a7	Merge pull request #16133 from rohitwaghchaure/fixed_stock_value_diifference_calculation_for_stock_reco [Fix] Stock value difference calculation for stock reconciliation	2018-12-03 14:20:40 +05:30
Zlash65	db43c3af68	display message if details to fetch grade isnt filled up	2018-12-03 12:15:10 +05:30
Rohit Waghchaure	a8003c1af7	[Fix] Permissions issue while making item variants	2018-12-03 11:49:52 +05:30
deepeshgarg007	4c79274054	Fixed patch and deprecated grid reports	2018-11-30 18:01:22 +05:30
deepeshgarg007	ec5bbe351c	Row check fix for purchase analytics	2018-11-30 16:25:16 +05:30
Rohit Waghchaure	16b8ecbe05	[Fix] Stock value difference calculation for stock reconciliation	2018-11-30 16:20:52 +05:30
deepeshgarg007	94a3539015	Row check fix in stock analytics	2018-11-30 16:20:48 +05:30
deepeshgarg007	37b6a2ca0b	row check bug fix	2018-11-30 16:15:43 +05:30
Nabin Hait	eda0a6eb33	fix(test): Fixed tests for period closing voucher	2018-11-30 15:15:17 +05:30
rohitwaghchaure	ca332bdcdb	Revert "[Fix] Accounts receivable summary print is not working"	2018-11-29 18:15:29 +05:30
deepeshgarg007	ee05e358d1	Rewrote query using orm	2018-11-29 16:24:28 +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
deepeshgarg007	3c7c4a61be	Test case fix	2018-11-29 14:28:01 +05:30
deepeshgarg007	3eef6411dd	Removed print statement	2018-11-29 13:10:02 +05:30
deepeshgarg007	9ed13f4a90	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into analytics-fix	2018-11-29 12:52:44 +05:30
deepeshgarg007	1a1c013b2a	Analytics report bug fixes and code cleaning	2018-11-29 08:34:47 +05:30
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	5780e865b7	bumped to version 11.0.3-beta.25	2018-11-28 08:28:36 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
Ameya Shenoy	e3136c38e1	bumped to version 10.1.73	2018-11-28 07:57:27 +00:00
deepeshgarg007	ebe1e12a82	Codacy issue fixes	2018-11-28 08:21:54 +05:30
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	f642f86982	Merge branch 'hotfix' into accounts_receivable_summary_print_issue	2018-11-27 17:56:49 +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
Rohit Waghchaure	10bcd5113c	[Fix] Accounts receivable summary print is not working	2018-11-27 16:25:35 +05:30
deepeshgarg007	f31caffa74	Changes in get_dashboard_info	2018-11-27 15:04:12 +05:30
Nabin Hait	3b16dd7377	Merge branch 'staging-fixes' into pr_staging_fixes	2018-11-27 14:19:49 +05:30
Nabin Hait	dfd79b0349	Merge branch 'staging-fixes' into gbm001-item-barcodes-pull	2018-11-27 14:19:20 +05:30
Nabin Hait	676a2fbc8a	Merge branch 'staging-fixes' into hotfix-child-task-error	2018-11-27 14:17:23 +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
Nabin Hait	3854940e42	Merge branch 'staging-fixes' into fix-patch	2018-11-27 13:26:05 +05:30
Nabin Hait	e4cc062cf1	Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total [Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 13:22:50 +05:30
Nabin Hait	b98d08a2cb	Merge pull request #16049 from rohitwaghchaure/incorrect_stock_value_difference_calculation [Fix] Incorrect stock value difference because of negative stock	2018-11-27 13:21:43 +05:30
Nabin Hait	0090b1aa16	Merge pull request #16058 from KanchanChauhan/reflinks-in-related-docs Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate	2018-11-27 13:20:39 +05:30
Nabin Hait	ccb03fb255	Merge pull request #16073 from deepeshgarg007/receivable-summary Accounts receivable summary print fix	2018-11-27 13:11:37 +05:30
shreyashah115@gmail.com	5281fe8e50	fix: Element selector	2018-11-27 13:11:30 +05:30
Nabin Hait	72fc1b57be	Merge pull request #16083 from Anurag810/new-fix-branch [fix] delivery note with quantity equal 0 #14211	2018-11-27 13:10:31 +05:30
Nabin Hait	3c31e4ad4b	Merge pull request #16088 from rohitwaghchaure/fixed_pos_profile_packing_items If is pos is enabled and no pos profile then use the item's default warehouse for packing materials	2018-11-27 13:10:14 +05:30
Nabin Hait	6743219dc2	Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice [Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice	2018-11-27 13:09:16 +05:30
Nabin Hait	5f7b37ee11	Merge pull request #16093 from rohitwaghchaure/manufacturing_settings_permissions_issue [Fix] No permission for Manufacturing Settings	2018-11-27 13:07:44 +05:30
Rohit Waghchaure	6cc2f52fa4	[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 12:07:03 +05:30
Nabin Hait	dde952d591	Merge pull request #16092 from deepeshgarg007/salary_slip Salary slip earnings and deductions table bug fix	2018-11-27 11:39:10 +05:30
Nabin Hait	9a06543453	Merge branch 'staging-fixes' into indicators-in-leave-applications	2018-11-27 11:38:29 +05:30
Nabin Hait	f48cf001ed	Merge branch 'staging-fixes' into test-fix	2018-11-27 11:37:22 +05:30
Nabin Hait	be65af5dfe	Merge pull request #16101 from SaiFi0102/patch-1 Company rename abbr to consider more DocTypes	2018-11-27 11:36:46 +05:30
Nabin Hait	57fa8759ee	Merge pull request #16102 from deepeshgarg007/fees Paid Amount not showing for fees in web portal fix	2018-11-27 11:36:27 +05:30
Nabin Hait	f806cfecaa	Merge branch 'staging-fixes' into SO-Validate-Set-GrossProfit	2018-11-27 11:18:54 +05:30
Kanchan Chauhan	2d0b788105	[Minor] Indicators in Leave Application	2018-11-27 10:37:23 +05:30
deepeshgarg007	bc513a8828	Removed paid amount form Fees doctype	2018-11-26 20:43:39 +05:30
deepeshgarg007	a9525de0da	paid amount fix in fees	2018-11-26 20:34:32 +05:30
Saif	6a9d9d76ef	Company rename abbr to consider more DocTypes	2018-11-26 19:56:13 +05:00
Nabin Hait	78d9fac0ce	Merge branch 'staging-fixes' into pr_staging_fixes	2018-11-26 20:25:34 +05:30
Nabin Hait	15951e6e93	Merge branch 'staging-fixes' into gbm001-item-barcodes-pull	2018-11-26 20:25:29 +05:30
Nabin Hait	93595fa60a	Merge branch 'staging-fixes' into hotfix-child-task-error	2018-11-26 20:24:47 +05:30
Nabin Hait	91c811f170	Merge branch 'staging-fixes' into new-fix-branch	2018-11-26 20:23:37 +05:30
Nabin Hait	c5064069c7	Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue	2018-11-26 20:23:11 +05:30
Nabin Hait	218fa51dba	Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice	2018-11-26 20:23:00 +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
deepeshgarg007	05c2989698	removed total from graph	2018-11-26 20:19:57 +05:30
Nabin Hait	7f02659425	Merge branch 'hotfix' into address_not_set_from_api	2018-11-26 20:16:54 +05:30
Nabin Hait	b32abde2ac	Merge branch 'staging-fixes' into bug-fixes	2018-11-26 20:05:09 +05:30
Saif Ur Rehman	5fdbc68ca3	Set Gross Profit on server-side validation of Sales Order	2018-11-26 19:32:16 +05:00
Rohit Waghchaure	b4a5993ece	On uncheck is return field clear the reference field	2018-11-26 20:02:01 +05:30
Nabin Hait	21983b8432	Merge pull request #16001 from jsukrut/staging-fixes [FIX][#15018][PATIENT Relation should be unique]	2018-11-26 20:01:19 +05:30
Nabin Hait	56dc5c1be3	Merge branch 'staging-fixes' into pos-profile-fix	2018-11-26 19:59:07 +05:30
Nabin Hait	212a29ae2c	Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger [Fix] Not able to view general ledger for purchase invoice	2018-11-26 19:57:24 +05:30
Nabin Hait	25e60f3934	Merge pull request #16044 from ESS-LLP/fix-trial-balance fix: Trial Balance print	2018-11-26 19:56:27 +05:30
Nabin Hait	4191d7eb52	Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice Fixed get_buying_amount in Gross Profit report:	2018-11-26 19:55:06 +05:30
Nabin Hait	d0af0887be	Merge pull request #16051 from SaiFi0102/patch-1 Remove "Test" Letter Head	2018-11-26 19:47:07 +05:30
Nabin Hait	36f266355d	Merge branch 'staging-fixes' into fixed_holiday_list_not_working	2018-11-26 19:44:11 +05:30
Nabin Hait	736ce9a176	Merge pull request #16095 from SaiFi0102/BugFix-Rate-Calculation Fixed error due to incorrect use of 'this' while calculating rate	2018-11-26 19:31:25 +05:30
Saif Ur Rehman	147fa73d3f	Fixed incorrect use of 'this' causing errors calculating rate	2018-11-26 18:14:06 +05:00
Rohit Waghchaure	d1a85a3637	[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice	2018-11-26 18:42:29 +05:30
Rohit Waghchaure	15ed7a6351	[Fix] No permission for Manufacturing Settings	2018-11-26 17:31:18 +05:30
Anurag Mishra	5b6dd58b3e	fixed ZeroDivisionError in sales_order.py	2018-11-26 17:22:50 +05:30
deepeshgarg007	bd87903b56	Added condition for default amount	2018-11-26 17:13:59 +05:30
Anurag Mishra	e657fe84b8	making validation generic for sales order,sales invoice,purchase order etc.	2018-11-26 17:13:10 +05:30
Anurag mishra	6ddb15b3df	fix(validate): Qty is mandatory in delivery note	2018-11-26 17:13:10 +05:30
Anurag mishra	7b2c445707	Delivery Note fixes	2018-11-26 17:13:10 +05:30
Nabin Hait	73ca3cfca6	fix(test): removed test print	2018-11-26 16:16:42 +05:30
deepeshgarg007	533066eb87	Salary slip bug fix	2018-11-26 15:04:21 +05:30
Rohit Waghchaure	3893ba302c	If is pos and no pos profile use the item's default warehouse for packing materials	2018-11-26 14:13:24 +05:30
Nabin Hait	2665c37f38	temp(travis): Print statement to fix travis	2018-11-26 11:05:28 +05:30
Nabin Hait	48e0e19b03	fix(test): Fixed salary slip and sales analytics test cases	2018-11-26 11:05:28 +05:30
Nabin Hait	2508d11097	fix(test): Test cases fixed	2018-11-26 11:05:28 +05:30
Nabin Hait	f77cd54a6c	fix(tds): Create tds payable under correct parent	2018-11-26 11:05:28 +05:30
deepeshgarg007	9cdece4ca2	Test case fix and other minor bug fix	2018-11-26 11:05:28 +05:30
deepeshgarg007	5dbb9f5312	Accounts receivable summary print fix	2018-11-23 19:54:08 +05:30
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
Kanchan Chauhan	962397e6f4	Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate	2018-11-22 15:15:06 +05:30
Rohit Waghchaure	037a151ef5	[Fix] New holiday list form is not working	2018-11-22 12:57:34 +05:30
Saif	2a2f2742eb	Remove "Test" Letter Head	2018-11-21 23:29:09 +05:00
Rohit Waghchaure	6424f47f3b	[Fix] Incorrect stock value difference because of negative stock	2018-11-21 23:18:41 +05:30
Ranjith	1879e91148	fix: Trial Balance	2018-11-21 16:04:05 +05:30
Saif Ur Rehman	23eef11cf5	Fixed get_buying_amount in Gross Profit report: To handle the case where there may be multiple invoices for a single delivery	2018-11-21 15:32:37 +05:00
Suraj Shetty	1eb098caf9	Add additional condition condition to get_pos_profile - If we have any POS Profile related to the user, that profile should be used	2018-11-21 14:36:58 +05:30
Rohan Bansal	f838597b5f	fix(task): Fix error when trying to convert a task into a group even if no child tasks exist	2018-11-20 13:18:05 +05:30
Rohit Waghchaure	770a13ebc3	[Fix] Not able to view general ledger for purchase invoice	2018-11-20 13:01:52 +05:30
Ranjith	5d2e52c4ef	fix: healthcare patch	2018-11-19 20:03:25 +05:30
frappe-pr-bot	2ed4d84cd3	[Translation] Updated Translations	2018-11-19 11:57:50 +02:00
Jamsheer	64e42e1e88	fix: Patient Appointment - update list view	2018-11-19 13:00:49 +05:30
Jamsheer	ee6b317ab5	fix: Patient Appointment - Code standards	2018-11-19 13:00:49 +05:30
Jamsheer	45695c9bcb	fix: Realign Patient Appointment fields	2018-11-19 13:00:49 +05:30
Jamsheer	dc3ae114cd	feat: Reschedule - Patient Appointment	2018-11-19 13:00:49 +05:30
Andrew McLeod	f99a68a695	feat: Added unit testing for Item Barcodes in item.py Adds three different barcodes and barcodes types to a test item and checks that they are added correctly. Adds a barcode that already exists, and checks a DuplicateEntryError is raised. Adds an invalid EAN barcode and checks InvalidBarcode (a subclass of ValidationError) is raised.	2018-11-16 13:55:55 +00:00
Andrew McLeod	5607762c0f	fix/feat: Allow extension of barcode types (without validation) Currently, it is difficult to add new custom barcode types for two reasons, both of which relate to validate_barcode in item.py: - There is a bug where barcode types with a space in, such as Code 128, are split in two (so barcode_type is checked against 'Code' and '128' rather than 'Code 128'). This is fixed by splitting the Options field against a newline, instead of spaces. - All barcodes are validated against the stdnum.ean library. This only handles EAN-8, EAN-13 and UPC-12 barcodes and any other barcode will fail. Barcodes with no type will continue to not be checked. Barcodes with the default barcode_types of EAN, UPC will continue to be checked. The non-default barcode_types of EAN-13 and EAN-8 will also be checked. The barcode_type is cast to upper case before this check is made so ean, upc, ean-13 and ean-8 will also be validated. This allows people to add their own barcode types, such as Code 128 and QR codes. Users can add custom validation of these barcodes using the usual hooks, but they cannot remove the standard validation.	2018-11-16 11:08:39 +00:00
Jsukrut	b9a95e29b7	[FIX][#15018 ][PATIENT Relation should be unique]	2018-11-16 11:30:12 +05:30
Ameya Shenoy	27a0c37963	css: build files in v10	2018-11-15 19:21:30 +00:00
Rohit Waghchaure	f4dc71661d	[Fix] Address not set from the API	2018-11-15 17:04:02 +05:30
deepeshgarg007	795686d1cc	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into bug-fixes	2018-11-15 16:30:48 +05:30
Frappe Bot	8c7373dfd0	Merge branch 'staging' into develop	2018-11-15 09:45:05 +00:00
Frappe Bot	d9dccaefba	bumped to version 11.0.3-beta.24	2018-11-15 09:42:35 +00:00
Frappe Bot	ef745b0197	bumped to version 11.0.3-beta.23	2018-11-15 09:37:17 +00:00
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
Nabin Hait	0aca5aad14	Merge pull request #15976 from deepeshgarg007/summary [Fix] Accounts receivable summary print format showing zero values	2018-11-15 14:52:16 +05:30
Nabin Hait	a0a2f58a21	Merge pull request #15985 from adityahase/perf-patch perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE	2018-11-15 14:50:58 +05:30
Frappe Bot	a4fe912382	bumped to version 11.0.3-beta.23	2018-11-15 09:19:18 +00:00
Frappe Bot	98b4a1bc81	Merge branch 'master' into staging-fixes	2018-11-15 09:12:04 +00:00
Frappe Bot	2426d00dd6	bumped to version 10.1.72	2018-11-15 09:04:14 +00:00
Rohit Waghchaure	704796b1cb	Code optimization for consolidated financial statement report	2018-11-15 13:46:18 +05:30
rohitwaghchaure	02a7f8f0b2	Merge pull request #15991 from rohitwaghchaure/fixed_consolidated_conversion_issue [Fix] Consolidated financial statement report currency conversion issue	2018-11-15 12:56:11 +05:30
Rohit Waghchaure	9d0f90975b	[Fix] Consolidated financial statement report currency conversion issue	2018-11-15 12:55:20 +05:30
Rohit Waghchaure	43920530a1	[Minor] Patch fixes	2018-11-15 12:20:27 +05:30
deepeshgarg007	4c366eed23	Minor issue fixes	2018-11-15 12:02:07 +05:30
Deepesh Garg	3b8c84fa75	Merge pull request #15975 from nabinhait/staging-fixes fix(test): Fixed item discount amount calculation and test cases related to pricing rule	2018-11-15 12:01:09 +05:30
rohitwaghchaure	e907c0d15c	Merge pull request #15986 from rohitwaghchaure/added_currency_filter_in_consolidated_report Added currency filter in consolidated financial statement report	2018-11-15 10:53:02 +05:30
Rohit Waghchaure	a95697f506	Added currency filter in consolidated financial statement report	2018-11-14 19:55:44 +05:30
Aditya Hase	d168a71cfb	perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE update_total_qty_field patch was using UPDATE statement with CASE Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which allows this query to use indexes and update multiple rows per query.	2018-11-14 19:09:07 +05:30
Frappe Bot	98a2348779	Merge branch 'staging' into develop	2018-11-14 11:33:08 +00:00
Frappe Bot	fac49983a0	bumped to version 11.0.3-beta.22	2018-11-14 11:32:34 +00:00
rohitwaghchaure	ba97b9b2d8	Merge pull request #15980 from rohitwaghchaure/on_save_allow_transfer_for_manufatured_changed [Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually	2018-11-14 15:12:45 +05:30
rohitwaghchaure	5395b164cd	Merge pull request #15983 from rohitwaghchaure/fixed_claimed_amount_issue Claimed amount is not reset on cancel of employee advance	2018-11-14 13:21:11 +05:30
Rohit Waghchaure	047a7123eb	Claimed amount is not reset on cancel	2018-11-14 13:20:00 +05:30
Rohit Waghchaure	917dda1b76	[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually	2018-11-14 01:18:41 +05:30
Nabin Hait	367a076fa4	fix(discount): Fixed item discount amount calculation	2018-11-13 18:41:58 +05:30
Nabin Hait	d34bfa8c2c	fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes	2018-11-13 18:21:22 +05:30
Frappe Bot	fe62024824	bumped to version 11.0.3-beta.21	2018-11-13 11:41:27 +00:00
Frappe Bot	b5c7b96a73	Merge branch 'staging' into develop	2018-11-13 11:33:31 +00:00
Nabin Hait	3409e55d24	Merge pull request #15974 from Alsum/assign-sa assign-sa-to-group-of-employees	2018-11-13 16:55:17 +05:30
deepeshgarg007	7bc6f3843a	Fix for accounts Receivable Summary Showing zero values	2018-11-13 16:54:54 +05:30
Frappe Bot	a29237beeb	bumped to version 11.0.3-beta.21	2018-11-13 11:23:06 +00:00
Nabin Hait	7fe4124bb8	fix(field property): Made barcode field non-mandatory in item	2018-11-13 16:48:59 +05:30
Frappe Bot	88c88d6e7c	Merge branch 'master' into staging-fixes	2018-11-13 10:59:05 +00:00
Frappe Bot	6b78e520d2	bumped to version 10.1.71	2018-11-13 10:55:31 +00:00
Nabin Hait	688758a56f	fix(test): Fixed item discount amount calculation and test cases related to pricing rule	2018-11-13 16:13:16 +05:30
alsum	e04a753d53	assign-sa-to-group-of-employees	2018-11-13 11:43:58 +02:00
Nabin Hait	ee887f4db7	Merge pull request #15796 from Alsum/set_current_asset_value trigger set_current_asset_value when make asset_value_adjustment from asset form	2018-11-13 12:42:28 +05:30
Nabin Hait	ee190e34c2	Update asset_value_adjustment.js	2018-11-13 12:41:36 +05:30
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
Alchez	ce3340903d	Update Delivery Trip status based on visited stops (#15723 ) * feat(delivery_trip_status): Update Delivery Trip status based on visited stops * feat(delivery_trip_status): Fix tests * feat(delivery_trip_status): Fix allow on submit for status * feat(delivery_trip_status): Change status mapping * feat(delivery_trip_status): Fix patch * Update update_delivery_trip_status.py	2018-11-13 12:22:17 +05:30
Alchez	9f87c441b0	feat(delivery_trip): Create a Delivery Trip by selecting multiple Delivery Notes in list view (#15706 )	2018-11-13 12:20:05 +05:30
khushalti	fad08e1bcb	[fix] - GL entry not creating on PR if rejected qty mentoned (#15815 )	2018-11-13 12:09:32 +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
Alchez	6f1fd193eb	fix(production_plan): Allow work orders to be cancelled (#15955 )	2018-11-13 11:47:23 +05:30
rohitwaghchaure	849169e82b	Merge pull request #15969 from rohitwaghchaure/fix_company_dashbord_sales_count [Fix] Company dashboard sales count condition	2018-11-13 11:37:26 +05:30
Britlog	7d9689cc92	[Fix] Website Conversion factor query (#15866 ) * [Fix] Conversion factor query * Update product.py	2018-11-13 11:36:41 +05:30
Rohit Waghchaure	14ffe8b935	[Fix] Company dashboard sales count condition	2018-11-13 11:35:38 +05:30
Britlog	9e9e37d39b	[Fix] Conversion factor in offline POS (#15867 )	2018-11-13 11:34:27 +05:30
Deepesh Garg	b65bb5df2e	Function renaming, code cleaning and minor fixes (#15938 )	2018-11-13 11:28:58 +05:30
Stavros Anastasiadis	a695dad525	Upgrade BOM Stock Report base with Qty to Produce (#15939 )	2018-11-13 11:17:41 +05:30
Shreya Shah	89974b221d	[Feature] Create Raw Material Request from Sales Order (#15452 ) * Add new button to Sales Order form - Request for Raw Materials * Modify get_work_order_items function * Commonify functions in Production Plan to make it compatible with new feature * Create and submit Material Request from Sales Order * Link Sales Order with Material Request * Minor * Rename label * Fix Codacy * Modify as per review suggestions - Move dialog to a new function - Move checkboxes below other fields * Minor changes * Check for permissions * Add common checkboxes for all items * Fix codacy * fix: Travis * fix: Use variable to store query result * fix: Add comment before fetching exploded items * refactor: Break into multiple functions * test: Add test case	2018-11-13 11:15:03 +05:30
Himanshu Mishra	35b2627112	Item qty based tax (CESS) calculation support (#15456 ) * fix conflicts * added test case for qty cess * use company specified in document to get region	2018-11-13 11:13:04 +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
Ameya Shenoy	42928f978b	fix: work order item sorting (#15967 )	2018-11-13 11:04:17 +05:30
Ameya Shenoy	e8d3aa9cc9	Merge pull request #15966 from codingCoffee/frankfurter fix: changed currency exchange API to frankfurter	2018-11-12 18:35:36 +05:30
Deepesh Garg	84483ff776	Stock analytics script report (#15630 ) * Stock analytics script report * Codacy Issue Fixes * Codacy Issue Fixes * Removed Trailing Whitespaces * Code cleaning and optimization * Minor Changes * Code cleaning and spacing * Added link for stock analytics in stock.py * Refactoring and code cleaning * Codacy issue fixes	2018-11-12 17:05:31 +05:30
Deepesh Garg	a057f4c2a0	Script report for purchase analytics (#15612 ) * Purchase Analytics Query Report * Minor Changes * Codacy Issue Fixes * Codacy Issues Fixed * Code cleaning and optimization * Indentation Issue Fix * Code cleaning and better function naming * Added link for purchase analytics in buying.py * Added link for production analytics in manufacturing.py * Commonified purchase-analytics using Analytics class * Codacy issue fix	2018-11-12 17:01:02 +05:30
rohitwaghchaure	ab76ff0836	Added new option group by voucher(consolidated) in the general ledger report (#15957 )	2018-11-12 16:58:24 +05:30
Nabin Hait	5e85ab3b67	Update setup.py	2018-11-12 16:46:12 +05:30
JodeQ	1b8e9cd3bb	Permission error for new Sales invoice (#15952 ) In version ``` Installed Apps ERPNext: v11.0.3-beta.20 () (staging) Frappe Framework: v11.0.3-beta.25 () (staging) ``` When creating a new Sales invoice without healthcare active we have this error ``` Not permitted Insufficient Permission for Patient ``` Console log ``` Traceback (most recent call last): File "/home/frappe/auroraone-v11/apps/frappe/frappe/app.py", line 61, in application response = frappe.handler.handle() File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 21, in handle data = execute_cmd(cmd) File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 56, in execute_cmd return frappe.call(method, *frappe.form_dict) File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1007, in call return fn(args, *newargs) File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 53, in search_link search_widget(doctype, txt, query, searchfield=searchfield, page_length=page_length, filters=filters, ignore_user_permissions=ignore_user_permissions) File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 149, in search_widget as_list=not as_dict) File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1235, in get_list return frappe.model.db_query.DatabaseQuery(doctype).execute(None, args, **kwargs) File "/home/frappe/auroraone-v11/apps/frappe/frappe/model/db_query.py", line 40, in execute raise frappe.PermissionError(self.doctype) PermissionError: Patient ```	2018-11-12 16:42:05 +05:30
Pawan Mehta	aa0bed16f6	[fix] #14038-Std hours at company level to calculate timesheet hours (#15819 ) * [fix] #14038 * codacy fixes * add end time calc method * test case and rename function * Update timesheet.py	2018-11-12 16:40:07 +05:30
Deepesh Garg	6714214951	Server side script report for sales analytics (#15589 ) * Sales Analytics Report * Codacy issue fixes and name column addition * Minor Fixes * Minor Changes * Codacy Issue Fixes * Codacy Issue Fixes * Bug Fixes * Code cleaning and optimization * Deleted Duplicate code * Indentation Issue Fixes * Added Supplier Condition * Cleaned code and better function naming * Added report link for sales analytics in selling.py * fix(patch): Patch to delete old analytics reports * feat(refactor): Created class and refactored code using object oriented paradigm * Column condition fix * Minor condition fix * Minor fix * parent child map for purchase analytics * Minor Fixes in get_periodic_data * Used dots for filters instead of brackets * Minor Bug fix in get_period_date_ranges * Test Cases for Analytics Report	2018-11-12 16:15:54 +05:30
Ameya Shenoy	47a1dbab96	fix: changed currency exchange API to frankfurter (#15958 ) - Switched to Frankfurter's public API (frankfurter.app) from self hosted API (frankfurter.erpnext.org)	2018-11-12 15:57:24 +05:30
Frappe PR Bot	3922a184af	[Translation] Updated Translations (#15959 )	2018-11-12 15:51:37 +05:30
Ameya Shenoy	438490fd29	fix: changed currency exchange API to frankfurter - Switched to Frankfurter's public API (frankfurter.app) from self hosted API (frankfurter.erpnext.org)	2018-11-12 15:15:06 +05:30
Frappe Bot	1ff9c691b7	Merge branch 'staging' into develop	2018-11-09 10:21:07 +00:00
Frappe Bot	9159ee83ca	bumped to version 11.0.3-beta.20	2018-11-09 10:19:21 +00:00
Frappe Bot	4df671585b	Merge branch 'master' into staging-fixes	2018-11-09 10:11:27 +00:00
Frappe Bot	f8a5cfe8d8	bumped to version 10.1.70	2018-11-09 10:09:04 +00:00
alsum	852bd76a58	add set_current_asset_value to onload func	2018-11-08 11:12:33 +02:00
TaiLouis	c856794519	fix(hr): Delete salary slip when cancel payroll entry (#15757 )	2018-11-08 13:06:24 +05:30
rohitwaghchaure	a88eaa6e20	[Fix] User able to change discount if pricing rule has discount value as zero (#15921 )	2018-11-08 13:05:08 +05:30
Alchez	bf20be53ef	fix(bom): Display item name in new BOM form (#15783 )	2018-11-08 12:54:20 +05:30
Shreya Shah	9e484fbc12	fix(payment-entry): Take default value None for paid_from (#15777 )	2018-11-08 12:52:14 +05:30
patilsangram	667f0fbd6d	[fix] Invoice/Delivery note customer po_no overwritten by Sales order null po_no (#15785 )	2018-11-08 12:51:41 +05:30
Ameya Shenoy	49647bfecc	fix: develop version should be 12 (#15928 )	2018-11-08 12:48:35 +05:30
Nabin Hait	6ff2f395f5	fix(gle): Post gl entry for booking COGS from Sales Invoice even if grand_total is zero (#15825 )	2018-11-08 12:30:44 +05:30
Dominik Ottenbreit	63ec78aa5d	Fix Purchase Order Issue in Update Items (#15811 ) * Fix Purchase Order Issue in Update Items * fix(zero-division)	2018-11-08 12:28:57 +05:30
Bassam Ramadan	bf86953b4c	adding returns field to cashier closing (#15752 ) * adding returns field to cashier closing * Update cashier_closing.json	2018-11-08 12:26:24 +05:30
Zarrar	5be6d19f4d	[Minor] Display Discount Amount when Tax table is empty (#15812 ) * show discount amount even when tax table is empty * negate the value for discount while printing	2018-11-08 12:16:26 +05:30
Alchez	068ba191e7	[Feature] Route optimization for Delivery Trip stops (#15566 ) * Minor improvements * [Feature] Route optimization for Delivery Trip stops * Process and optimize the entire route, with or without locks * Form sets of routes for optimization based on applied lock positions * Re-arrange stops based on the optimized routes and lock positions * Set delay times between stops - offset estimation times by delays cumulatively * Fix codacy errors * Fix travis * feat(route_optimization): Set estimated route distance from Google Maps * feat(route_optimization): Add tests for route lists * feat(route_optimization): Fix tests	2018-11-08 11:57:05 +05:30
Shreya Shah	3f6eb6b393	fix: If party type is Shareholder, set appropriate name field (#15916 )	2018-11-08 11:51:13 +05:30
Frappe Bot	823e754565	Merge branch 'master' into staging-fixes	2018-11-07 11:26:11 +00:00
Frappe Bot	7f37d26f05	bumped to version 10.1.69	2018-11-07 11:26:10 +00:00
Shreya Shah	c704630d5f	fix: Return default if company not found (#15915 )	2018-11-06 17:24:45 +05:30
Ameya Shenoy	ea42980de6	Merge branch 'staging' into develop	2018-11-06 11:17:24 +00:00
Ameya Shenoy	675636cd03	bumped to version 11.0.3-beta.19	2018-11-06 11:13:36 +00:00
Ameya Shenoy	0c42f99b6f	Merge pull request #15920 from rohitwaghchaure/fix_patch_ascii_code_error [Fix] Patch, ascii codec error	2018-11-06 16:35:21 +05:30
Rohit Waghchaure	56bf39bfea	[Fix] Patch	2018-11-06 16:32:29 +05:30
Ameya Shenoy	65797bca64	Merge branch 'master' into staging-fixes	2018-11-06 11:02:08 +00:00
Ameya Shenoy	a97a520aa8	bumped to version 10.1.68	2018-11-06 11:02:04 +00:00
rohitwaghchaure	9eafe8c23e	Update financial_statements.py	2018-11-06 13:28:18 +05:30
Nabin Hait	614b042ed3	fix(encoding): Fixed encoding issue in financial statements	2018-11-06 11:48:51 +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	0fb943181e	Merge pull request #15910 from netchampfaris/marketplace-fixes-3 Hub fixes	2018-11-05 19:19:23 +05:30
Faris Ansari	d6b664f7ee	fix(hub): Prevent registered actions	2018-11-05 19:18:48 +05:30
rohitwaghchaure	1b2ceadc93	[Fix] Asset date validation (#15887 ) * [Fix] Asset date validation * Update asset.py	2018-11-05 16:04:04 +05:30
lasalesi	32ab3970e1	allow creating sales order on the last valid day of a quotation (#15875 )	2018-11-05 16:02:18 +05:30
Frappe PR Bot	3c3b3d830d	[Translation] Updated Translations (#15909 )	2018-11-05 16:01:47 +05:30
Faris Ansari	0d08da50c6	fix: Refresh PageContainer component based on current route	2018-11-05 15:47:26 +05:30
Nabin Hait	3e6663d47e	fix(serial no): Set supplier info based on pur invoice if serial no is created from Purchase Invoice (#15820 )	2018-11-05 14:01:59 +05:30
Faris Ansari	a22e16dbe3	Merge pull request #15892 from netchampfaris/marketplace-fixes-1 fix: Use frappe.utils.make_event_emitter	2018-11-05 13:48:16 +05:30
Ameya Shenoy	8075a576f9	Merge branch 'staging' into develop	2018-11-05 06:53:27 +00:00
Ameya Shenoy	5ed0257ce2	bumped to version 11.0.3-beta.18	2018-11-05 06:50:33 +00:00
Ameya Shenoy	4a75d58d89	Merge branch 'master' into staging-fixes	2018-11-05 06:45:04 +00:00
Ameya Shenoy	59f16bc942	bumped to version 10.1.67	2018-11-05 06:40:25 +00:00
Tyler Matteson	d14e46ef02	Doctypes in domains that are in beta are now restricted to that domain non-profit, agriculture, healthcare, hospitality, education Please enter the commit message for your changes. Lines starting	2018-11-04 08:39:52 -05:00
Rohit Waghchaure	598d34445f	[Fix] Column ‘claimed_amount’ cannot be null	2018-11-02 16:02:33 +05:30
Faris Ansari	68dbf7f99c	fix: Use frappe.utils.make_event_emitter	2018-11-02 13:30:51 +05:30
rohitwaghchaure	c1d255e7bc	Merge pull request #15882 from Zlash65/fixtds [Minor] TDS not calculated properly fix	2018-11-02 13:18:09 +05:30
Zarrar	16d45c8e2e	safe encode non ascii characters (#15755 )	2018-11-02 13:17:24 +05:30
Navdeep Ghai	768513f2f9	fixed divided by zero error (#15885 )	2018-11-02 12:19:05 +05:30
rohitwaghchaure	dcb71a61ad	[Fix] Payment entry not able to submit (#15859 )	2018-11-02 12:12:42 +05:30
Charles-Henri Decultot	a89bce0b6e	Encoding correction (#15877 )	2018-11-01 13:18:49 +05:30
Zlash65	ab9852d31a	tds not calculated appropriately	2018-11-01 11:40:15 +05:30
Shreya Shah	9f931780a2	Merge pull request #15868 from ESS-LLP/fix-membership fix: Membership - allow system users to create membership	2018-11-01 10:54:32 +05:30
Zarrar	92a4ff4e81	Merge pull request #15874 from shreyashah115/portal-fixes Add overdue status for sales order	2018-11-01 10:46:08 +05:30
Ameya Shenoy	f3f997f232	Merge branch 'staging' into develop	2018-10-31 13:51:52 +00:00
Ameya Shenoy	9f20f777b2	bumped to version 11.0.3-beta.17	2018-10-31 13:51:24 +00:00
Ameya Shenoy	961849beb4	Merge branch 'master' into staging-fixes	2018-10-31 13:43:12 +00:00
Ameya Shenoy	b4bff7e298	bumped to version 10.1.66	2018-10-31 13:35:58 +00:00
Shreya Shah	e140845399	Revert "Add overdue status for sales order"	2018-10-31 18:20:28 +05:30
Shreya Shah	b95d7ae41b	Merge pull request #15870 from shreyashah115/portal-fixes Add overdue status for sales order	2018-10-31 18:20:18 +05:30
deepeshgarg007	78b273af43	[Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793 ) * Create bank settings only if bank name is available * Minor bug-fix in validate_overlap	2018-10-31 18:12:03 +05:30
Shreya Shah	41c5fda196	fix(sms-center): Fix db query (#15774 )	2018-10-31 18:04:30 +05:30
Shreya Shah	305c82bd8d	fix(medical-record): Remove z-index property (#15790 )	2018-10-31 18:02:55 +05:30
rohitwaghchaure	cd11bdfdbb	[Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock (#15869 )	2018-10-31 18:02:00 +05:30
Shreya Shah	0c0e49a421	fix: Fix fieldnames in template (#15860 )	2018-10-31 18:00:09 +05:30
rohitwaghchaure	3f398d24f3	[Fix] Precision issue, not able to submit the stock entry (#15863 )	2018-10-31 17:58:26 +05:30
Shreya	e3a7c68d4f	fix(portal): Add overdue status for sales order	2018-10-31 16:00:27 +05:30
Ranjith	f01bf9048d	fix: Membership - allow system users to create membership for existing Members	2018-10-31 14:33:28 +05:30
Ameya Shenoy	df62296a26	Merge branch 'staging' into develop	2018-10-30 12:54:16 +00:00
Ameya Shenoy	d45fef5423	bumped to version 11.0.3-beta.16	2018-10-30 12:53:35 +00:00
Ameya Shenoy	6178b79555	Merge branch 'master' into staging-fixes	2018-10-30 12:48:45 +00:00
Ameya Shenoy	1f7a5dcd07	bumped to version 10.1.65	2018-10-30 12:48:42 +00:00
Frappe PR Bot	467ff4f0f2	[Translation] Updated Translations (#15852 )	2018-10-30 11:26:11 +05:30
Shreya Shah	452619c668	fix(report): Return if not list (#15849 )	2018-10-30 11:26:01 +05:30
rohitwaghchaure	dca4b294bd	Merge pull request #15853 from rohitwaghchaure/delete_button_not_working_for_print_in_mobile [Fix] Delete button not working in POS for mobile	2018-10-29 16:52:34 +05:30
Rohit Waghchaure	152a0c86b0	[Fix] Delete button not working in POS for Ipad	2018-10-29 16:50:18 +05:30
Shreya Shah	69bbe1995c	Update production_analytics.py	2018-10-29 15:38:21 +05:30
deepeshgarg007	7b91f9fa0c	Bug Fixes	2018-10-29 15:16:25 +05:30
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
Saurabh	6a916943aa	fix(P&L): sql query	2018-10-26 13:46:52 +00:00
alsum	27e7c15c16	trigger set_current_asset_value when make asset_value_adjustment from asset form	2018-10-24 13:23:34 +02:00
ashish-greycube	4d47c63db1	Update employee_advance.py https://github.com/frappe/erpnext/issues/13694 Cancel of already paid "Expense Claim" gives error IntegrityError: (1048, u"Column 'claimed_amount' cannot be null") Sol: claimed_amount should be flt	2018-10-24 16:35:31 +05:30
Ameya Shenoy	c17a64758d	Merge branch 'staging' into develop	2018-10-23 12:58:06 +00:00
Ameya Shenoy	6adcfa6032	bumped to version 11.0.3-beta.15	2018-10-23 12:56:51 +00:00
Ameya Shenoy	3643e7b1b4	Merge branch 'master' into staging-fixes	2018-10-23 12:52:48 +00:00
Ameya Shenoy	2a98e59bd4	bumped to version 10.1.64	2018-10-23 12:52:46 +00:00
Ameya Shenoy	03348364e9	Merge pull request #15739 from kennethsequeira/hotfix Fix for "Improve this page" incorrect link generated in v10 sites	2018-10-23 18:05:25 +05:30
Ameya Shenoy	7658bdc00a	Merge branch 'staging' into develop	2018-10-23 08:06:15 +00:00
Ameya Shenoy	4293d17602	bumped to version 11.0.3-beta.14	2018-10-23 08:05:33 +00:00
Ameya Shenoy	ca66c7ba14	Merge branch 'master' into staging-fixes	2018-10-23 08:01:13 +00:00
Ameya Shenoy	ac64b39562	bumped to version 10.1.63	2018-10-23 07:58:11 +00:00
Ameya Shenoy	c73c576536	Merge pull request #15759 from codingCoffee/salesperson fix(): fetch correct warehouse for item in report	2018-10-23 13:25:42 +05:30
Shreya Shah	669c5d0298	Merge pull request #15724 from shreyashah115/fix-leave Do not consider current leave application while submitting leave	2018-10-23 12:31:02 +05:30
Faris Ansari	d3e3c1ba72	Merge pull request #15768 from rohitwaghchaure/market_place_settings_error [Fix] Marketplace settings permission error	2018-10-23 12:07:21 +05:30
Rohit Waghchaure	55416e08f1	[Fix] Marketplace setting permission error	2018-10-23 11:52:06 +05:30
Shreya	1b105e2575	Add test case	2018-10-23 11:45:57 +05:30
Shreya	60d8a0da1e	fix(leave-status): Do not consider current leave application while submitting	2018-10-23 11:45:57 +05:30
Zlash65	635d4dbebe	subscriber deprecated test case fixes	2018-10-23 11:00:19 +05:30
rohitwaghchaure	cf076f4692	Merge pull request #15753 from Zlash65/fix-mod [Minor] Field name fix to fetch Supplier	2018-10-23 09:45:39 +05:30
rohitwaghchaure	034429b34d	Merge pull request #15756 from rohitwaghchaure/fixed_allow_edit_rate [Fix] User able to edit the rate in offline POS even if it has no permissions	2018-10-23 09:43:57 +05:30
Ameya Shenoy	a0e533ede5	Merge branch 'master' into staging-fixes	2018-10-22 10:37:14 +00:00
Ameya Shenoy	c365ce8f21	bumped to version 10.1.62	2018-10-22 10:34:35 +00:00
Ameya Shenoy	3a11f34355	fix(): fetch correct warehouse for item in report Fix 'Sales Person-wise Transaction Summary' Report by fetching the correct Warehouse for the Item fron the respective, Sales Order/Sales Invoice/ Delivery Note	2018-10-22 10:15:07 +00:00
Nabin Hait	91eac5a7cf	fix(report): Optimization for financial statements	2018-10-22 15:05:40 +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
Ranjith Kurungadam	ac6e3a69f9	fix: Serial No- allow editing SO, track changes (#15741 )	2018-10-22 12:06:54 +05:30
Zlash65	473437931c	field name fix	2018-10-22 11:22:12 +05:30
Ameya Shenoy	c1231d65fd	Merge branch 'staging' into develop	2018-10-19 13:27:07 +00:00
Ameya Shenoy	7e97230c92	bumped to version 11.0.3-beta.13	2018-10-19 12:56:48 +00:00
Ameya Shenoy	bbfdc13ab7	Merge branch 'master' into staging-fixes	2018-10-19 12:48:18 +00:00
Ameya Shenoy	24fe7286fc	bumped to version 10.1.61	2018-10-19 12:48:16 +00:00
Nabin Hait	5d1171678e	fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled (#15743 ) * fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled * fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled	2018-10-19 18:03:13 +05:30
Kenneth Sequeira	991c121b57	added source link for ERPNext docs	2018-10-19 14:31:21 +05:30
Kenneth Sequeira	23ec18e3e4	added docs_app variable to point docs to foundation app	2018-10-19 03:28:12 +05:30
Saif	b4cf72c770	Adding "Include UOM" in Reports with Qty and Rates (#15541 ) * Added Include UOM field for Stock Balane, Stock Ledger and Stock Projected Qty * Add columns in result list-of-lists instead of converting reports to list-of-dicts * For requested changes -Merged conversion factor query with item detail queries -Ensuring snail_case -Made columns consistently list-of-dicts	2018-10-18 17:59:47 +05:30
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
deepeshgarg007	25edac451d	Production Analytics Query Report (#15673 ) * Production Analytics Query Report * Changes in production analytics report * Updated json file and other changes	2018-10-18 17:43:41 +05:30
Raffael Meyer	25e9db5e81	Do not display gender for companies (#15728 )	2018-10-18 16:49:49 +05:30
Nabin Hait	500ddc94c7	fix(gle): GL Entry for invoices before introduction of rounding_adjustment (#15732 )	2018-10-18 16:48:28 +05:30
Charles-Henri Decultot	7a7615ed66	Safe encode payer name (#15726 )	2018-10-18 12:28:06 +05:30
Aditya Hase	007fbfbfb7	[Feature] ERPNext Quickbooks Migrator (#15718 ) * Create QuickBooks Connector Single DocType * Create interface for user authorization and obtaining authorization code * Obtain Access token using authorization code * Fetch a random customer * Schedule fetching as a background job * Save fetched customer * Fetch all customers, take care of pagination * Save fetched customers * Create a custom field for storing Quickbooks ID * Don't save already saved customers * Commit every successful insert * No need of allow_guest=True * Fetch Items as well * Store Customer Addresses as well. * Remove redundant custom field creation code * Stupid refactoring * Some more refactoring * Fetch and Save Suppliers as well * Save accounts. Really a hack as of now. * Fetch and save invoices, Take care of child items as well * Fetch Taxes as well * Set currency on Sales Invoice * Correctly Link Items, Handle markups * Don't enqueue, Need to wait forever for testing sometimes * Set margin rate correctly * Correct fieldname is tax_amount not amount * Fetch with maximum possible batch size * Don't print unnecessary info * Fetch Journal Entries * Fetch Purchase Invoices (Bill) * Don't perform reauthentication if you already have an access_token * Don't need those print statements anymore * Refresh access_token if request fails * Fetch Payment Entry(Payment) * Map QB items to ERPNext rather than other way around * Don't need a huge comment block as of now * Fetch Payment Entries against Purchase Invoices (BillPayment) * Rename Quickbooks Connector to Migrator * Make oauth settings configurable * Make company configurable * Make default accounts configurable * Fetch accounts and other masters separately * Show realtime progress * Check if entries exist before attempting insert * Suppress other annoying messages * Tracebacks are good for health * Don't want rounded total * Don't call fetch after authorization (Need to somehow separate these) * Make credit_to account payable * When generating payment entry mention bank_account as well * Cleanup * Add custom buttons and reflect current state in form ui * Show necessary fields on form depending on the current state * Cleanup * Minor fixes * Set income and expense account on items. * Set currency for Account. * Stupid VSCode * Remove redundant code * Check for existing Payment and BillPayment correctly * Cache API response for faster development * Don't maintain stock for now, Seems to solve the issue with 'Stock Received but not billed' * Cleanup * Add methods to remove inserted data completely (Development) * Don't commit in every iteration * Set account head based on TaxRate in Sales Invoice * Fetch and cache TaxCode * Add methods to fetch TaxCode and TaxRate from cache * Set item wise tax breakup, Don't use Actual Tax * Use both TaxRateLists * Set Itemwise tax on Purchase Invoice as well * Set bank_amount, while creating payment entries * Remove print statements * Add Shipping in taxes child table of Sales Invoice * Set posting date on Payment Entries against Invoices * Fetch and save expenses as Journal Entries * Fetch and save Deposits as Journal Entries * Fetch and Save Credit and Debit Notes * Fetch and save SalesReceipt * Record Shipping as Item instead of Tax * Minor Fixes * Fetch Advance Payments * Set account_type during Account creation * Choose receivable account in Invoice based on currency * Remove receivable_account field * Account type is already set during account creation * Set receivable account based on currency in Sales Receipt and Credit Memo * Set receivable account on Customer * Save Company Preferences * Set shipping_account based on company preferences * Set cost center in Sales Invoice Items and Taxes * Make Account name unique in case of duplicate account name * Fetch and Save TaxPayment as Journal Entry * Record UndepositedFunds Account in cache if found * Credit UndepositedFunds account when mentioned in Deposit * Debit Cashback account as well if mentioned in Deposit * Set currency conversion rate * Set is_group field correctly for accounts * Preserve account hierarchy * Use quickbooks_id and company together for filtering * Make new custom field 'company' on Supplier Customer and Item * Use comapny field for filtering Customer, Item, Supplier * Shipping Account is only available if shipping is enabled for comapny * Invoice might not have TxnTaxDetail.TaxLine * Lookup TaxRate account correctly * TaxCode might not have SalesTaxRateList PurchaseTaxRateList or Both * TaxCode might not have SalesTaxRateList and PurchaseTaxRateList * Remove unnecessary UI elements * Allow multiple companies to have customers with same name * Refactor account_type * Create a leaf an account for every group account * Item and Tax list creation needs more information * Supports discount in Invoice * Save Invoice as Journal Entry when itemwise details are unavailable * Credit=True represents a refund rather than charge * Mode of Payment not synced, setting as Cash for now * Tax code may also be set for an entire invoice * Fetch General Ledger Report correctly * Refactor fetching entries from General Ledger Report * Tax Payment is the same as Sales Tax Payment and Purchase Tax Payment * append_number_if_name_exists is stupid, Reimplementing * Don't guess credit/debit for Tax Payment and Advanced Payment * Bill Payment shouldn't assume full payment * Save Payment as Journal Entry * Make Client ID and Client Secret Default * Remove unused python imports * removed are_accounts_synced() * Don't store translated values in database * Endpoints as a field * Major refactor - functions to methods * Major Refactor Functions to Methods * Major Refactor Fix Stuff * Minor Changes * Save Refund As well * Minor Refactor (SI varations to SI, PI variations to PI) * Record Inventory Qty Adjust Entries * QBM Final Touches * Make changes suggested in review	2018-10-17 17:50:00 +05:30
rohitwaghchaure	e2afbb7abe	Merge pull request #15703 from SaiFi0102/AR-AP-PDC-Fix [For staging-fixes] Fixed PDC data in AR/AP report	2018-10-17 15:57:28 +05:30
Ameya Shenoy	d1c467bcf5	Merge branch 'staging' into develop	2018-10-17 09:44:39 +00:00
Ameya Shenoy	a7a32d7400	bumped to version 11.0.3-beta.12	2018-10-17 09:44:11 +00:00
Ameya Shenoy	77b60928bf	Merge branch 'master' into staging-fixes	2018-10-17 09:39:31 +00:00
Ameya Shenoy	bb1b6b42e2	bumped to version 10.1.60	2018-10-17 09:04:11 +00:00
Ameya Shenoy	4fdbff7456	Merge pull request #15547 from Zlash65/demo-refactor Demo data refactor	2018-10-16 17:34:09 +05:30
deepeshgarg007	0cbb9b54fa	Deprecating subscriber doctype (#15695 ) * Depricating subscriber doctype * Removed naming series	2018-10-16 14:39:16 +05:30
Shreya Shah	8e71074e1c	fix(report): Add column for Item Name (#15702 )	2018-10-16 14:36:49 +05:30
Shreya Shah	e45868a3c6	fix(discount-amount): Print hide discount_amount if print without amount (#15705 )	2018-10-16 14:34:56 +05:30
Shreya Shah	ff0deedca9	fix(discount-amount): Print hide discount_amount if print without amount (#15704 )	2018-10-16 14:34:30 +05:30
Shreya Shah	22731e39ba	Merge pull request #15376 from jodeq/show_project-attachments-in-portal [Proposal] Show project attachments in portal view	2018-10-16 14:29:51 +05:30
Shreya Shah	bfb88f7839	Merge pull request #15701 from shreyashah115/item-stock Add column for Item Name in Item Price Stock report	2018-10-16 14:22:46 +05:30
Shreya	82660913a5	fix(report): Add column for Item Name	2018-10-16 12:15:56 +05:30
Shreya	8aca56836b	fix(margin): Make user avatar display in line	2018-10-16 12:00:46 +05:30
rohitwaghchaure	b7debc8573	Merge pull request #15365 from SaiFi0102/AR-AP-PDC-Fix Fixed PDC data in AR/AP report	2018-10-16 11:27:53 +05:30
rohitwaghchaure	a5a926967b	Update accounts_receivable.py	2018-10-16 11:27:23 +05:30
Joe Paul	666e6e665b	feat: Add provision for prebilled subscription invoices (cherry picked from commit db33e6304d3167d0a2c0c9cee4a9405f5833120e)	2018-10-16 10:17:40 +05:30
deepeshgarg007	4bb90add1d	Currency symbol bug fix (#15698 )	2018-10-15 19:07:49 +05:30
Nabin Hait	44ec05f79b	fix(bom): deadlock issue via bom replace tool (#15694 )	2018-10-15 18:56:16 +05:30
Charles-Henri Decultot	615571dd21	Add safe decode for payer name (#15692 )	2018-10-15 18:26:02 +05:30
Bibin	7844b79274	[Bug-Fix] accounts_receivable.html (#15688 ) * Update accounts_receivable.html In the print format and PDF the total was showing as 0 (Zero) , when I made these changes it fixed the issue * Update accounts_receivable.html	2018-10-15 18:25:26 +05:30
deepeshgarg007	7c443264a4	Currency symbol bug fix (#15690 )	2018-10-15 18:22:28 +05:30
JodeQ	10dfd4a48f	Show project attachments in portal view	2018-10-15 14:28:27 +02:00
Ameya Shenoy	606c504f28	Merge branch 'staging' into develop	2018-10-15 12:25:03 +00:00
Ameya Shenoy	8d0195246d	bumped to version 11.0.3-beta.11	2018-10-15 12:24:12 +00:00
Ameya Shenoy	4fa58359c8	Merge pull request #15689 from codingCoffee/pat fix(patch): reload patient	2018-10-15 17:49:42 +05:30
Ameya Shenoy	102eb998ac	fix(patch): reload healthacre doctypes Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-10-15 17:40:02 +05:30
Nabin Hait	3c29967d27	Fixed merge conflict	2018-10-15 15:43:21 +05:30
Nabin Hait	d2c643eb0b	bumped to version 10.1.59	2018-10-15 16:11:25 +06:00
rohitwaghchaure	94fcb0e9f9	[Enhance] Add user image in the employee from the user (#15680 )	2018-10-15 14:57:46 +05:30
Frappe PR Bot	be923a8995	[Translation] Updated Translations (#15685 )	2018-10-15 14:55:04 +05:30
Jamsheer	2a966f26af	fix: patch - change healthcare desktop icons (#15683 )	2018-10-15 14:54:29 +05:30
Ranjith Kurungadam	741bd29b74	fix: Patient Appointment Calendar (#15684 )	2018-10-15 14:52:38 +05:30
rohitwaghchaure	0d2a4c6a59	[Fix] TDS Payable Monthly report is not working (#15666 )	2018-10-15 11:09:17 +05:30
deepeshgarg007	42510a411f	[Bug-Fix]V11 Accounts Receivable print showing zero values (#15667 ) * Bug Fix * Print report bug fixes	2018-10-15 11:08:04 +05:30
rohitwaghchaure	3362d6b948	[Fix] Precision issue in the expense claim (#15678 )	2018-10-15 11:07:13 +05:30
Chinmay Pai	905c0ff978	File api (#15637 ) * file-api: major refactor migrate from file_manager.py to file.py Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com> * file-api: migrate to file-api remove file_manager stuff and migrate to file-api Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2018-10-15 10:38:53 +05:30
Mangesh-Khairnar	8c62ab4af0	[Enhancement] Email birthday reminder (#15559 ) * Update hooks.py * modified date for reload_doc (#15027) * Single email for multiple birthdays and test	2018-10-11 17:06:10 +05:30
Shreya Shah	314c97cbf1	Fix for supplier quotation (#15659 )	2018-10-11 16:59:40 +05:30
Alchez	a16f0f4423	fix(item_defaults): handle multiple item defaults for a company (#15634 )	2018-10-11 16:56:46 +05:30
Charles-Henri Decultot	64b6421fce	Add event in transaction base correction (#15631 )	2018-10-11 16:54:26 +05:30
Charles-Henri Decultot	6c743bebf2	Check for prefix before return EcritureNum (#15629 )	2018-10-11 16:51:29 +05:30
Charles-Henri Decultot	50447b195d	Compatibility with Py2 (#15653 )	2018-10-11 16:48:38 +05:30
Shreya Shah	e9890a3ec8	fix(patch): Check if meta object has naming_series field (#15651 )	2018-10-11 16:28:59 +05:30
Faris Ansari	4833b4c274	fix: Default Series in naming series patch (#15656 )	2018-10-11 16:27:05 +05:30
Stavros Anastasiadis	a398d6bf4f	Allow Same Item Multiple Items (#15657 )	2018-10-11 16:25:37 +05:30
Stavros Anastasiadis	66922b9c8e	Allow Same Item Multiple Items (#15657 )	2018-10-11 16:20:30 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
Ameya Shenoy	d791af8331	bumped to version 11.0.3-beta.10	2018-10-11 06:58:13 +00:00
rohitwaghchaure	b1241caf48	Merge pull request #15650 from rohitwaghchaure/fix_gst_state_issue [Fix] Nontype object has no attribute gst_state	2018-10-11 10:53:46 +05:30
Rohit Waghchaure	b6a735e021	[Fix] Nontype object has no attribute gst_state	2018-10-11 10:40:34 +05:30
Shreya Shah	785f1aa96d	fix(print): Update idx if grouping same items (#15647 )	2018-10-11 10:14:25 +05:30
Shreya Shah	2291323c65	fix(shipping-address-display): Fetch shipping address display as per the shipping address (#15643 )	2018-10-11 10:13:27 +05:30
deepeshgarg007	1cb1074f6b	Bug Fix (#15640 )	2018-10-10 16:15:30 +05:30
Sagar Vora	d92f3ac480	Fix 'transporter info' section in Delivery Note (#15565 ) - create is_transporter checkbox in supplier doctype - new field transporter (supplier with is_transporter checked) - created fields driver and driver_name - removed GST India fields from core doctype - removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery) - read_only transporter_name field (kept for backwards compatibility) - made necessary changes in delivery_trip implementation - hidden section's fields from print (preserving v10 convention) - added transporter field to 'Driver' doctype - added queries for transporter and driver fields - GST India fields in regional module - Fix e-waybill report	2018-10-10 14:51:26 +05:30
Shreya Shah	dd87e0f1e2	fix(leave-type): Drop column max_days_allowed (#15642 )	2018-10-10 14:48:49 +05:30
rohitwaghchaure	4cfff7829b	Added validation to check duplicate student leave application (#15636 )	2018-10-10 14:47:48 +05:30
Shreya Shah	3855156b7d	fix(project): If Project has no Tasks, let the status be set as Completed (#15639 )	2018-10-10 14:45:40 +05:30
Jamsheer	14c6ab0ee9	[fix] Healthcare field and desktop icon (#15638 ) * Test Inpatient Record - Fix * Test Inpatient Record - Fix * Healthcare - Patch rename_healthcare_doctype_and_fields - Updated * Healthcare - Desktop Icons - Updated * Healthcare - Patch change in healthcare desktop icons * Healthcare Util - fix - appointments valid in fee validity * Healthcare Settings - field label change * Patient allow rename * fix: remove unused variable	2018-10-10 14:44:36 +05:30
Frappe PR Bot	3f320676f6	[Translation] Updated Translations (#15620 )	2018-10-10 14:44:12 +05:30
Zlash65	6a8957b430	item data updated with retail data	2018-10-10 14:28:17 +05:30
Zlash65	62592d3c44	setup data for retail added	2018-10-10 14:28:17 +05:30
Zlash65	fd9c451909	company name picked up dynamically, domainification	2018-10-10 14:28:17 +05:30
Zlash65	d1fbaf8f32	custom field added for item - domainification, password changed	2018-10-10 14:28:17 +05:30
Zlash65	275ef826a4	codacy fixes	2018-10-10 14:28:17 +05:30
Zlash65	8b1133cb24	item data fix for default supplier, exception handling for purchase order	2018-10-10 14:28:17 +05:30
Zlash65	d080a17961	minor random trigger changes and exception handling	2018-10-10 14:28:16 +05:30
Zlash65	e64dcfc2f9	timesheet logic changed to job card	2018-10-10 14:28:16 +05:30
Zlash65	e895845ae1	import fix	2018-10-10 14:28:16 +05:30
Zlash65	523f77e82b	make_rm_stock_entry fix	2018-10-10 14:28:16 +05:30
Zlash65	dcf7401104	random time fix and other minor fixes	2018-10-10 14:28:16 +05:30
Zlash65	143d4da901	Production Plan fix	2018-10-10 14:28:16 +05:30
Zlash65	c24d2fdf6c	setup leave & expense approver for each department - assign approver in expense claim	2018-10-10 14:28:16 +05:30
Zlash65	a259466643	add relevant department to employees	2018-10-10 14:28:16 +05:30
Zlash65	0309bbee30	function call requires company as parameter	2018-10-10 14:28:16 +05:30
Zlash65	796bffbee1	fix payroll and stock related data	2018-10-10 14:28:16 +05:30
Zlash65	4c07970545	remove user permission from HR Manager user	2018-10-10 14:28:16 +05:30
Zlash65	fa7c8a9f8b	update employee and user records	2018-10-10 14:28:16 +05:30
Saurabh	99c064305f	Merge branch 'master' into staging-fixes	2018-10-09 17:55:33 +05:30
Saurabh	2dc8972794	bumped to version 10.1.58	2018-10-09 18:25:32 +06:00
Zlash65	a1036ad50b	setup wizard failing fix	2018-10-09 17:38:28 +05:30
Shreya Shah	8a4bcefec4	fix(accounts-receivable): Column values in Print and PDF (#15621 )	2018-10-08 18:34:01 +05:30
Shreya Shah	5b34d00bc0	fix(accounts-receivable): Column values in Print and PDF (#15622 )	2018-10-08 18:20:51 +05:30
Nabin Hait	d2c5b50842	fix(warehouse-account): get warehouse account map fallback handling (#15625 ) * fix(warehouse-account): get warehouse account map fallback handling * fix: import issue	2018-10-08 18:19:53 +05:30
Ameya Shenoy	f5d3ce8846	Merge branch 'staging' into develop	2018-10-08 09:44:34 +00:00
Ameya Shenoy	563b1d153b	bumped to version 11.0.3-beta.9	2018-10-08 09:43:48 +00:00
Ameya Shenoy	ecba14e6cf	Merge branch 'master' into staging-fixes	2018-10-08 09:39:49 +00:00
Ameya Shenoy	b509b06edf	bumped to version 10.1.57	2018-10-08 09:37:37 +00:00
Zarrar	87441bf62e	columns without fieldname's data not shown (#15618 )	2018-10-08 14:34:34 +05:30
Zarrar	5fcccda883	[Minor] Supplier Quotation (#15578 ) * throw meaningful error if RFQ does not have selected supplier * Update supplier_quotation.py * codacy fix	2018-10-08 14:30:53 +05:30
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
Shreya Shah	37d3686372	fix(setup_taxes): Pop if frappe.message_log (#15615 )	2018-10-08 14:17:16 +05:30
Ameya Shenoy	de5206ff43	Merge branch 'staging' into develop	2018-10-08 07:28:24 +00:00
Ameya Shenoy	0bd254b02b	bumped to version 11.0.3-beta.8	2018-10-08 07:27:35 +00:00
rohitwaghchaure	5e466bace4	Removed update_job_card_reference method (#15614 )	2018-10-08 12:36:45 +05:30
Shreya Shah	c2857fd2cc	fix(setup_taxes): Pop if frappe.message_log (#15611 )	2018-10-08 12:35:18 +05:30
Jamsheer	063cf9c582	Jam staging fixes (#15608 ) * Test Inpatient Record - Fix * Test Inpatient Record - Fix	2018-10-08 10:48:42 +05:30
Ameya Shenoy	8bef1d8506	Merge branch 'staging' into develop	2018-10-07 08:00:07 +00:00
Ameya Shenoy	cfdd629fd7	bumped to version 11.0.3-beta.7	2018-10-07 07:59:34 +00:00
Ameya Shenoy	272956980d	Merge pull request #15606 from codingCoffee/abc fix: make location from warehouse patch	2018-10-07 13:25:05 +05:30
Ameya Shenoy	f7b5b7beb4	fix: make location from warehouse patch - optimization by preventing patch execution if Asset doesn't exist	2018-10-07 13:08:00 +05:30
Ameya Shenoy	f174c95d80	Merge branch 'staging' into develop	2018-10-07 06:24:12 +00:00
Ameya Shenoy	cd9be8f0a6	bumped to version 11.0.3-beta.6	2018-10-07 06:23:22 +00:00
Shreya Shah	5615cb4735	Set default only if customer_address not found (#15605 ) * Set default only if customer_address not found * Similar fix for Purchase Invoice and shipping_address	2018-10-07 11:42:07 +05:30
Shreya Shah	e7e269d4a4	[Error] Display appropriate msg if company is different for TDS (#15601 ) * fix(tds): Display appropriate msg if company is different * Update tax_withholding_category.py	2018-10-06 17:56:21 +05:30
Zlash65	58a080a1b1	add voucher detail no while creating gl entry	2018-10-06 16:34:58 +05:30
Zarrar	bc7a2c5cb3	Merge pull request #15602 from Zlash65/fix-mod [Minor] Deferred Expense	2018-10-06 16:21:06 +05:30
Zlash65	b4aeee776a	add voucher detail no while creating gl entry	2018-10-06 16:17:12 +05:30
Ameya Shenoy	1d5dc73dfd	Merge branch 'staging' into develop	2018-10-05 09:10:30 +00:00
Ameya Shenoy	538678afc4	bumped to version 11.0.3-beta.5	2018-10-05 09:09:53 +00:00
Ameya Shenoy	ad908779be	Merge branch 'master' into staging-fixes	2018-10-05 08:54:58 +00:00
Ameya Shenoy	97dbb4d125	bumped to version 10.1.56	2018-10-05 08:54:46 +00:00
Shreya Shah	5cff01634e	Merge pull request #15593 from Zlash65/fix-mod [Minor] Item master - get_query for deferred accounts	2018-10-05 14:14:46 +05:30
Shreya Shah	32206029ac	Fix Codacy	2018-10-05 14:14:33 +05:30
Shreya Shah	deb9f0e03c	Merge pull request #15594 from shreyashah115/tds-report Handle IndexError if no data found	2018-10-05 14:11:43 +05:30
Shreya Shah	db5ffce742	Merge pull request #15592 from shreyashah115/jv Allow Reverse JV for all submitted docs	2018-10-05 13:33:11 +05:30
Shreya	0d7bd43367	Handle IndexError if no data found	2018-10-05 13:22:09 +05:30
Zlash65	2123b97d31	add get_query for revenue and expense account	2018-10-05 12:26:32 +05:30
Shreya	4f5214a136	Allow reverse jv for all submitted docs	2018-10-05 12:19:09 +05:30
Saif	00a16a9337	set_item_default was referencing a variable company of "company" (#15576 )	2018-10-05 11:54:03 +05:30
Shreya Shah	17ac38ff29	Enable save before saving to update form after save (#15579 )	2018-10-05 11:51:13 +05:30
Jamsheer	be6e426fe0	Healthcare Service Unit - added company abbr as suffix (#15590 )	2018-10-05 11:38:15 +05:30
Ranjith Kurungadam	dc2bab2b72	fix healthcare patch (#15584 )	2018-10-05 11:36:58 +05:30
Valmik	4c61861163	Add Delivery Trip to Delivery Note dashboard (#15587 )	2018-10-05 11:36:31 +05:30
Saif	4faea037bb	Remove Test Letter Head from GSTR-1 (#15591 )	2018-10-05 11:35:01 +05:30
Ameya Shenoy	06bd6ee1b8	Merge branch 'staging' into develop	2018-10-04 13:16:31 +00:00
Ameya Shenoy	2291558c5f	bumped to version 11.0.3-beta.4	2018-10-04 13:14:29 +00:00
Ameya Shenoy	6005a1eb89	fix(linting): indentation fix Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-10-04 17:40:39 +05:30
rohitwaghchaure	d69dc954c7	Merge pull request #15580 from sagarvora/fix-TabError fix TabError in install_fixtures.py	2018-10-04 17:22:44 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
Ameya Shenoy	5ae344593e	bumped to version 11.0.3-beta.3	2018-10-04 11:42:56 +00:00
Rohit Waghchaure	18678696db	Fix issue after merging hotfix into staging-fixes	2018-10-04 16:33:43 +05:30
Ameya Shenoy	7d929c508f	Merge branch 'master' into staging-fixes	2018-10-04 09:25:07 +00:00
Ameya Shenoy	79dc8ac9cc	bumped to version 10.1.55	2018-10-04 09:11:50 +00:00
Rohit Waghchaure	9f2859701e	[Fix] WorkOrderItem object has no attribute operation	2018-10-04 13:25:49 +05:30
Sagar Vora	b13b9b4ed3	fix TabError in install_fixtures.py	2018-10-04 11:39:20 +05:30
Zlash65	6e3b1a58a1	service_stop_date should be editable after submit	2018-10-04 09:30:27 +05:30
rohitwaghchaure	f9930ff2a4	Merge pull request #15573 from rohitwaghchaure/cost_center_issue_while_saving [Fix] Cost center issue	2018-10-03 18:47:28 +05:30
Shreya Shah	3204c94fdd	Merge pull request #15570 from shreyashah115/fix-filter-error [Bug] Item wise sales register filters	2018-10-03 17:38:41 +05:30
Shreya	cbb112f2db	Fix filter error	2018-10-03 17:37:40 +05:30
Zlash65	9d159ab95e	remove db.escape as back tick already used	2018-10-03 17:26:28 +05:30
Rohit Waghchaure	8bf9f377dd	[Fix] Cost center issue	2018-10-03 16:59:43 +05:30
Rohit Waghchaure	d1b87ba41c	Book cost of goods sold instead of stock adjustment	2018-10-03 16:29:43 +05:30
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	75fa6b3ee8	[Enhancement] Improvement to the sales pipeline (#15524 ) * Additions to sales pipeline * Codacy corrections * Codacy corrections * Codacy corrections * Replace _ with dummy for unused variable * Performance + dates corrections * Itertuples modification * Removing trailing whitespaces * Sales stage doctype * Divide sales stages fixtures in separate functions * Remove duplicate fixtures * Add newline after method * Missing requirement	2018-10-03 10:41:40 +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
Sharath C	1c44d93b93	Is frozen and Disabled Columns added to Customer Credit Report (#15560 )	2018-10-03 10:41:11 +05:30
Sharath C	c0b684dc30	Attendance - Unique check based on Employee and Date excluding cancelled docs (#15556 )	2018-10-03 10:40:22 +05:30
rohitwaghchaure	a5576f5b21	[Fix] Stock difference between gl entry and stock ledger entry booked in stock adjustment (#15374 )	2018-10-03 10:39:50 +05:30
Faris Ansari	e0a148474d	fix: Translation string (#15561 )	2018-10-03 10:37:41 +05:30
deepeshgarg007	719701f2a4	Enhancement in Budget Variance and other reports (#15455 ) * Enhanced Budget Variance report and added filters and columns in other reports * Update budget_variance_report.js * Changes in budget variance report * Spacing in column names	2018-10-02 12:52:13 +05:30
Shreya Shah	7d115183e4	Improvise and fix indicators in Portal list (#15552 )	2018-10-02 12:46:26 +05:30
Charles-Henri Decultot	3b11debcd2	Gocardless correction (#15554 )	2018-10-02 12:46:15 +05:30
Charles-Henri Decultot	b2281cc1fd	Lead to customer UX enhancement (#15525 ) * Lead to customer UX enhancement * Market segment * Market Segment to DocType * Specific function for fixtures * Merge issue correction * Doctype merge correction	2018-10-02 11:25:00 +05:30
Frappe PR Bot	04e4af8d59	[Translation] Updated Translations (#15550 )	2018-10-02 11:24:12 +05:30
Shreya Shah	5a2aced586	Merge pull request #15551 from Zlash65/minor-fix [Minor] Delivery trip test fix	2018-10-02 11:12:51 +05:30
Rushabh Mehta	11e2119670	style(icon): revert to old icon	2018-10-02 11:06:55 +05:30
Zlash65	6a5e6ed2ff	delivery trip notification to customer fix	2018-10-01 17:28:42 +05:30
Zlash65	9e67b8ec4d	fix driver name selection	2018-10-01 17:27:12 +05:30
Zlash65	622bd10946	add date data [mandatory]	2018-10-01 15:37:31 +05:30
rohitwaghchaure	8976ad5ca1	Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue [Fix] Attendance tool	2018-10-01 15:07:49 +05:30
Rohit Waghchaure	c7f8b82fff	[Fix] Attendance tool	2018-10-01 12:30:58 +05:30
Rohit Waghchaure	8fbf856618	[Fix] Salary slip	2018-10-01 12:00:45 +05:30
RicardoJohann	f52ee27d8e	fix order labels and add purchase order items overdue (#15436 )	2018-10-01 11:27:08 +05:30
Rushabh Mehta	77588ededb	version: move to 12.x.x-develop	2018-09-30 23:02:05 +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
Alchez	6ecb2556b7	Add Delivery Settings + improve 'Notify Customers' functionality (#15322 ) * Add Delivery Settings + improve 'Notify Customers' functionality * Minor improvements * Add patch to create a default dispatch notification template * Fix travis errors	2018-09-30 21:38:47 +05:30
Neil Trini Lasrado	55a53e0bec	Added ability to have a default return warehouse for Sales Returns (#15491 )	2018-09-30 21:22:50 +05:30
Charles-Henri Decultot	4fd7a4e0d7	Lead notes (#15510 ) * Notes field in Lead * Add notes to lead details report	2018-09-30 21:20:55 +05:30
Zarrar	e4c9ac3961	[Minor] Cash Flow report - custom (#15522 ) * python 2-3 fix for filter * pass filters while fetching data to financial statement report	2018-09-30 21:19:01 +05:30
rohitwaghchaure	90f9f9d3d8	Code optimization for deferred revenue (#15527 )	2018-09-30 21:12:50 +05:30
Saif	83c89346c3	set_item_default was referencing a variable company of "company" (#15534 )	2018-09-30 21:12:25 +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
rohitwaghchaure	1cf71d96b1	Merge pull request #15530 from rohitwaghchaure/consolidated_report_issue_v11 [Fix] Consolidated Financial Statement report	2018-09-28 17:06:57 +05:30
Rohit Waghchaure	ea0ef95539	[Fix] Consolidated Financial Statement report	2018-09-28 17:05:55 +05:30
Saif	c2dd9ab778	Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered (#15514 )	2018-09-27 15:48:04 +05:30
Frappe PR Bot	c1bc8d6066	[Translation] Updated Translations (#15518 )	2018-09-27 15:47:52 +05:30
Suraj Shetty	4b404c4f1e	Avoid multiple escapes (#15509 )	2018-09-27 15:39:34 +05:30
Shreya Shah	0fc4917d81	Merge pull request #15516 from shreyashah115/product-page Fetch Item Group's name and image on website	2018-09-27 15:12:42 +05:30
Shreya	5c335550e3	Fetch item_group's name and image on website if children	2018-09-27 13:55:59 +05:30
Nabin Hait	7d6d678e8d	purchase receipt return entry in dashboard	2018-09-26 19:04:11 +05:30
Nabin Hait	c22ba2ec26	fix(sales return): validation message fix	2018-09-26 18:56:45 +05:30
Nabin Hait	183972f58f	fix(stock_entry): allow creating stock entry against work order even if item rate is zero	2018-09-26 18:34:07 +05:30
Suraj Shetty	6ea3de9521	Fix quote issues (#15497 ) * Fix quotes issues * Remove frappe.db.escape - Handle escape in the update_linked_doctypes method	2018-09-26 18:15:53 +05:30
Nabin Hait	1e7c32b909	Payroll fixes and more (#15475 ) * fix(payroll): multiple minor fixes related to salary structure * Added GSTR-1 and GSTR-2 report in Accounts module page * delete asset movement records on cancellation of Purchase Receipt * Update consolidated_financial_statement.py * minor fix * minor fix * add filters on item prices report (#15495)	2018-09-26 18:01:00 +05:30
RicardoJohann	171c7d4128	add filters on item prices report (#15495 )	2018-09-26 15:58:06 +05:30
deepeshgarg007	c3772f1ac4	minor fix (#15503 )	2018-09-26 15:55:43 +05:30
Shreya Shah	352e6494f3	Contact and email fields in Payment Entry (#15490 ) * Add contact_person and contact_email fields to Payment Entry * Minor fix * Map contact details while making Payment Entry * Update payment_entry.py	2018-09-26 15:38:34 +05:30
rohitwaghchaure	0cf0ebf08b	[Refactored] Asset Depreciation Ledger report based on GL entries (#15415 ) * [Refactored] Asset Depreciation Ledger report is based on GL entries * Provision to make manual JV from the asset if Calculate Depreciation is disabled	2018-09-26 15:24:49 +05:30
Ameya Shenoy	b635a71247	Merge branch 'staging' into develop	2018-09-26 08:53:03 +00:00
Ameya Shenoy	90197dd341	bumped to version 11.0.3-beta.2	2018-09-26 08:52:54 +00:00
Ameya Shenoy	12ec142a69	fix(multiple): syntax and patch - syntax fix for using super class - check "All Departments" in department name with translations	2018-09-26 14:05:48 +05:30
Ameya Shenoy	430c3c88ff	Merge branch 'staging' into develop	2018-09-26 07:32:45 +00:00
Ameya Shenoy	b8a5fb7392	bumped to version 11.0.3	2018-09-26 07:32:44 +00:00
Ameya Shenoy	9d3a97fd15	Merge branch 'master' into staging-fixes	2018-09-26 07:28:53 +00:00
Ameya Shenoy	e04431ea5c	bumped to version 10.1.54	2018-09-26 07:26:49 +00:00
deepeshgarg007	86152eb5c8	Sales person Commission Report and more (#15431 ) * Commission For Sales Person * Changes Made * Changes made in sales person dashboard and commission report * Update sales_person_commission_summary.py	2018-09-25 19:08:16 +05:30
rohitwaghchaure	fafc277666	[Fix] BOM update tool, too many writes in one request. Please send smaller requests (#15432 )	2018-09-25 18:59:20 +05:30
Mohamed_Alsum	b9228fa443	show only submitted salary_structure and leave_policy in Employee Grade app (#15434 ) * update staff plan when add or delete job-opening * Update job_opening.py * filter default_salary_structure and default_leave_policy * merge	2018-09-25 18:56:17 +05:30
rohitwaghchaure	fe1e4a41e6	Validate negative stock serial number (#15492 )	2018-09-25 18:36:32 +05:30
Faris Ansari	7a8c5b0c2c	fix(setup wizard): Validate FY dates (#15473 )	2018-09-25 18:34:33 +05:30
Aditya Hase	a38b77cbfd	feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion (#15457 ) * feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion * Update chart_of_accounts.py	2018-09-25 18:10:50 +05:30
Zarrar	b113349f31	minor fix for auto-opt-in for customer (#15483 )	2018-09-24 14:30:07 +05:30
Rohit Waghchaure	c699b2a98a	[Fix] Key error while saving sales invoice	2018-09-24 11:57:48 +05:30
Ameya Shenoy	63ebeb432c	Merge branch 'staging' into develop	2018-09-21 11:04:20 +00:00
Ameya Shenoy	cdedb27cf0	bumped to version 11.0.2	2018-09-21 11:04:20 +00:00
Suraj Shetty	dabaec0dc5	Revert bench-init changes (#15463 ) * Revert bench-init changes * Fix test * Remove debug flag	2018-09-21 15:46:44 +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
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287 ) * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Saurabh	3ef12bb7f2	bumped to version 11.0.1	2018-09-20 14:00:46 +06:00
Saurabh	75d90b9d8f	a[resolved] merge-conflicts	2018-09-20 13:28:23 +05:30
Saurabh	3b281a0a1b	bumped to version 10.1.53	2018-09-20 13:52:36 +06:00
Saif	772dc6e82c	Various permission fixes (#15448 ) * Removed test letter head from Consolidated Financial Statement * Removed incorrect role permissions	2018-09-20 13:20:17 +05:30
rohitwaghchaure	a60ab1af75	[Fix] Salary slip is not saving (#15449 )	2018-09-20 13:18:49 +05:30
Nabin Hait	8fb04ff1b2	Merge branch 'develop' into staging-fixes	2018-09-20 12:51:26 +05:30
rohitwaghchaure	550fc695f1	[Fix] Precision issue in the accounts receivable report (#15440 )	2018-09-19 19:03:40 +05:30
Ameya Shenoy	a2f0b34147	fix(item, item default): changed the modified date (#15442 ) The patch move_item_defaults_to_child_table_for_multicompany used to fail since the doctypes Item and Item Defaults weren't reloaded properly Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-09-19 19:02:52 +05:30
Ameya Shenoy	28fd02e4a8	fix(desktop_icon): remove land unit icon if exists (#15430 ) * fix(desktop_icon): remove land unit icon if exists Patch to delete the 'Land Unit' icon form 'Desktop Icon' doctype if exists, since 'Land Unit' has been merged with 'Location' Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com> * Update remove_land_unit_icon.py	2018-09-19 13:15:52 +05:30
Faris Ansari	2ab6e0e39b	fix(translations): Replace translations by keyword with indexed version (#15426 ) * fix(translations): Replace translations by keyword with indexed version Keywords in the translation also gets translated which results in an error because python cannot find the key * Update buying_controller.py	2018-09-19 13:13:59 +05:30
Mangesh-Khairnar	0374cc54ba	[bug fix]:stopped orders in progress report (#15428 )	2018-09-19 13:10:53 +05:30
Nabin Hait	63a58a6752	Merge branch 'staging' into develop	2018-09-18 11:44:42 +05:30
Shreya Shah	13761dde38	[Report] Lead Conversion Time (#15237 ) * New Report Lead Conversion Time * Add column for support tickets and a row for Average	2018-09-18 10:55:35 +05:30
Jamsheer	c07e8e5b0d	[Fix] Healthcare minor fixes and field rename (#15413 ) * Healthcare practitoiner in Clinical Procedure * Insert and Update Patient Medical Record from Healthcare DocTypes * vital signs remove extra columns * Rename Healthcare Field test_name * Healthcare Util - get_drugs_to_invoice - fix * Rename Healthcare Field test_code * Rename Healthcare Field test_comment * Rename Healthcare Field test_created * Rename Healthcare Field test_template * Rename Healthcare Field test_rate * Rename Healthcare Field test_description * Rename Healthcare Field test_groups * Rename Healthcare Field test_group * Rename Healthcare Field test_template_type * Rename Healthcare Field test_uom * Rename Healthcare Field test_normal_range * Rename Healthcare Field test_event * Rename Healthcare Field test_prescription * Rename Healthcare Field test_particulars * Patch - Rename healthcare fields * Sales Invoice - Filter updated for get drugs to invoice * Patient Appointment - fix - get_event	2018-09-18 10:54:03 +05:30
RicardoJohann	267e806d7f	added description field and changed to one filter datepicker (#15425 )	2018-09-18 10:48:20 +05:30
JC	31f2c1c3d3	fix ‘BOMItem’ object has no attribute ‘operation’ error in bench run-tests --doctype ‘BOM’ (#15423 )	2018-09-18 10:47:27 +05:30
Govind S Menokee	d38160c816	[FIX] Remove deprecated gen_object.next() function (#15418 ) BOM tree view was getting impacted due to use of a deprecated function. This fix replaces deprecated object.next() function with next(gen_object).	2018-09-18 10:42:21 +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
Frappe PR Bot	db8c1f254e	[Translation] Updated Translations (#15414 )	2018-09-17 16:54:30 +05:30
Charles-Henri Decultot	d6bce7429e	Bank statement import corrections (#15405 ) * Bank statement import corrections * Bank statement corrections * Missing semi-columns	2018-09-17 12:34:11 +05:30
Zarrar	013493de7a	lable for discount_amount should be configurable (#15408 )	2018-09-17 11:06:49 +05:30
theopen-institute	ba1c0c900d	Fix potential crash in payment_entry.py (#15411 ) The new code for cost center checking in payment_entry.py crashes if `voucher_type` is `None`, which is an explicit possibility if party type is Employee. This commit adds a simple check to make sure that voucher_type is not None before running `get_doc`.	2018-09-17 10:59:39 +05:30
Zarrar	e79e4cb9b1	python 2-3 fix, *.keys() return dict_keys object in py3 (#15409 )	2018-09-17 10:56:42 +05:30
Zarrar	ada13213c0	reload Patient Appointment doctype with added fields (#15397 )	2018-09-14 15:32:04 +05:30
Faris Ansari	31e5431fe0	fix(urljoin): 2 and 3 compatible (#15401 )	2018-09-14 15:31:35 +05:30
Zlash65	2619596917	pass filters as parameter	2018-09-13 12:56:04 +05:30
Nabin Hait	5be3968544	fix(add_file): added missing init file	2018-09-12 18:56:15 +05:30
Ameya Shenoy	ecac822613	Merge pull request #15393 from codingCoffee/hub fix(patch): delete hub documents	2018-09-12 17:50:02 +05:30
Ameya Shenoy	18310c240f	fix(patch): delete hub documents While deteting the "Data Migratun Plan" docs the patch used to break, since it was linked to docs from "Data Migration Run". Modified the patch to also delete the linked "Data Migration Run" docs.	2018-09-12 17:46:58 +05:30
Doridel Cahanap	6d0ae5b23b	Allow Rename for Custom Tariff (#15389 )	2018-09-12 17:13:12 +05:30
Prateeksha Singh	5ba14fe685	[patch][fix] remove hub node module removing code	2018-09-12 16:59:17 +05:30
Prateeksha Singh	238ed98653	Re-add Hub Node module	2018-09-12 16:36:10 +05:30
Nabin Hait	9fde97cdd2	Fixed merge conflict	2018-09-12 15:45:20 +05:30
Saurabh	393dd4286a	[resolved] merge-conflicts	2018-09-12 14:48:30 +05:30
Saurabh	6d5a29af6a	bumped to version 10.1.52	2018-09-12 15:14:25 +06:00
Zarrar	8dade79002	return blank if no data found (#15387 )	2018-09-12 14:24:23 +05:30
Nabin Hait	6173e091ee	fix(test): test cases fixed	2018-09-12 11:46:20 +05:30
Zarrar	2b6584a296	accounts table should be mandatory in budget (#15386 )	2018-09-12 11:14:24 +05:30
Ahmed Madi	20d8c52d2a	Update salary_slip.js (#15200 )	2018-09-12 11:02:57 +05:30
Zarrar	ce6a09ca54	[Staging] Stock Reconciliation (#15382 ) * optimize query and some fixes * add get_query to filter warehouses based on company * minor changes	2018-09-12 10:54:18 +05:30
Nabin Hait	0669a0e18a	fix(bank account): import fixed	2018-09-12 10:50:10 +05:30
Nabin Hait	13beb3a008	fix(test): test cases fixed	2018-09-11 19:37:08 +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
Jamsheer	ede924c4a2	Remove print statements - Healthcare utils (#15363 )	2018-09-11 17:32:52 +05:30
Sagar Vora	508189eaea	Use default conversion factor if not found in Item (#15369 )	2018-09-11 17:22:25 +05:30
Frappe PR Bot	157bdb71ca	[Translation] Updated Translations (#15375 )	2018-09-11 17:21:39 +05:30
Zarrar	2859300fe6	update modified date to reload doc (#15385 )	2018-09-11 17:12:27 +05:30
Nabin Hait	84ddbc0ac9	fix(test): test cases fixed	2018-09-11 17:11:39 +05:30
Nabin Hait	2236f0aef0	fix(test): multiple test cases fixed	2018-09-11 16:50:46 +05:30
Nabin Hait	e11f299b21	Update production_order.py	2018-09-11 11:36:05 +05:30
Nabin Hait	2ce2d2ac02	fix(sales invoice): get value only if field exists	2018-09-10 13:16:25 +05:30
Faris Ansari	80e6cad7ac	Merge pull request #15360 from netchampfaris/marketplaces-fixes fix(image): New Image component to consistently handle broken images	2018-09-10 12:29:50 +05:30
Zlash65	4b0e3741b2	job card patch use orm	2018-09-10 12:18:51 +05:30
Prateeksha Singh	3b3c80e6b5	Merge pull request #15371 from pratu16x7/marketplace-fixes [hub] add Item Manager permission to Hub Tracked Item	2018-09-10 11:40:42 +05:30
Prateeksha Singh	62f5cd2dee	[hub] add Item Manager permission to Hub Tracked Item	2018-09-10 11:39:48 +05:30
Zarrar	68000c66fc	check if Data Migration Plan exists before deleting (#15368 )	2018-09-09 19:19:13 +05:30
Zarrar	8448d9014d	[Fix] Patch fixes (#15350 ) * fix typo in fieldname * fallback for work_order/production_order in timesheet	2018-09-09 19:18:41 +05:30
Ameya Shenoy	8b7fea5a8a	Merge pull request #15349 from sagarvora/py3-fixes [py3] print, StringIO import, and other fixes	2018-09-09 02:25:10 +05:30
Saif Ur Rehman	423549e084	Fixed PDC data in AR/AP report: -Get PDC date from posting_date instead of reference date since posting_date is the date at which the post dated cheque can be cleared -Get PDC data from submitted documents only	2018-09-08 15:48:55 +05:00
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	73165ebd33	fix(patch): create healthcare patch only if domain activated	2018-09-07 18:44:14 +05:30
Sagar Vora	538100148f	[py3] print, StringIO import, and other fixes	2018-09-07 17:59:59 +05:30
Pawan Mehta	2cc7eb1e94	fix default settings (#15345 )	2018-09-07 17:59:10 +05:30
Nagarajan	8be8345b65	Stock Projected Qty Item Group Filter (#15340 ) * Update stock_projected_qty.js * Update stock_projected_qty.js * Update stock_projected_qty.py * Update stock_projected_qty.js	2018-09-07 16:20:18 +05:30
rohitwaghchaure	3cc77b52e7	[Fix] Timeout error for bom update tool (#15343 )	2018-09-07 16:16:58 +05:30
rohitwaghchaure	bd4348db10	[Enhance] Add additional cost of the manufacture stock entry in the project costing (#15341 )	2018-09-07 16:16:23 +05:30
Nabin Hait	562d942a7d	fix(patch): gst state number in address where number is less than 10	2018-09-07 16:14:44 +05:30
Nabin Hait	431e2e1c6d	fix(payment entry): Changed modified	2018-09-07 14:31:34 +05:30
Nabin Hait	399f3ddf82	fix(sales invoice): Restored missing field group_same_items	2018-09-07 14:27:14 +05:30
Nabin Hait	3a342e8d93	fix(report): project filter in financial statement	2018-09-07 14:17:57 +05:30

... 13 14 15 16 17 ...

17171 Commits