brotherton-erpnext

Author	SHA1	Message	Date
Prateeksha Singh	1e02f00075	[hub] record views, update favourite api	2018-08-28 17:24:31 +05:30
Faris Ansari	6df06cac97	fix: Show empty state if there are no items	2018-08-28 17:19:35 +05:30
Faris Ansari	c12f48da2d	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-28 17:17:36 +05:30
Faris Ansari	811a2deb0f	fix: Load and save base64 image in publish	2018-08-28 17:17:29 +05:30
Faris Ansari	5689494f9c	chore: Remove old messages page	2018-08-28 16:52:17 +05:30
Saurabh	5b398f293a	[fix] typo fix	2018-08-28 16:28:12 +05:30
Nabin Hait	a626d967c0	[fix] naming series refactor patch	2018-08-28 16:08:22 +05:30
Nabin Hait	24efd19895	[fix] naming series refactor patch	2018-08-28 15:47:08 +05:30
Nabin Hait	0e7a6856a7	[fix] naming series refactor patch	2018-08-28 15:44:46 +05:30
Saurabh	f2caacdf74	[fix] fix google map imports (#15240 )	2018-08-28 15:23:35 +05:30
Nabin Hait	2d28eccdcf	[fix] naming series refactor patch	2018-08-28 15:18:48 +05:30
Suraj Shetty	b92403fbed	Add 'Become Seller' as a primary key - Also remove some unwanted code	2018-08-28 15:04:33 +05:30
Suraj Shetty	f994e3ec6b	Remove 'Become Seller' option from sidebar	2018-08-28 15:03:01 +05:30
Nabin Hait	2b9186da5a	[fix] naming series patch	2018-08-28 15:02:59 +05:30
Nabin Hait	b2c94c0307	[fix] for python 3	2018-08-28 14:39:47 +05:30
Nabin Hait	04bca58fb7	[fix] missing functions related to google maps	2018-08-28 14:21:48 +05:30
Aditya Hase	e3ac5ff9e3	erpnext: refactor async to is_async (#15231 )	2018-08-28 14:11:58 +05:30
Nabin Hait	01b2a6549c	minor fix	2018-08-28 14:09:36 +05:30
Saurabh	79f3ea4094	[minor][fix] call update_percent_complete via validate (#15235 )	2018-08-28 14:01:34 +05:30
Shreya Shah	e0a47aeb2f	Improve performance for warehouse tree (#15207 ) * Fix conflicts * Modify query structure * Remove whitespaces	2018-08-28 13:46:22 +05:30
Shreya Shah	a5add289bb	Refactor Naming Series (#15070 ) * Patch to create Property Setter for existing naming series * Update existing naming series options with new * Add patch link to patches.txt * Update patch * Fix codacy * Fix as per suggestions * Remove old patch for property setter * Improve as per suggested - Modified the naming - Also refactored naming for doctypes having autoname with series - Added a patch to make property setter for autoname * Fix Travis * Rebase with develop	2018-08-28 13:44:48 +05:30
Saurabh	1898e11585	patch sequence fix	2018-08-28 13:04:40 +05:30
Suraj Shetty	ec12b34a79	Add margin below publish area	2018-08-27 20:37:06 +05:30
Suraj Shetty	49c37d5a8e	Add strip html filter	2018-08-27 20:31:29 +05:30
Faris Ansari	a4dcb6f548	fix: Add empty state in Selling	2018-08-27 19:57:12 +05:30
Faris Ansari	725603c0a9	feat: Selling Page - common Messages page for both buying and selling	2018-08-27 19:51:36 +05:30
Saurabh	51570f731c	[Fix] patch fixes for V11 migration	2018-08-27 17:00:51 +05:30
Prateeksha Singh	bc859cbf1d	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-27 15:16:53 +05:30
Prateeksha Singh	872768d89f	[hub] merge conflicts	2018-08-27 15:16:19 +05:30
Suraj Shetty	dc7e8e6a26	Replace hub_item_code -> hub_item_name	2018-08-27 14:11:48 +05:30
Zarrar	93577665f2	[Enhance] Multiselect for Cost Center and Project (#15208 ) * add filter for Cost Center, make CC & Project multiselect field * update queries according to project/cost_center multiselect * add multiselect filter for cost_center and project * update query according to multiselect	2018-08-27 12:08:53 +05:30
Maxwell Morais	a2c1d92374	Revert "Fix shipping_address for DropShipping" (#15218 ) * Revert "Cleaned up welcome email code (#15175)" This reverts commit `771fbb8f01`. * Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)" This reverts commit `2b72d09948`. * Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)" This reverts commit `c5cf428d00`. * Revert "[Minor] Create default department on country setup (#15206)" This reverts commit `2b2712bb9e`. * Revert "Permissions issue in BOM tree" This reverts commit `8fe8d1758a`. * Revert "Fix indentation accounts_receivable.py (#15203)" This reverts commit `fbc3df3247`. * Revert "Fix shipping_address for DropShipping (#15202)" This reverts commit `4a394bcbf4`.	2018-08-27 12:05:41 +05:30
Ahmed Madi	1516b8d54a	Update asset_category.js (#15222 )	2018-08-27 12:04:12 +05:30
Zarrar	b94c7075d8	rectify item price route (#15223 )	2018-08-27 11:44:13 +05:30
rohitwaghchaure	e33047250e	[Fix] Speacial character issue in searching project in sales invoice (#15220 )	2018-08-27 11:43:57 +05:30
Prateeksha Singh	fa26899cd0	[hub] added DetailHeaderItem to detail pages, contact seller button	2018-08-27 10:49:42 +05:30
Prateeksha Singh	d0a952bcda	[hub] Register components, init Item Page - commonly used components are pre-registered - add DetailHeaderItem component - begin ItemPage	2018-08-27 10:12:45 +05:30
Faris Ansari	f089dad7c7	feat: Sidebar in vue	2018-08-26 22:20:16 +05:30
Faris Ansari	d37108d18e	fix: Add back link to Buying	2018-08-26 22:19:56 +05:30
Faris Ansari	23e45ada69	chore: Remove old messages files	2018-08-26 22:19:29 +05:30
Faris Ansari	ea82fb9f80	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-26 20:09:12 +05:30
Faris Ansari	caebd4a9b9	feat: Buying and BuyingMessages in vue	2018-08-26 20:09:02 +05:30
Faris Ansari	019bfd3940	feat: Add helper directives - v-route automatically route to a valid frappe route - v-img-src handle img loading and error handling	2018-08-26 20:08:40 +05:30
Faris Ansari	bf5cc7d823	feat: SectionHeader component	2018-08-26 20:00:42 +05:30
Faris Ansari	4a2ea993fd	fix(search-input): submit on enter	2018-08-26 19:49:20 +05:30
Faris Ansari	fad623eb27	feat: Add dynamic routes in PageContainer	2018-08-26 19:48:52 +05:30
Prateeksha Singh	fad0f64c94	[hub][vue] add action object in empty state, make NotFound page	2018-08-26 18:27:04 +05:30
Prateeksha Singh	5c9b13f5e5	[hub][vue] add skeleton state to DetailView	2018-08-26 18:06:25 +05:30
Prateeksha Singh	9e8d7bbeda	[hub][vue] Seller Page	2018-08-26 16:29:32 +05:30
Prateeksha Singh	80a8dfd6ba	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-26 13:09:52 +05:30
Prateeksha Singh	5e30beec86	[hub][vue] DetailView and Profile page	2018-08-26 13:09:19 +05:30
Faris Ansari	888dd606ff	feat: Add PageContainer	2018-08-26 12:41:02 +05:30
Suraj Shetty	0e59ec3ed2	Update messages UI	2018-08-26 10:07:00 +05:30
Suraj Shetty	88700cf2b9	Separate links for selling and buying messages - Add separate UI for selling messages - Remove some redundant code messages	2018-08-26 10:06:27 +05:30
Prateeksha Singh	de426cb543	[hub][vue] Home page, add section title in item key in v-for	2018-08-25 21:54:49 +05:30
Prateeksha Singh	53fada1ae9	[hub][vue] search page	2018-08-25 20:31:48 +05:30
Prateeksha Singh	0be2859f5b	[hub][vue] Category and Published Products pages	2018-08-25 15:54:43 +05:30
Prateeksha Singh	c31e5c0013	[hub][vue] replace page files, fix item 'seen' prop	2018-08-25 14:09:01 +05:30
Prateeksha Singh	00175eab8e	[hub][vue] Saved Products Page, remote item card - also undo unfavouriting items	2018-08-25 13:18:30 +05:30
Prateeksha Singh	fe41713974	[hub][vue] add import	2018-08-24 16:53:34 +05:30
Prateeksha Singh	40f7c4663a	[hub][vue] Publish Page	2018-08-24 16:38:34 +05:30
Neil Trini Lasrado	771fbb8f01	Cleaned up welcome email code (#15175 )	2018-08-24 15:15:56 +05:30
rohitwaghchaure	2b72d09948	[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187 )	2018-08-24 11:28:34 +05:30
rohitwaghchaure	c5cf428d00	[Enhance] Provision to backflush raw materials from WIP warehouse (#15184 )	2018-08-24 11:27:41 +05:30
Zarrar	2b2712bb9e	[Minor] Create default department on country setup (#15206 ) * make default department when creating new company * remove departments and tds entry for the company	2018-08-24 11:26:51 +05:30
Prateeksha Singh	67e0374261	[hub] add data-driven notification message	2018-08-23 23:55:04 +05:30
Prateeksha Singh	b696b2965d	[hub][vue] add empty state and dynamic publish button	2018-08-23 21:25:53 +05:30
Nabin Hait	8fe8d1758a	Permissions issue in BOM tree	2018-08-23 16:25:51 +05:30
Prateeksha Singh	d7d2bb261b	[hub] add SearchInput	2018-08-23 13:52:41 +05:30
Prateeksha Singh	6e5b9a8f9b	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-23 12:23:09 +05:30
Prateeksha Singh	ff616b8845	[hub][vue] init item card container in vue	2018-08-23 12:22:20 +05:30
Mario Monroy	fbc3df3247	Fix indentation accounts_receivable.py (#15203 )	2018-08-23 11:10:15 +05:30
Faris Ansari	c4e38ffd4d	Remove hub page (#15195 )	2018-08-23 11:09:31 +05:30
Maxwell Morais	4a394bcbf4	Fix shipping_address for DropShipping (#15202 ) This stretch of javascript go against the address definition for DropShipping. When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address. To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.	2018-08-23 11:08:37 +05:30
Charles-Henri Decultot	25712f8d65	Sales order correction (#15190 )	2018-08-23 10:51:44 +05:30
Benji	363dd2773e	Update email_digest.py (#15144 )	2018-08-22 21:57:51 +05:30
Suraj Shetty	341386e3a7	Add list view for messages	2018-08-22 21:31:16 +05:30
Suraj Shetty	d94701e5cc	Add recent message block to item_card	2018-08-22 16:47:50 +05:30
Suraj Shetty	b361c234b1	Remove unused message to avoid confusion	2018-08-22 16:44:55 +05:30
Valmik	6ad16db88c	check for existing task before appending to child table (#15183 )	2018-08-22 14:46:33 +05:30
Shreya Shah	be7703387d	Fetch reserved qty (#15182 ) * Fetch reserved qty * Update get_item_details.py	2018-08-22 14:45:22 +05:30
Faris Ansari	427a1301b7	Issues on the Portal should be editable (#15181 )	2018-08-22 14:43:32 +05:30
Suraj Shetty	7ee79498fc	Hide review option for unregistered user	2018-08-22 12:09:40 +05:30
Suraj Shetty	831ff42101	Stop event bubbling on clicking edit item	2018-08-22 11:52:20 +05:30
Suraj Shetty	12de0aec11	Fix publish button alignment	2018-08-22 11:50:23 +05:30
Suraj Shetty	fc7b7b6b97	Allow item list for System Manager	2018-08-22 11:32:49 +05:30
Suraj Shetty	7a040c4dd8	Show favorite button only for registered user	2018-08-22 11:32:49 +05:30
Suraj Shetty	f9e4cca334	Throw error if hub_url is not present in site_config	2018-08-22 11:32:49 +05:30
Suraj Shetty	3cd0c54438	Fix pyhton 3 compatibility	2018-08-22 11:32:49 +05:30
Prateeksha Singh	631c170ccf	[hub] fix merge conflicts	2018-08-21 21:00:53 +05:30
Prateeksha Singh	caadd8af4e	[Hub] sync with insert_many, Remove Data Migration Run 💥 - Use FrappeClient insert_many to publish items - We will be syncing small amounts of items anyway - Also, we need only the insert action in bulk	2018-08-21 19:59:15 +05:30
Faris Ansari	e745e85d98	feat: route to message room page after contact seller dialog	2018-08-21 19:48:42 +05:30
Faris Ansari	e7af44f1a6	fix: remove items with invalid image	2018-08-21 19:48:06 +05:30
Faris Ansari	a22aa60a17	Merge with upstream	2018-08-21 19:17:25 +05:30
Faris Ansari	ff189b6853	fix: publish items - Pass image data as a json - ignore duplicates while creating Hub Tracked Item	2018-08-21 19:14:44 +05:30
Faris Ansari	d29a3b3567	Highlight links with part route or full route	2018-08-21 19:12:10 +05:30
Zlash65	4d462d637f	indentation fix	2018-08-21 18:19:26 +05:30
Rushabh Mehta	9a29bfa49e	fix(indentation): sales_and_purchase_return.py	2018-08-21 17:53:25 +05:30
Prateeksha Singh	b0a3a106fc	[hub] profile email uneditable, style additions, base64 sync enable	2018-08-21 17:43:30 +05:30
Faris Ansari	d17aedb719	Add BuyingMessages page	2018-08-20 18:33:46 +05:30
Bassam Ramadan	1ff2315899	Trial balance and payable accounts reports and sales return fixes (#15000 ) * adding supplier type filter to payable accounts and payable accounts summary reports adding supplier type filter to payable accounts and payable accounts summary reports as customer group at receivable accounts and summary reports as its important and easier to put this filter * fix trial balance opening and closing values the removed mathematical operations was causing showing incorrect values at opening and closing columns where the total row was correct so the operation deleted to view the correct values to be equal to the total row and to stop confusing the user due to different values between the total row and the the values in front of each account * fix for supplier type filter field on payable accounts reports rename the supplier type filter field to supplier group in payable accounts and summary reports * fix for paid amount in returned sales invoice the current paid amount not change from source value if you deleted any item if the invoice contain for example 3 items and you only need to return on item the current steps is to open the original invoice and press on make return then you delete the unwanted items but in this case the paid amount will not change and you will get an alert from the system until you change it manually but with this modification it works very well. * fixing trial balance values and totals fixing trial balance opening and closing ( DR - CR ) values and totals	2018-08-20 17:58:28 +05:30
Saif	15636a3b98	Problem: Making a PE from PO led to incorrect values in PE form since PO's default party_account_currency is the company's currency (#15153 ) Fix: PO will set party_account_currency to supplier's default currency on validation.	2018-08-20 17:57:00 +05:30
Saif	a09a8c3bf7	Fixed missing DocType info for Purchase Items (#15152 ) * Made Purchase Invoice Items' Batch No and Serial No fields non copyable. * Added appropriate currency field options to Purchase...Items DocFields: -Landed Cost Voucher Amount -Billed Amt	2018-08-20 17:55:18 +05:30
rohitwaghchaure	8cca61f1ba	[Fix] Removed roles for Eway bill report (#15157 )	2018-08-20 17:53:56 +05:30
rohitwaghchaure	b800382abf	[Fix] Due to incorrect conversion factor user not able to make purchase return entry (#15163 )	2018-08-20 17:50:31 +05:30
rohitwaghchaure	e689a903d8	Allowed data import for Assessment Result (#15168 )	2018-08-20 17:50:04 +05:30
Saif	e3947296e8	Group by Voucher fix in General Ledger Report (#15169 ) * -Group by Voucher requires ordering the query not grouping the query -Summing fields is not necessary since grouping by 'name' is the same as getting individual entries * Group by Voucher show groups with totals at the end of group	2018-08-20 17:49:29 +05:30
Benji	299185fe24	Improved task weight calc (#15170 ) * Improved task weight calc Removed the requirement to have total of task weights to be exactly 1. * Update project.py	2018-08-20 17:41:56 +05:30
rohitwaghchaure	ecc6af9d2a	[Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project (#15171 )	2018-08-20 17:39:54 +05:30
Nabin Hait	c95153f83b	Offer date mandatory in job offer	2018-08-20 16:58:06 +05:30
Faris Ansari	8de6380648	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-20 15:58:58 +05:30
Prateeksha Singh	71b41b4771	[hub] response data in hub call event trigger	2018-08-20 15:42:48 +05:30
Prateeksha Singh	e72a2fa9de	[hub] emit hub call event to set category options while publishing	2018-08-20 14:18:07 +05:30
Prateeksha Singh	6faffa5007	[feat] new component: ItemPublishDialog	2018-08-20 14:02:33 +05:30
Prateeksha Singh	4ce54b0011	[feat] new component: NotificationMessage	2018-08-20 13:07:23 +05:30
Zarrar	2b0ecbed2b	python3 based fix for sorted (#15159 )	2018-08-20 11:15:06 +05:30
Prateeksha Singh	42be665412	Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign	2018-08-20 10:08:49 +05:30
Prateeksha Singh	96fdbd467d	[hub][feat] stateful publishing area	2018-08-20 10:07:56 +05:30
Prateeksha Singh	fe67508d60	[hub][feat] Edit your Profile, recycle profile dialog	2018-08-20 01:18:41 +05:30
Prateeksha Singh	305f7375d1	[hub] Register in a dialog instead of Page - in order to recycle it for Edit Profile - Also, the register page had too much custom code	2018-08-20 00:25:26 +05:30
Prateeksha Singh	a525d12f69	[hub] sync multiple image urls - using a simple multiselect currently	2018-08-19 22:31:33 +05:30
Prateeksha Singh	0a60d1cd96	[hub] Publishing Dialog, Sync category - Hub Category selection - Recycled	2018-08-19 19:39:00 +05:30
Faris Ansari	2ce2e1b6b0	feat(messages): split messages into buying and selling - messages will be organized by their purpose, i.e Buying and Selling - on clicking the buying item, the message room page will be opened where sellers can communicate - invalidate cache using event key	2018-08-17 18:39:36 +05:30
Faris Ansari	335c0f200f	feat: custom cache invalidation for hub calls In some cases, we know when to invalidate the cache. This feature allows to do just that. erpnext.hub namespace is now an EventEmitter instance.	2018-08-17 16:04:14 +05:30
Faris Ansari	c1fe1c45c7	feat: empty states for favourites and search page	2018-08-17 14:29:42 +05:30
Faris Ansari	aa46567439	refactor: rename hub-card-container to hub-items-container	2018-08-17 14:29:22 +05:30
Rushabh Mehta	5f33b69f2f	fixes(minor): clean item group html and hide image	2018-08-16 14:48:02 +05:30
Nabin Hait	9409eddf28	Update __init__.py	2018-08-16 13:58:44 +05:30
rohitwaghchaure	5c5688b374	Added provision to disabled in stock in products settings (#15133 )	2018-08-16 10:33:28 +05:30
Charles-Henri Decultot	bd06a5b0ee	Small python 3 compatibility correction (#15151 )	2018-08-16 10:32:49 +05:30
Shreya Shah	80f30094fb	Fix error msg (#15146 )	2018-08-16 10:29:16 +05:30
rohitwaghchaure	6fb2117767	Allow to make budget for the same cost center with different account (#15149 )	2018-08-16 10:22:06 +05:30
Rushabh Mehta	8705371ef0	fix(product-listing): fix variant selection in website	2018-08-16 09:22:45 +05:30
rohitwaghchaure	7e36aa4162	Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report [Fix] Consolidated balance sheet report	2018-08-15 19:41:41 +05:30
Rohit Waghchaure	cafd61de85	[Fix] Consolidated balance sheet report	2018-08-15 16:18:46 +05:30
Zarrar	3523b779aa	rounding off fixes and conversion fix (#15140 )	2018-08-14 16:28:14 +05:30
Ameya Shenoy	338dfcfb63	monkey patching for demo (#15141 )	2018-08-14 16:27:47 +05:30
Prateeksha Singh	460e2798cd	[hub] Favourites UI - remove from listing - add to favourites	2018-08-14 11:42:40 +05:30
Faris Ansari	4809f86035	fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106 )	2018-08-14 10:56:18 +05:30
Shreya Shah	0631aed3d9	Discount amount field in all transactions' child tables (#15124 ) * Add discount_amount and base_discount_amount in Sales Invoice Item * Add patch for existing documents * Discount amount field in all child tables of Purchase and Selling * Remove console statements	2018-08-14 10:51:48 +05:30
rohitwaghchaure	88b0a1305f	Code optimization for accounts receivable report to avoid timeout error (#15114 ) * Code optimization for accounts receivable report to avoid timeout error * Added index for party_type	2018-08-14 10:51:13 +05:30
Prateeksha Singh	1a0fb5b63a	Add detail page favourited state	2018-08-14 01:31:03 +05:30
Prateeksha Singh	c5a9972785	[refactor][major] Separate out Components - item_card - item_card_container - detail_view - search_bar - reviews - skeleton_state - empty_state - empty_state	2018-08-13 21:36:07 +05:30
Nabin Hait	3b5f18231a	fix(item_defaults): Item name was overwriting by child name	2018-08-13 17:45:29 +05:30
Saurabh	ddbf3aaccb	Merge branch 'master' into develop	2018-08-13 13:15:58 +05:30
Saurabh	cd6b955b99	bumped to version 10.1.48	2018-08-13 13:45:56 +06:00
Rohit Waghchaure	18960c7757	Project task custom field not copying and error on project	2018-08-13 11:40:11 +05:30
Zarrar	a4d06fc881	replace cur_frm with frm	2018-08-12 17:48:04 +05:30
ahmad zaqout	7df03a4b5b	replace department group to department	2018-08-11 22:10:24 +03:00
ahmad zaqout	0fd562e0d9	replace customer to department	2018-08-11 21:54:56 +03:00
Nabin Hait	c35271aef5	fix(various)	2018-08-10 19:01:13 +05:30
Saurabh	20fb443f0c	[Resolved] merge conflicts	2018-08-10 17:11:30 +05:30
Saurabh	57d3c93e6b	bumped to version 10.1.47	2018-08-10 17:37:01 +06:00
Prateeksha Singh	b777f3dbfd	[layout][iterate] item detail page actions	2018-08-10 10:38:28 +05:30
Nabin Hait	8bf52fef42	minor fixes	2018-08-09 19:45:33 +05:30
Nabin Hait	c13960ddc9	minor fix	2018-08-09 18:25:03 +05:30
Nabin Hait	e07bf15de2	minor fix	2018-08-09 17:38:04 +05:30
rohitwaghchaure	a0b846fb88	[Minor] Added condition for get_bank_cash_account (#15112 )	2018-08-09 15:51:38 +05:30
rohitwaghchaure	8356d4b892	[Fix] disable_rounded_total not found error (#15113 )	2018-08-09 15:51:11 +05:30
rohitwaghchaure	ba62013cbb	[Fix] Not able to delete the task even if task removed from the project (#15105 ) * [Fix] Not able to delete the task even if task removed from the project * [Fix] Custom field's data in task not updating from the project	2018-08-09 15:50:23 +05:30
Nabin Hait	2a774fa0ac	minor fix	2018-08-09 11:50:34 +05:30
Nabin Hait	6a5695fe17	minor fix	2018-08-09 11:30:21 +05:30
rohitwaghchaure	59de1dae6a	[Fix] Math domain error (#15107 )	2018-08-09 10:58:37 +05:30
Nabin Hait	9a33bc6417	optimizing transactions by caching	2018-08-09 10:47:09 +05:30
Nabin Hait	50238c3049	[optimize] tree conditions for pricing rule	2018-08-08 18:43:04 +05:30
Himanshu Mishra	859d942b22	Cached calls (#15109 ) * [optimize]: bin updates * [optimise]: use frappe.get_cached_value instead of get_value for item * [fix]: change db.get_cached_value to get_cached_value	2018-08-08 18:33:50 +05:30
Himanshu Mishra	f56aac65e1	[optimize]: bin updates (#15108 )	2018-08-08 18:32:03 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Rushabh Mehta	4d0b8da0e5	fix(style): modal for website	2018-08-08 14:48:02 +05:30
Nabin Hait	84c7c77009	[optimize] Get defaults from item group based on doc	2018-08-08 14:30:44 +05:30
Nabin Hait	3f142b874a	item defaults based on caching	2018-08-08 13:02:59 +05:30
ahmad zaqout	63a741e5c8	fix throw_overlap_error in Shift Assignment (#15103 ) fix throw_overlap_error in Shift Assignment	2018-08-08 10:36:40 +05:30
Solufyin	3be899caff	Item Alternate Image Features in e-commerce site. (#15044 ) * [ADD] Added Item Alternate Image Features in e-commerce site. * [IMP] Improved Code for Item Alternate Image Feature. * [IMP] Improved code for Item alternative image functionality. * Remove .css file and make a build for erpnext-web.css * Cleanup styling for item alternate image, also add delegated handler * Spaces -> Tabs * Spaces -> Tabs in item.html	2018-08-07 18:28:39 +05:30
rohitwaghchaure	8f0acf30bf	Merge pull request #15101 from rohitwaghchaure/ascii_issue_in_balance_sheet [Fix] 'ascii' codec can't encode error in balance sheet report	2018-08-07 16:53:21 +05:30
Rohit Waghchaure	9a9974f5c3	[Fix] 'ascii' codec can't encode error in balance sheet report	2018-08-07 16:51:56 +05:30
Ameya Shenoy	c63e0f9902	Merge pull request #15100 from codingCoffee/splitissue2 [fix] Split issue	2018-08-07 16:43:35 +05:30
Ameya Shenoy	f2e73dd687	[fix] Split issue take reference name from communication	2018-08-07 16:34:37 +05:30
Meritsystems	1ad8eca4e8	Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. (#14895 ) * Update point_of_sale.py * Update point_of_sale.py Add custom field(Display Items In Stock) to POS Profile Doctype of type Check. * New field " Display Items in Stock" added * Update point_of_sale.py * Update point_of_sale.py ORM used instead of SQL used Bin to find actual quantity balances. * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py * Update point_of_sale.py	2018-08-07 14:38:50 +05:30
Saurabh	824b388631	Resolved merge conflicts	2018-08-07 13:01:11 +05:30
Prateeksha Singh	28d52dfe0c	[hub][fix] Category page api call	2018-08-07 12:56:56 +05:30
Saurabh	6ec558bd59	bumped to version 10.1.46	2018-08-07 13:25:51 +06:00
Prateeksha Singh	318cca8cae	[hub] Add 'See All' for Category items - Also remove special `cursor: pointer` style - Set it for all elements having a data-route	2018-08-07 12:41:21 +05:30
Prateeksha Singh	82b9508622	Add Products by Seller	2018-08-07 12:02:14 +05:30
Faris Ansari	796ca56f85	Use frappe.utils.md_to_html instead of manual import (#15087 )	2018-08-07 11:53:36 +05:30
Prateeksha Singh	658d1bbae2	Fix product header styles	2018-08-06 19:13:10 +05:30
Prateeksha Singh	d3da401ef4	Home: Category-wise Items	2018-08-06 18:31:26 +05:30
Prateeksha Singh	b614ece991	[hub] Move sync, correct legacy code	2018-08-06 17:48:45 +05:30
Zarrar	2cadb1e12e	add tax withholding & loyalty program in explore view (#15074 )	2018-08-06 14:46:16 +05:30
Doridel Cahanap	59e4c32e9f	Allow Disabling Batch and edit Validations (#15076 )	2018-08-06 14:45:18 +05:30
Shreya Shah	11dd3ffdb5	Force delete item on deletion of Lab test template (#15079 )	2018-08-06 14:43:00 +05:30
Shreya Shah	f0ef673498	Accounts receivable aging based on supplier due date (#15080 ) * Accounts receivable aging based on supplier due date (#13801) * Remove spaces	2018-08-06 14:42:35 +05:30
Charles-Henri Decultot	614959d5f8	Correction of the get_price method for pricing rules (#15082 ) * Addition of currency arg in get_price * Change Price to Rate	2018-08-06 14:42:04 +05:30
Jignesh Greycube	ef961746c1	Spelling updated from Maxiumm to Maximum (#15093 ) Spelling updated from Maxiumm to Maximum	2018-08-06 14:32:46 +05:30
rohitwaghchaure	57d07d6b8e	Merge pull request #15097 from rohitwaghchaure/incorrect_tax_amount_in_report [Fix] Incorrect tax amount calculation because of same fieldname in the code	2018-08-06 14:32:44 +05:30
Jignesh Greycube	56027e3799	Spelling updated from Maxiumm to Maximum (#15092 ) Spelling updated from Maxiumm to Maximum	2018-08-06 14:32:31 +05:30
Jignesh Greycube	cb66f6904f	Spelling updated from Maxiumm to Maximum (#15091 )	2018-08-06 14:32:19 +05:30
Jignesh Greycube	b2d16aca74	Updated Spelling Maxiumm to Maximum (#15090 )	2018-08-06 14:32:05 +05:30
rohitwaghchaure	fc682c86c6	[Fix] Inactive student validation issue while disabling the student group (#15095 )	2018-08-06 14:29:46 +05:30
Rohit Waghchaure	15f52e7b71	[Fix] Incorrect tax amount calculation because of same fieldname in the code	2018-08-06 14:29:34 +05:30
KanchanChauhan	7fb8540b70	Get item defaults from item group (#15089 )	2018-08-06 14:29:14 +05:30
Prateeksha Singh	a5f6e54b70	fix merge conflict	2018-08-06 13:56:53 +05:30
Prateeksha Singh	0c796229dc	prevent jinja exec in search title	2018-08-06 12:33:34 +05:30
Ameya Shenoy	26bfede116	Merge pull request #15078 from rohitwaghchaure/task_email_alert_not_working_from_project Fix] Task's email alert on status change not working if we change the task status from the project form	2018-08-06 12:33:07 +05:30
Ranjith Kurungadam	752fd5a7a0	Tests SO for Serial No based delivery (#15072 ) * fix remove SO from Serial No only when voucher SE * SO tests - delivery by Serial No	2018-08-03 10:39:51 +05:30
Rohit Waghchaure	86217ca96c	[Fix] Task email alert on status change not working if we change the task status from the project form	2018-08-02 16:41:53 +05:30
Prateeksha Singh	106856b1ab	Show View count on items	2018-08-02 02:07:04 +05:30
Prateeksha Singh	32a2148651	[hub] Company (Seller) page	2018-08-02 01:42:23 +05:30
Faris Ansari	eeedc3bb47	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-08-01 19:19:58 +05:30
Faris Ansari	2a81b4acd6	Messages: first cut	2018-08-01 19:19:53 +05:30
KanchanChauhan	e1f0be6da5	Delivery Date Change based on Delivery Date change in child table (#15068 )	2018-08-01 18:11:58 +05:30
rohitwaghchaure	ae4ff5a403	[Fix] In words showing grand total instead of rounded total (#15065 )	2018-08-01 18:09:51 +05:30
Nabin Hait	041a5c2d3b	Get Advances and auto allocate (#14970 )	2018-08-01 18:07:39 +05:30
Ranjith Kurungadam	d54991d624	Delivery by Serial No (#15030 ) * fields added for delivery by Serial No * SO - validate item for delivery by Serial No * Stock Entry - add Serial No on production, validate reserved consumption * add item by reservation to transaction if delivery by Serial No * SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice * Sales Order - validate Ensure Delivery by Serial No * Serial No - remove SO ref on cancel	2018-08-01 17:47:07 +05:30
rohitwaghchaure	0452b405f4	[Fix] Not able to submit the expense claim (#15057 )	2018-08-01 17:45:51 +05:30
Zarrar	7f8024c516	[Enhancement] Tax Withholding Category (#15064 ) * add single, cumulative threshold, remove checkboxes * remove tds child table from supplier & add tds link field * add description field in tax withholding category * add tax withholding data for indian setup, some fixes * add a checkbox for tax withholding in purchase invoice * remove supplier's child table for tds * enable tds field if supplier has tds set inits master * move rates data to child table - adding fiscal year support * change bootstrap data according to child table config of tds * show category name in list view * loyalty program fixes * moved tax calculation to tax_withholding.py - calculation for tds amount for cumulative threshold from gl entry * add fiscal year dependency in company test * minor loyalty program fix * minor tier calculation fix * minor handling duplicate exception * toggle apply_tds according to supplier, code rectify * minor fixes for loyalty program * test case for single and cumulative threshold * codacy fix	2018-08-01 17:45:05 +05:30
Nabin Hait	e45ec661ea	Additional fields in Item Price (#14540 ) * [IMPROVEMENT] Item Price New Fields and Features * [IMPROVEMENT] Item Price - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom - Stock Setting to accept Default Price List for Purchase or Sales Item - Move Item Section in Item Price * Fetch default Item Price based on Customer as null * test fixes * Code cleanup and fixed the issue of incorrect item price fetched against the customer * Removed min qty from packing_increment calculation * Removed auto_update_price_list_rate from the stock settings * Revert sales_order.json changes * Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings * Removed unnecessory file * Fixed item price validation code	2018-08-01 17:44:34 +05:30
Prateeksha Singh	3aed5c219f	[hub] make get_items generic, add legacy.py	2018-08-01 17:32:13 +05:30
Prateeksha Singh	4d4791ab39	[chore] remove imports	2018-08-01 16:42:09 +05:30
Prateeksha Singh	b4e9ec33cb	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-08-01 16:39:10 +05:30
Prateeksha Singh	6495d532a6	[restructure] make api.py	2018-08-01 16:38:39 +05:30
Faris Ansari	5249307f27	Prevent access of registered routes	2018-08-01 16:29:40 +05:30
Faris Ansari	2de046fbed	Add generic action handler to subpage	2018-08-01 15:57:28 +05:30
Faris Ansari	de85f24383	Rename base_page to subpage	2018-08-01 15:57:13 +05:30
Faris Ansari	fbe9a46d51	Add Marketplace link to user dropdown in toolbar	2018-08-01 15:56:39 +05:30
Nabin Hait	7d9a1db97a	Update buying_settings.json	2018-08-01 15:26:40 +05:30
Faris Ansari	709a4a3f4e	Break marketplace.js into multiple files	2018-08-01 14:09:07 +05:30
Faris Ansari	c0a22a689e	Item Menu dropdown	2018-08-01 13:35:32 +05:30
Faris Ansari	a12076e0fd	Convert image to base64 before sending Item to sync	2018-07-31 23:06:00 +05:30
Faris Ansari	057839298c	fix get_category call	2018-07-31 19:06:11 +05:30
Nabin Hait	06029194cb	Patch fixes	2018-07-31 18:16:11 +05:30
Faris Ansari	300c07c3d9	Use hub.call for categories and favourites	2018-07-31 18:02:13 +05:30
Faris Ansari	1ff25279bf	Remove old hub styles	2018-07-31 17:59:03 +05:30
Faris Ansari	c1438c6169	refactor(hub connection): read only connection - Seller activity in Activity Log - Move hub_url to site_config	2018-07-31 17:51:45 +05:30
Nabin Hait	14ad9f70b5	Patch fixes	2018-07-31 17:33:14 +05:30
rohitwaghchaure	dc7004e083	[Fix] Patient Appointment Calendar not showing data properly (#15052 )	2018-07-31 16:01:02 +05:30
Faris Ansari	b1d6f94cdf	Merge branch 'hub-redesign' into hub-redesign-contact-seller	2018-07-31 14:54:58 +05:30
Fisher Yu	13aec3aecb	Simplified Chinese Translation Update (#14992 ) * delete the old version to be replaced by a new one * New version of the translated simplified Chinese	2018-07-31 13:29:35 +05:30
Nabin Hait	eed3d4c1b3	Fixed Merge Conflict	2018-07-31 12:36:16 +05:30
Nabin Hait	e9afbfde76	bumped to version 10.1.45	2018-07-31 12:48:22 +06:00
Faris Ansari	2ae80fd000	wip	2018-07-31 12:02:20 +05:30
Prateeksha Singh	425356c21c	[hub] remove test code	2018-07-31 10:45:53 +05:30
Nabin Hait	d53c2c031d	more payroll improvements and tests fixes	2018-07-30 20:17:15 +05:30
rohitwaghchaure	1fa5698798	[minor] Freeze the screen to avoid multiple time clicks (#15047 )	2018-07-30 19:11:43 +05:30
rohitwaghchaure	086da451ca	Removed academic term from validation to check duplicate program enrollement (#15046 )	2018-07-30 19:11:14 +05:30
Nabin Hait	d305a7a959	Made leave application importable	2018-07-30 17:12:32 +05:30
Nabin Hait	4f135c9805	Payroll entry ux improvements and processing via background jobs	2018-07-30 16:37:07 +05:30
Nabin Hait	04d5412754	Fixed conflict	2018-07-30 16:37:07 +05:30
Prateeksha Singh	46df72d55d	[hub] test progress trigger	2018-07-30 13:24:01 +05:30
Shreya	21ce5e0609	Fix typo in label	2018-07-30 12:07:46 +05:30
Nabin Hait	9c735e43b0	Grant leaves via modal and backgroud jobs (#15026 )	2018-07-30 10:58:49 +05:30
Zarrar	89c87fd6a6	[Minor] Patch fix (#15041 ) * update modified date * remove extra parameter from function call	2018-07-30 10:57:47 +05:30
Zarrar	6004b66797	[Minor] Job Offer UX improvise (#15042 ) * job offer ux improv * Update job_offer.js	2018-07-30 10:57:13 +05:30
Nabin Hait	cce7c5c245	Fixed salary structure employee patches	2018-07-30 10:52:51 +05:30
rohitwaghchaure	91d2ace9bb	Account no + account name in trial balance and financial statements reports (#15038 )	2018-07-30 10:38:51 +05:30
Prateeksha Singh	efbd2ee3f5	[hub] Realtime Sync Progress - Show progress from the migration plan - Show products being synced - Disallow publishing in sync state	2018-07-30 09:17:14 +05:30
Prateeksha Singh	811cc3f78f	[hub] resolve merge conflicts	2018-07-29 18:05:07 +05:30
Prateeksha Singh	d27b27f88a	Hub Seller Profile and Timeline - profile details fetched from server - timeline updates on publishing items	2018-07-29 16:52:16 +05:30
Prateeksha Singh	6f05ea124e	[hub] Track Hub Sync on the Server - Create a Hub Seller activity on start of Hub Sync - Store its name as remote_id in the Run - Update that activity remotely once the Run here is complete, status	2018-07-29 14:40:52 +05:30
Faris Ansari	296848cb69	Publish Page - Code cleanup - Separate local item card and hub item card - Use make_search_bar	2018-07-28 16:14:22 +05:30
Faris Ansari	abcc8ab8e5	Push review area to bottom	2018-07-28 13:57:16 +05:30
Prateeksha Singh	d0a1a4fe90	[hub] differentiate self-published items	2018-07-28 13:16:09 +05:30
Prateeksha Singh	f6f429fb10	[hub] Item page skeleton	2018-07-28 12:25:14 +05:30
Shreya Shah	91a9ee5179	Merge accounts functionality (#14993 ) * Add dialog to merge accounts * Add conditions and merge functionality * Fix travis * Add test case * Add more test scenarios	2018-07-28 10:26:11 +05:30
Prateeksha Singh	dd8045759f	[hub] Published Products Page	2018-07-28 01:54:51 +05:30
Prateeksha Singh	83d60ffa1d	[hub] update hub item mapping	2018-07-28 00:07:25 +05:30
Prateeksha Singh	6e7fb71f1f	[hub][patch] reset publish_in_hub for all items	2018-07-27 22:02:47 +05:30
Faris Ansari	19d40cafba	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-07-27 21:51:31 +05:30
Faris Ansari	b7a63ab81e	Homepage - show random items from each hub seller - show items from country - move add_review method on hub	2018-07-27 21:51:26 +05:30
Prateeksha Singh	f4fbf5215b	[hub][search] empty search and route fallback	2018-07-27 21:07:56 +05:30
Faris Ansari	44f7d2e62b	SearchPage	2018-07-27 15:33:00 +05:30
Shreya Shah	749094dd52	Translatable UOMs (#15024 )	2018-07-27 12:54:34 +05:30
Nabin Hait	fa06ee80e9	Fixed merge conflict	2018-07-27 12:54:00 +05:30
Nabin Hait	584153a1b1	bumped to version 10.1.44	2018-07-27 13:05:42 +06:00
Shreya Shah	eed0a4e2df	Do not copy remarks field while duplicating (#15023 )	2018-07-27 11:26:35 +05:30
FinByz Tech Pvt. Ltd	f5cc1bd44c	Created Eway Bill Report (#14926 ) * Created Eway Bill Report * Field value changes * Changed module from Stock to Regional * Added comments and minor fix * minor fix	2018-07-27 11:21:42 +05:30
Yaqin Shurrab	cc56ff5c37	Get the correct Summation of Closing Balances (#14990 ) Fix total raw values for Closing Credit and Closing Debit	2018-07-27 11:13:00 +05:30
rohitwaghchaure	20d3bef3c3	[Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report (#14994 )	2018-07-27 11:03:53 +05:30
mist-01	9821d51e31	Updated appointment availability to consider appointment duration in healthcare domain (#15011 ) * Updated appointment availability to consider appointment duration in healthcare domain. Fix bug - must clone moment before adding time to avoid updating original moment * Add spaces after comments	2018-07-27 11:02:03 +05:30
Shreya Shah	1f4c263a63	[minor] Program Enrollment Tool (#15013 ) * Make academic term field mandatory * Add disabled field to Student Group * Mandatory check in Education Settings for Academic Term * Fix as per review	2018-07-27 10:59:14 +05:30
Shreya Shah	f71d18a35a	Increase margin (#15016 )	2018-07-27 10:57:32 +05:30
Nabin Hait	d0a2b1619b	Optimization for marking student attendance	2018-07-27 10:51:55 +05:30
rohitwaghchaure	0fe6ced99d	[Fix] Valuation rate for serialized items (#15017 )	2018-07-27 10:33:30 +05:30
Zarrar	4282729c72	delete version log while deleting company transaction (#15021 )	2018-07-27 10:32:17 +05:30
Faris Ansari	24d5f17255	NotFound page for marketplace	2018-07-26 19:22:58 +05:30
Faris Ansari	9d1b7d493a	[patch] Delete old hub page	2018-07-26 18:54:58 +05:30
Faris Ansari	b5ce1976b8	Move marketplace code back to marketplace.js	2018-07-26 18:46:38 +05:30
Faris Ansari	521fe4d01d	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-07-26 18:39:34 +05:30
Faris Ansari	cae856cbda	Add marketplace back to hub_listing	2018-07-26 18:39:28 +05:30
Faris Ansari	f4884f8108	Marketplace - Cache hub calls - call_hub_method using FrappeClient connection - Become a seller UX fixes	2018-07-26 18:37:01 +05:30
Faris Ansari	2ca5afa214	Move marketplace ui to marketplace.js	2018-07-26 18:35:04 +05:30
Prateeksha Singh	d885248309	[hub] remove sync_in _progress set	2018-07-26 18:21:33 +05:30
Prateeksha Singh	bcd7077342	[hub] remove sync_in_progress set	2018-07-26 18:20:58 +05:30
Prateeksha Singh	d450c0ac08	[hub][publish] in_progress/empty state	2018-07-26 17:24:33 +05:30
Prateeksha Singh	b750425288	[hub] sync in progress	2018-07-26 16:25:22 +05:30
Ranjith Kurungadam	e555b5bcf2	Salary Slip tests for tax calc on benefits, additional salary (#14985 ) * tests for tax calc on benefits, additional salary * fix tests - remove created additional salary	2018-07-26 14:39:59 +05:30
Prateeksha Singh	d1224ca662	[hub][init] add profile page	2018-07-26 13:39:06 +05:30
Nabin Hait	8173d9f17a	Update additional_salary.json	2018-07-26 12:20:05 +05:30
Saurabh	f86224e6f7	Merge pull request #14945 from chdecultot/gocardless_corrections Gocardless improvement and payment request correction	2018-07-26 11:41:43 +05:30
Faris Ansari	195436093d	Merge pull request #15004 from netchampfaris/hub-factory-syntax Fix Syntax Error in hub_factory.js	2018-07-26 10:57:02 +05:30
Prateeksha Singh	f26177bdbc	[hub] setup publish items flow	2018-07-26 10:38:11 +05:30
Prateeksha Singh	1d1696080e	[hub][publish] add search, fix multiple append	2018-07-26 08:36:33 +05:30
Prateeksha Singh	505f6f14e9	[hub][publish] select/deselect all items	2018-07-26 08:06:21 +05:30
Prateeksha Singh	9685d7c37a	[hub] registered vs read-only views	2018-07-26 01:12:00 +05:30
Prateeksha Singh	cf2d2a5c75	[hub][init] add publish items page	2018-07-25 20:02:12 +05:30
Nabin Hait	22fa99d040	Payroll Fixes	2018-07-25 18:21:39 +05:30
Nabin Hait	e50e0e4b30	Update repost_reserved_qty_for_production.py	2018-07-25 17:49:47 +05:30
Faris Ansari	6b07898ef0	semicolon	2018-07-25 17:07:26 +05:30
Faris Ansari	ed1190126e	Fix Syntax Error in hub_factory.js	2018-07-25 16:51:01 +05:30
Prateeksha Singh	bc8caefc19	[hub] add register as a seller page	2018-07-25 11:08:23 +05:30
Faris Ansari	0fbaa72504	Add review area	2018-07-25 00:49:11 +05:30
Zlash65	617532b2cb	Factory: class.extend -> es6 class	2018-07-24 14:20:10 +05:30
Nabin Hait	90bb5f43d5	Added more status in task web form	2018-07-24 11:33:05 +05:30
Ranjith Kurungadam	e51c175aca	Fix tests (#14991 ) * minor improv in fetching account * pass name field while creating tds doc * create tds fixture after creating tds account * Inpatient Record - Test - Fix * fix batch query	2018-07-24 11:07:28 +05:30
Faris Ansari	ea2d1b0a19	New page: marketplace - subpages: home, favourites, item, category	2018-07-23 18:44:46 +05:30
Nabin Hait	4037915b3c	Update setup.py	2018-07-23 18:05:55 +05:30
Nabin Hait	797497d22e	Fixed web form perm for tasks	2018-07-23 17:58:40 +05:30
Prateeksha Singh	ebb5662cb7	[revert] modules dropdown	2018-07-23 17:04:34 +05:30
Ameya Shenoy	218f2f841e	Merge pull request #14920 from codingCoffee/split_issue Split a given Issue into 2	2018-07-23 16:09:05 +05:30
Ameya Shenoy	769054e00d	Split a given Issue into 2 Bugs encountered: Once the dialog pops up, filling in the subject and pressing RETURN doesn't work. It fails to read the subject. The primary button needs to be clicked on. This is a generic issue, not related to this PR Behaviour: -[x] Add button on communication to split thread -[x] Popup asks for new subject -[x] Copy "Customer", "Sender" and other relevant fields to this issue -[x] Move thread and replies to new issue fixes #14600	2018-07-23 10:31:38 +00:00
Nabin Hait	0c0c345678	Added index on SLE based on batch_no, item and warehouse	2018-07-23 14:38:50 +05:30
yimesgen	20a80fee45	Update batch.py (#14905 ) * Update batch.py Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and". * Update batch.py	2018-07-23 14:36:50 +05:30
Charles-Henri Decultot	6321a6b908	use standard dict method	2018-07-23 08:56:38 +00:00
Alchez	56bd5d8aaa	Fix finance book getter error when book doesn't exist (#14987 )	2018-07-23 14:16:35 +05:30
Shreya Shah	cd717e422f	Modify renaming process of Account (#14839 ) * Disable renaming for Account Master * Update account name along with account number * Fix as per suggestions * Update account.js * Fix typo * Remove after_rename and before_rename methods * Modify test case * Modify field placement * Remove unused method	2018-07-23 14:15:20 +05:30
Jamsheer	425fb4c5f4	[Feature][Enhance] Healthcare Inpatient (#14940 ) * New DocTypes - Inpatient Record and Healthcare Service Unit Type * Patient Appointment - Button - Get Prescribed Procedure - hide after save * Patient Encounter - Schedule Inpatient button * Inpatient - Healthcare Fields and references Conflicts: erpnext/healthcare/doctype/lab_test/lab_test.json erpnext/healthcare/doctype/patient_appointment/patient_appointment.json erpnext/healthcare/doctype/patient_encounter/patient_encounter.json erpnext/healthcare/doctype/vital_signs/vital_signs.json * Healthcare Service Unit Type - Item Creation - UOM Fix * Healthcare Service Unit - healthcare service unit type fix * Inpatient Record - Admission Scheduled and Discharge Scheduled status * Patient - rename field inpatient to inpatient_status * Inpatient Record - rename field inpatient to status * Refactor - Inpateint Occupancy * Remove unused imports * Healthcare service unit - patch - fix * Healthcare IP - Codacy Fix * Inpatient Record - Encounter and Practitioner References * Patch - add healthcare service unit tree - enhance * Healthcare Setup - Remove - Lab Test and Item creation * Discharge note in Inpatient Record * Codacy fix * Inpatient Record - Update transfer service unit filter * Inpatient Record - Test	2018-07-23 13:05:35 +05:30
rohitwaghchaure	6b862fcae5	[Fix] Rounded total is not working in the purchase receipt (#14984 )	2018-07-23 13:02:07 +05:30
Saurabh	a638400e5d	Merge pull request #14707 from chdecultot/stripe_improvements_4 Stripe Subscriptions	2018-07-23 12:11:58 +05:30
Faris Ansari	f585197045	Cleanup homepage	2018-07-23 11:55:07 +05:30
darthguru	f2d4e33eb5	Fixed IGST ISSUE (#14975 ) * Fixed IGST ISSUE the flag was not getting reset causing only the first IGST value to be shown and the rest went into SGST and CGST this fixes it * Update gstr_2.py	2018-07-23 11:52:26 +05:30
Ranjith Kurungadam	1e90dafef8	fixes Benefit Application, Additional Salary (#14971 ) * fix - add Additional Salary if multiple in one slip * fix - Benefit Appication, None comparison	2018-07-23 11:32:58 +05:30
Ranjith Kurungadam	68abe25371	fix - assigned Salary Structure query (#14965 )	2018-07-23 11:31:46 +05:30
Zarrar	a22e0d0c99	return empty if no stock ledger entry found (#14968 )	2018-07-23 11:31:04 +05:30
Shreya Shah	83dfc0a2b1	Add Priority field in issue webform and portal (#14967 )	2018-07-23 11:14:00 +05:30
Faris Ansari	789ad180ea	Merge pull request #14969 from netchampfaris/financial-statement-reports Financial Reports fixes	2018-07-21 12:28:31 +05:30
Faris Ansari	b23d15fba9	Fix typo	2018-07-20 18:16:31 +05:30
Faris Ansari	5e096df5ae	columnDef => column	2018-07-20 16:35:51 +05:30
Faris Ansari	e7f864a4dd	Return early if filters not initialized	2018-07-20 16:31:01 +05:30
Prateeksha Singh	abca510f9a	Update conf.js	2018-07-20 16:07:50 +05:30
Faris Ansari	5986d59b01	Financial Reports - Update formatter for use with DataTable - Fetch Currency from filters and fallback to company currency	2018-07-20 15:11:55 +05:30
Charles-Henri Decultot	39418b1532	CSS correction due to latest version of develop	2018-07-20 09:37:22 +00:00
KanchanChauhan	0c3d345a9f	[Minor] Moved mandatory Company field from More Information section to top (#14950 )	2018-07-19 14:39:31 +05:30
Ranjith Kurungadam	dff2ba72d3	test TDS calculation (#14919 ) * test TDS calculation * fix failing test cases * fix codacy	2018-07-19 14:34:05 +05:30
Saurabh	a8e24cba46	Merge patch and delete fields from subscription (#14941 ) * Delete subscription records after migrating all records to auto-repeat * delete old fields from subscription	2018-07-19 14:33:31 +05:30
Saurabh	139d165258	Merge pull request #14962 from saurabh6790/staging_version_1 Update staging version to support semantic versioning	2018-07-19 13:38:34 +05:30
Saurabh	dfdad651ea	Update staging version to support symentic versioning	2018-07-19 13:36:32 +05:30
Nabin Hait	9c5afc3620	website permission for support portal	2018-07-19 13:02:36 +05:30
Nabin Hait	47ce481394	Minor fix	2018-07-19 11:10:46 +05:30
Prateeksha Singh	627d0d58be	[fiscal-year] use to_date property	2018-07-18 18:09:28 +05:30
Prateeksha Singh	8ecfaaa707	[fix] format fiscal year docname to proper date before using 🤦 (#14955 )	2018-07-18 18:03:27 +05:30
Saurabh	0bfbf8aa6f	[minor] remove conflicts	2018-07-18 17:21:07 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Saurabh	6c46b4edc4	bumped to version 10.1.43	2018-07-18 16:54:54 +06:00
Shreya Shah	8395a7ad6f	Modifications in last purchase rate button (#14948 ) * Make last purchase rate button visible until submitted * Move buttons - Get last purchase rate and link to material request buttons moved to toolbar under Tools button * Remove disable fetch last rate functionality * Make last purchase rate field read_only	2018-07-18 12:27:27 +05:30
Shreya Shah	9baa3bef8b	[Portal] Display issues raised by all users of a customer (#14947 ) * Display issues raised by all users of a customer * Fixed as per review	2018-07-18 12:25:38 +05:30
Faris Ansari	9e874af9ba	Query report print (#14935 ) * QueryReport - Only print visible columns in report - Use get_columns_for_print method instead of directly accessing report.columns * Query Report - Replace frappe.query_report_filters_by_name with new API	2018-07-18 09:28:44 +05:30
Charles-Henri Decultot	9d09343e57	Gocardless improvement and payment request correction	2018-07-17 16:15:30 +00:00
Rushabh Mehta	69fa808def	[minor] fixes + patch (#14937 )	2018-07-17 18:22:51 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874 ) * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
rohitwaghchaure	6863b03790	Naming series increase even if there is an exception while saving the invoice from the backend (#14938 )	2018-07-17 17:20:15 +05:30
rohitwaghchaure	a76067eea1	[Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order (#14899 ) * [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order * Added test cases	2018-07-17 16:50:50 +05:30
Saurabh	af479c8192	set valid delivery date (#14890 ) * set valid delivery date * calculate delivery date based on diffrence in transation date and delivery date of ref doc	2018-07-17 16:49:32 +05:30
rohitwaghchaure	216f9373c9	Provision to select the cost center in the asset (#14934 )	2018-07-17 16:47:51 +05:30
Shreya Shah	663b435919	Update modified time to fix patch (#14931 )	2018-07-17 16:47:18 +05:30
Saurabh	e78a877202	patch fixes (#14936 )	2018-07-17 16:38:11 +05:30
Nabin Hait	1e693fe6c9	Replaced spaces with tabs	2018-07-17 16:08:39 +05:30
Nabin Hait	26786bd35d	minor route fix for general ledger	2018-07-17 15:59:15 +05:30
rohitwaghchaure	5fe88ea93e	[Fix] Not able to update the current value of the prefixes which are defined in the autoname field (#14918 )	2018-07-17 12:45:25 +05:30
Shreya Shah	fbeab5bf73	Show opening balance of leaves (#14925 ) * Show opening balance of leaves * Update employee_leave_balance.py	2018-07-17 11:59:51 +05:30
Ameya Shenoy	8ba1310915	[fix] Location test (#14921 )	2018-07-17 11:57:49 +05:30
Zarrar	fc0a5833a5	run set query if doctype exist (#14929 )	2018-07-17 11:57:06 +05:30
Suraj Shetty	a6f984366a	Fix typo	2018-07-16 18:39:01 +05:30
Zarrar	26c9b94cc6	[ Improv ] Loyalty Program more fixes and test case (#14888 ) * remove console statements * set account & cost center for redemption * add test case for single/multi tier & is_return scenario * reset tier when changing loyalty program * make loyalty fields non copy type * fix test case - delete si after every test to avoid interference	2018-07-16 18:11:53 +05:30
rohitwaghchaure	a3e070bc6b	[Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914 )	2018-07-16 18:11:19 +05:30
Suraj Shetty	6dfc165193	Add patch to skip user perm check for doctype (#14873 ) * Add patch to skip user perm check for doctype Skip user permission check for doctypes where department link field was recently added * Remove new doctype entries * Skip doctypes if department field already exists (custom field) * Add patch to set department value based on employee * Update set_department_for_doctypes.py * Update skip_user_permission_check_for_department.py	2018-07-16 18:10:16 +05:30
Jamsheer	f926911399	[Enhance][Fix] Healthcare - DocType and Fields renaming (#14861 ) * Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot * Role name change * Rename DT - Physician Schedule to Practitioner Schedule * Rename DT - Physician Service Unit Schedule * Rename DT - Physician to Practitioner * Lab Test Template - field disabled in standard filter * Patient - customer creation fix * Rename DT - Consultation - Encounter * Patches.txt updated for rename doctypes and fields in Healthcare * Patch - Rename doctypes and fields in Healthcare Domain * Fix - Patch - rename_healthcare_doctype_and_fields * Vital Signs - New Fields - Abdomen, Tongue and Reflexes * Web Form - Patient - Personal Details * Rename DocType Physician to Healthcare Practitioner * Rename DocType Consultation to Patient Encounter * Web Form - Personal Details - Fix * Web Form - Personal Details - Codacy Fix * Healthcare patch run for all domain * Rename label Practitioner to Healthcare Practitioner * Rename Encounter to Patient Encounter	2018-07-16 18:08:53 +05:30
Ranjith Kurungadam	14e94f824e	fix - HRA India (#14911 )	2018-07-16 16:12:46 +05:30
Shreya Shah	ffd2254944	Make item defaults non-collapsible (#14908 )	2018-07-16 14:55:54 +05:30
Nabin Hait	656016b4e0	Reloaded location doctype in patch	2018-07-15 20:10:23 +05:30
rohitwaghchaure	526ab2ca30	[enhance] Allow transfer for manufacture in the BOM (#14891 ) * [enhance] Allow transfer for maufacture in the BOM * Added patch * Fix codacy * Fixed typo and added test cases	2018-07-15 20:04:41 +05:30
Zarrar	f579a2bd5d	[Minor] Fix Crop Cycle test record (#14901 ) * fix crop cycle test record * load crop cycle doc if not yet loaded * create test records for location * land unit -> location , update in patch for tree index	2018-07-15 20:04:24 +05:30
Charles-Henri Decultot	3fa3104dcc	Debug cleanup	2018-07-13 14:00:42 +00:00
Charles-Henri Decultot	c047bf88db	Rebase following Subscription corrections	2018-07-13 13:25:53 +00:00
Charles-Henri Decultot	7722b81c8e	Variable correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	a0b7236f66	Corrections following Saurabh's comments	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	90669a03b3	Test correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	da8b11fd12	Travis correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	8b3e841fbf	Travis correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	cde1f08af6	Review corrections	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	5a2ee41af3	Test correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	19a47c3e0a	Codacy corrections	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	bbed5d41ca	Remove remaining images	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	63e1dd5993	Remove doc	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	244b638fe3	Dev cleanup	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	a8d766f5f7	Remove payment plan reference	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	0134e13631	Subscription integration	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	f7ca908ea9	Corrections to Subscriptions	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	ba6f6d976d	Stripe integration corrections	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	a45ea63b5d	Codacy correction	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	6c2ad66522	Codacy corrections	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	a27673ecfe	Travis correction	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	79380c6a74	Travis correction	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	30da37fbb8	Move Stripe to ERPNext	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	e25d2ee66d	Update Stripe Documentation	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	6a40164dad	Payment Request modifications	2018-07-13 13:05:54 +00:00
Nabin Hait	03b597418a	Patch order fixed	2018-07-13 17:45:27 +05:30
Saurabh	3d825e5689	Subscription test and fixes (#14875 ) * Add dashboard on subscriber screen * Add Subscription and Subscription Plan to Account Dashboard * Fetch customer name while creating subscriber * [fix] add section for Subscription Period * minor fixes * optimization	2018-07-13 17:41:36 +05:30
rohitwaghchaure	3ffe89659a	[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879 )	2018-07-13 17:40:48 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +05:30
Alchez	df1eae8981	Merge the Land Unit doctype with the Location doctype (#14613 ) * Merge Land Unit with the Location doctype * Fix patch * [minor] modification to Location structure - Create a group node "All Land Units" and place all the land units under it - Remove "Linked Analysis" from location	2018-07-13 12:50:04 +05:30
Ameya Shenoy	5c3b69476d	shift to self-hosted frankfurter api (#14792 )	2018-07-13 12:46:07 +05:30
KanchanChauhan	09e680b4aa	[Fix] Should not get approvers for disabled Departments (#14868 )	2018-07-13 12:26:56 +05:30
Nabin Hait	da17ceea73	patch fixes	2018-07-13 12:04:06 +05:30
Ameya Shenoy	a559b0de5a	Role modifications for Shareholder (#14872 ) - Added roles: Accounts User, Accounts Manager, Sales Manager, Sales User, Sales Master Manager to Shareholder, Share Type and Share Transfer doctype	2018-07-13 11:34:19 +05:30
Saurabh	b6d5f1fea1	[fix] add staging version (#14871 )	2018-07-13 11:33:31 +05:30
rohitwaghchaure	2d84945839	[Fix] Stock reconciliation wrong difference amount calculation (#14893 )	2018-07-13 11:07:27 +05:30
Prateeksha Singh	0c51d40ad0	Merge pull request #14889 from pratu16x7/support-portal [fix][minor] search help alignment	2018-07-12 16:06:49 +05:30
Prateeksha Singh	4cc7957a2a	[fix][minor] search help alignment	2018-07-12 16:05:57 +05:30
Shreya Shah	8dc4c945dc	Fix UX (#14862 )	2018-07-11 14:36:49 +05:30
Zarrar	5899d98077	[ Major ] Loyalty Program Fixes (#14863 ) * fix checking of customer_group & territory of customer in loyalty program * fetch and set applicable loyalty program - in customer.py if found 1 program, set it or show a message to set it manually - in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options * removed disabled field, added from_date & to_date * loyalty program section made collapsible, added redeem check in it * setting loyalty program improvised, manual selection if multiple found * get_query added, amount calculation updated * args passed rectified for expiry_date * get loyalty_points logic improv, redemption_details logic added * improv based on from/to date and other rectification * code rectified based on different scenarios - is_return, cancel, make loyalty points entry improv	2018-07-11 14:35:43 +05:30
Zarrar	9a3b785a03	[Minor] Employee Separation Fix (#14867 ) * delete associated task & project forcefully in Employee Seapration cancel trigger * remove leftover print statement * remove console statements	2018-07-11 14:34:55 +05:30
Saurabh	e8345f9ae0	add key to trace beta version (#14859 )	2018-07-10 19:05:38 +05:30
rohitwaghchaure	cc9c7d5e2a	[Fix] GSTIN not displaying in the address print (#14855 ) * [Fix] GSTIN not displaying in the address print * Made changes in the patch and set Patch as False * Update update_address_template_for_india.py	2018-07-10 15:41:42 +05:30
Alchez	9155e40bc7	[Fix] Set default CF in case none exist (#14829 )	2018-07-09 16:57:42 +05:30
Frappe PR Bot	b48c769588	[Translation] Updated Translations (#14849 )	2018-07-09 16:56:49 +05:30
rohitwaghchaure	07d0e9a2b2	Don't show disabled items in the stock balance report (#14851 )	2018-07-09 16:56:41 +05:30
Saurabh	db7324890f	Merge branch 'master' into develop	2018-07-09 15:53:51 +05:30
Saurabh	07bb1811af	bumped to version 10.1.42	2018-07-09 16:23:50 +06:00
rohitwaghchaure	f07462860b	Merge pull request #14846 from shreyashah115/fix-digest Filter out pending orders based on company	2018-07-09 14:48:13 +05:30
Ranjith Kurungadam	ea089d67ce	Employee Benefit Application - fix (#14837 )	2018-07-09 14:01:18 +05:30
rohitwaghchaure	720b06495c	[Fix] Not able to save project (#14848 )	2018-07-09 13:57:16 +05:30
Shreya	83ad646af4	Filter out pending orders based on company	2018-07-09 12:14:03 +05:30
rohitwaghchaure	8179bcbabd	[Fix] Code cleanup (#14843 )	2018-07-09 09:29:40 +05:30
rohitwaghchaure	e4a53f961a	[Fix] Unable to print Salary Register (#14844 )	2018-07-09 09:28:56 +05:30
rohitwaghchaure	6be8bea934	Provision to view return entries in Sales Person-wise Transaction Summary (#14830 )	2018-07-08 19:25:13 +05:30
Shreya Shah	21d3352aa2	Merge pull request #14835 from shreyashah115/print-hide Print hide loyalty program related fields	2018-07-06 18:36:47 +05:30
Zarrar	8111705f82	Merge pull request #14833 from Zlash65/min-ac-fix [Minor] Change field name in Accounts utils	2018-07-06 18:24:55 +05:30
Shreya	9bcb959f81	Print hide loyalty program related fields	2018-07-06 18:17:02 +05:30
Shreya Shah	c8c17ff5cf	Return if Item Defaults exist (#14834 )	2018-07-06 18:07:28 +05:30
Zlash65	1aeca1d349	change name that fetches numbered value from acc & cc	2018-07-06 17:15:33 +05:30
Zarrar	17705f932d	[ Minor ] Cost Center Number field added in field's dialog (#14781 ) * cost center number field when creating new added field in the tree's dialog, necessary changes in the autoname function * rename function's name appropriately	2018-07-06 14:44:44 +05:30
Alchez	8f2a0f3d79	[Fix] Incorrect assignment of Serial No in POS Invoice (#14772 ) * Fix incorrect assignment of serial no in Sales Invoice through POS * Add conversion factor to quantity check	2018-07-06 14:36:52 +05:30
Ranjith Kurungadam	6429ba9ed9	Payroll Entry - fix query, get assignment by end date (#14827 )	2018-07-06 13:30:40 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
Saurabh	778e06d0ee	bumped to version 10.1.41	2018-07-06 13:32:57 +06:00
rohitwaghchaure	3f5e80ebe3	Allow bulk edit for the sales invoice item (#14826 )	2018-07-06 12:39:04 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631 ) * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
rohitwaghchaure	ea943c6fe4	[Fix] Due date validate issue in the POS (#14825 )	2018-07-06 12:28:58 +05:30
Ranjith Kurungadam	5d134e0465	TDS Calculate tax for whole period on deduct checkboxes (#14824 ) * Tax Exemption Proof Submission - fields submission_date, exemption_amount * Salary Detail - field tax_on_flexible_benefit, tax_on_additional_salary * Salary Slip - save tax for benefit, additional salary in Salary Detail, recalculate tax for whole period on deduct checkboxes	2018-07-06 11:57:32 +05:30
rohitwaghchaure	839320dca5	[Fix] Original Invoice outstanding is not updating after making Debit Note (#14821 )	2018-07-06 10:42:15 +05:30
Andrew McLeod	686284261d	Added check to get_parent_item_groups; if called without an item group, return a default parents list of 'Home' only. (#14811 )	2018-07-06 10:41:37 +05:30
rohitwaghchaure	82a9fde921	Added compact print option for the material request (#14799 )	2018-07-06 10:40:51 +05:30
bobzz-zone	58236ffc1e	Update budget_variance_report.py (#14798 ) Make sure GL Entry only called once in each row	2018-07-06 10:39:00 +05:30
Saurabh	f403031449	[fix] Add Overdue status in Project Task	2018-07-05 19:38:59 +05:30
Rushabh Mehta	df23c7dc0c	[cleanup] bunch of UX fixes (#14787 ) * [cleanup] add dashboard to leave policy, employee form cleanup * [test] first_name in employee * [fix] tests * [fix] tests * [fix] tests * [hr] add more dashboards * [minor] fixes + ux	2018-07-05 15:19:28 +05:30
Rushabh Mehta	c1b430c8bd	[enhance] added priority to issue (#14815 )	2018-07-05 11:38:02 +05:30
Zarrar	a3f6856d81	python 3 fix for sorted (#14814 )	2018-07-05 10:37:39 +05:30
Nabin Hait	d4453aef68	Fixed permission issue	2018-07-04 16:38:10 +05:30
rohitwaghchaure	25f36489b3	Merge pull request #14805 from rohitwaghchaure/pos_ignore_pricing_issue_online [Fix] POS Profile ignore pricing rule not working for online pos	2018-07-04 16:26:48 +05:30
Rohit Waghchaure	5005e467a0	[Fix] POS Profile ignore pricing rule not working for online pos	2018-07-04 12:37:38 +05:30
Shreya Shah	430810f64c	Fix typo (#14802 )	2018-07-04 10:17:36 +05:30
Aditya Hase	69711d2df2	Remove a redundant for loop that uses dict.iteritems() instead of six.iteritems(dict) (#14803 ) This should also fix #13909 as a side effect.	2018-07-04 10:17:17 +05:30
Zarrar	68a148e293	half_day enable/disable check (#14795 )	2018-07-03 17:00:38 +05:30
rohitwaghchaure	205eae322b	[Fix] BOM replace timeout issue (#14782 )	2018-07-03 15:06:38 +05:30
Nabin Hait	24ee7e5eb1	Patch fix	2018-07-03 13:15:47 +05:30
Nabin Hait	9911309631	Patch fixes	2018-07-03 13:06:49 +05:30
Nabin Hait	f4660d2479	Ignore calculating tds if amount/formula is mentioned in salary structure	2018-07-03 13:06:49 +05:30
Ameya Shenoy	935f4a474b	Prevent creation of more than 500 item variants (#14790 )	2018-07-03 10:48:59 +05:30
Zarrar	c1225a84cc	fix css for coa dialog in setup wizard (#14793 )	2018-07-03 10:35:31 +05:30
Britlog	4412f10918	Add missing fields in select, the same as in get_product_list_for_group (#14789 )	2018-07-03 10:33:49 +05:30
Charles-Henri Decultot	6d97ab6f78	Make fields translatable (#14786 )	2018-07-03 10:32:53 +05:30
Shreya Shah	aa62a62bb0	Add VAT related fields after printing settings fields (#14773 )	2018-07-03 10:28:20 +05:30
Vishal Dhayagude	0e027a14a7	[minor] Link to Employee Separation template and Onbording template added in HR Module Page (#14748 ) * [minor] Link to Employee Separation template and Onbording template added in HR Module Page * [minor] Employee templated added in Employee Life Cycle Section	2018-07-03 10:20:02 +05:30
Shridhar Patil	4987c4ef53	on delete contact update issue (#14770 ) * on delete contact update isuue remove contact from issue if the deleted contact exists * moved issue update function to issue.py * Update formatting and comment	2018-07-03 10:10:04 +05:30
Suraj Shetty	27067b34e1	Rename (#14771 ) - Daily Work Summary Settings to Daily Work Summary Group in hr.py	2018-07-03 10:08:45 +05:30
Shreya Shah	93d60869ed	Fix patch (#14769 ) Income account instead of expense account	2018-07-03 10:07:32 +05:30
Ranjith Kurungadam	273e8e59ca	fix Salary Component (#14783 )	2018-07-03 10:05:01 +05:30
Pawan Mehta	e734b7c17b	Add filters to show Draft salary slips in salary register (#14780 ) * [fix] #14778 * replace if-elif block with inline block	2018-07-03 10:01:19 +05:30
Frappe PR Bot	1baa811a40	[Translation] Updated Translations (#14776 )	2018-07-03 09:59:57 +05:30
rohitwaghchaure	afe764264d	[Fix] Employee advance issues (#14750 )	2018-07-01 16:48:00 +05:30
Charles-Henri Decultot	f02bef78f0	FEC report corrections (#14741 ) * Report corrections to match government requirements * Untranslatable headers * Remove unused onchange logic	2018-07-01 16:46:48 +05:30
Zarrar	dfe897b888	[ Fix ] UOM Conversion fix (#14768 ) * increase precision for conversion value * inverse the conversion data * update uom data * rectify conversion logic according to inversion of values * rectify test case for uom conversion * patch improv to correct conversion data	2018-07-01 16:45:53 +05:30
Ranjith Kurungadam	4dc5721ba5	fix - Benefit Application query (#14767 )	2018-07-01 16:44:37 +05:30
Mohammed R Abukhamseen	8662a4f677	POS - Translate some text & numpad (#14765 ) * make label & placeholder translatable * numpad translatable * Update point_of_sale.js remove debugger	2018-07-01 16:44:09 +05:30
Nabin Hait	e3daaa63f0	Payroll fixes (#14758 ) * Ignore calculating tds if amount/formula is mentioned in salary structure * [fix] Paid amount in Journal Entry from Payroll Entry * fix codacy	2018-07-01 16:43:34 +05:30
Ranjith Kurungadam	b1a756cc9f	HRA Indian regional - field basic in company, calc changes (#14757 )	2018-07-01 16:42:38 +05:30
rohitwaghchaure	1501a6e58e	[Fix] Data missing issue in stock ledger report (#14755 )	2018-07-01 16:42:00 +05:30
rohitwaghchaure	01fe4a3726	[Fix] Consider the cancelled purchase receipt in backflush raw materials (#14753 )	2018-07-01 16:41:39 +05:30
Ranjith	69b03a3b53	fix typo	2018-06-29 20:14:20 +05:30
rohitwaghchaure	c5183b7c2a	Merge pull request #14756 from rohitwaghchaure/fix_patch_for_set_salary_component_properties [Fix] Patch	2018-06-29 19:02:38 +05:30
Rohit Waghchaure	4178030c99	[Fix] Patch	2018-06-29 17:54:25 +05:30
Ranjith Kurungadam	fd7ef2e15c	Salary Component - field display, value dependency (#14747 )	2018-06-29 16:53:56 +05:30
Ranjith Kurungadam	b402ccc0b5	Payroll Entry - make only one JE, separate JE for Flexi (#14752 )	2018-06-29 16:48:49 +05:30
Nabin Hait	b192a4af77	reload doc in patch	2018-06-29 15:30:41 +05:30
Nabin Hait	6e86fb2540	Set user permissions for new departments based on company	2018-06-29 14:36:45 +05:30
Nabin Hait	c114ceb67d	Set salary component properties in existing components and salary structures	2018-06-29 14:36:45 +05:30
Manas Solanki	ee32a78e9f	Update bom_stock_calculated.py	2018-06-29 13:33:32 +05:30
Nabin Hait	104f62090d	Add filters for cost center in Budget Variance report	2018-06-29 12:25:03 +05:30
Himanshu Mishra	7aabef2026	Add configurable frequency in Selling Settings for update of project … (#14670 ) * Add configurable frequency in Selling Settings for update of project and company * remove redundant code * remove redundant code, only trigger calculation if order/invoice is present * removed dangling commas as per common convention in hooks * fix:handling multiple documents * Update selling_settings.json	2018-06-28 23:43:23 +05:30
Nabin Hait	d0c6184e24	minor patch fixes	2018-06-28 23:42:55 +05:30
rohitwaghchaure	191876f51b	[Fix] Bank Account mandatory (#14734 )	2018-06-28 23:28:58 +05:30
Ranjith Kurungadam	a10f118ddd	Payroll Entry - Validate Attendance (#14738 )	2018-06-28 23:28:07 +05:30
Nabin Hait	7324815fdb	map payment terms template from SO to SI	2018-06-28 23:12:02 +05:30
Charles-Henri Decultot	52fb43fc4f	Add no copy to payment terms template (#14725 )	2018-06-28 23:06:30 +05:30
Charles-Henri Decultot	97fa94e77d	Journal and Entry number correction (#14720 )	2018-06-28 23:05:58 +05:30
Cadmandata	d673afccf2	Updated comment in make_stock_entry() function (#14726 ) Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.	2018-06-28 23:05:32 +05:30
Ranjith Kurungadam	f6e654eccc	Payroll Entry - fix deduct taxes (#14730 )	2018-06-28 23:04:51 +05:30
rohitwaghchaure	cae945e743	Added validation and fixes UX for asset (#14727 )	2018-06-28 23:04:25 +05:30
Ranjith Kurungadam	6ceed038e6	Fix benefits (#14735 ) * Employee Benefit Application - fix typo * Employee Benefits - fix field renamed	2018-06-28 23:02:58 +05:30
Manas Solanki	3ff7f79cc7	Merge pull request #14740 from manassolanki/fix-20 [minor] fix for the args in the frm.call	2018-06-28 20:47:25 +05:30
Manas Solanki	89e7f8b387	[minor] fix for the args in the frm.call	2018-06-28 20:44:53 +05:30
Rohit Waghchaure	ed71c36748	[Fix] Not able to save subcontracted purchase receipt	2018-06-28 18:36:35 +05:30
Ranjith Kurungadam	b66bde32f8	Payroll Entry - fix only one employee fetched (#14718 )	2018-06-28 14:40:29 +05:30
Charles-Henri Decultot	8b22310d66	Allow auto repeat update (#14706 ) * Allow auto repeat update * Allow auto-repeat reference update	2018-06-28 14:27:58 +05:30
Zarrar	254ce645b1	[ Enhance ] Setup Wizard - Chart of Accounts (#14698 ) * enable selection of coa for user Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart * read chart from file and make a tree render-able dict of it * tree method to return node data for coa setup wizard	2018-06-28 14:15:34 +05:30
Shreya Shah	2fbc8509f5	Fix error message (#14716 )	2018-06-28 14:14:28 +05:30
Pawan Mehta	c7897e491d	[fix] #14714 (#14715 )	2018-06-28 14:13:56 +05:30
KanchanChauhan	168e66b107	Blanket Order translation fix for DE (#14711 )	2018-06-28 14:13:24 +05:30
rohitwaghchaure	e27b85de4f	Added test cases for Overproduction against Work Order / Sales Order (#14704 )	2018-06-28 12:48:28 +05:30
rohitwaghchaure	4c23be1821	Added test cases for subcontract (#14702 )	2018-06-28 11:18:37 +05:30
Prateeksha Singh	5d227c9028	Revert "[hub] add link in modules"	2018-06-28 09:59:46 +05:30
Prateeksha Singh	84d358bd0a	Merge pull request #14708 from pratu16x7/hub-fixes [hub] add link in modules	2018-06-28 03:23:03 +05:30
Prateeksha Singh	2e0b5140e7	[hub] add link in modules	2018-06-28 03:17:39 +05:30
Manas Solanki	4933e6bfeb	Update test_finance_book.py (#14703 )	2018-06-27 17:30:09 +05:30
Ranjith Kurungadam	23e235395e	Salary Slip - remove check query limited to one (#14699 )	2018-06-27 17:29:40 +05:30
Shreya Shah	f2f54e741b	Merge pull request #14701 from shreyashah115/testing-1 [minor] Blanket order	2018-06-27 16:00:02 +05:30
Shreya	32b57da335	Make supplier_name and customer_name fields read only	2018-06-27 15:20:33 +05:30
Shreya	18bed504dc	Set target qty 0 If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.	2018-06-27 15:14:43 +05:30
Manas Solanki	b912374b96	[test] check the finance book via the journal entry	2018-06-27 15:07:15 +05:30
rohitwaghchaure	67d87e29e3	[Fix] Wrong rate calculation in Itemwise sales register report for multi uom (#14690 )	2018-06-27 11:22:03 +05:30
Ranjith Kurungadam	53cdbe960e	Salary Slip - fix query (#14693 )	2018-06-27 11:15:39 +05:30
Jamsheer	86aed90a5c	[Fix] - Get payroll period days (#14686 ) * Fix - get_payroll_period_days * Fix - get_payroll_period_days	2018-06-27 11:13:20 +05:30
Deepak kumar	55cf6c5f7e	Membership (#14688 ) * Correct the label and field name * Update membership.json	2018-06-27 09:17:33 +05:30
rohitwaghchaure	f3cf15fa0d	[Fix] While saving project getting timeout error (#14672 )	2018-06-26 17:06:00 +05:30
Nabin Hait	e2a8120ef8	ignore user permissions for some fields	2018-06-26 15:27:34 +05:30
Prateeksha Singh	34aeefc0a1	[fix] yet another python attribute fetch	2018-06-26 12:18:29 +05:30
Manas Solanki	7707cee6b7	Merge pull request #14676 from KanchanChauhan/allow-only-submitted-bo Allow only submitted Blanket Order in PO/SO	2018-06-26 11:46:23 +05:30
Manas Solanki	860e169081	Update sales_order.js	2018-06-26 11:45:04 +05:30
Manas Solanki	0ebd0f0d62	Update purchase_order.js	2018-06-26 11:44:29 +05:30
Kanchan Chauhan	bddebb52d6	Allow only submitted Blanket Order in PO/SO	2018-06-26 09:31:27 +05:30
Rushabh Mehta	096b943b0c	[minor] fixes to moment.defaultDateFormat and daily work summary eplies	2018-06-25 22:38:20 +05:30
Frappe PR Bot	5c13cb3221	[Translation] Updated Translations (#14669 )	2018-06-25 15:08:15 +05:30
mnaim-cloude8	56e4346ead	To fixed if if no schedule and disposal is NOT within the period. (#14637 ) * To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included. If no schedule, and disposal is within period, accumulated dep is the amount eliminated. * Update asset_depreciations_and_balances.py	2018-06-25 15:05:26 +05:30
Jamsheer	4f8deb92cc	[Fix] - Leave Perid - Grant Allocations (#14668 ) * Leave Perid - Grant Allocations - Fix * Codacy - string statement has no effect	2018-06-25 14:49:54 +05:30
Shreya Shah	d8031d1a53	Clear child table before appending (#14648 )	2018-06-25 10:34:55 +05:30
rohitwaghchaure	34c187706d	[Enhance] Added Budget exception approver role in company (#14645 ) * [Enhance] Added Budget exception approver role in company * Added test cases for budget	2018-06-25 10:31:08 +05:30
Ranjith Kurungadam	b4ad3c3f77	Salary Structure Assignment - remove to_date (#14642 ) * Salary Structure Assignment - remove to_date * fix Salary Assignment - remove to_date * Salary Slip - fix codacy remove sting based query, add end_date to condition	2018-06-25 10:29:54 +05:30
Jamsheer	8044d09d50	[Enhance] Refactor (#14647 ) * Payroll Entry - Make Bank Entry button routes to Journal Entry list view * Salary Component - additional component and flexi not comes in same component * Salary Structure - refactor validation messages	2018-06-25 10:29:06 +05:30
rohitwaghchaure	3a595d07d0	[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649 ) * [Fix] POS Closing Voucher, on save collected amount becomes zero * Added test cases for the POS Closing Voucher	2018-06-25 10:10:29 +05:30
Jamsheer	648728f330	Fix - depends on lwp - employee benefit (#14644 )	2018-06-22 17:28:29 +05:30
Jamsheer	b64161a389	Employee benefit - Last payroll period benefit (#14634 ) * Employee benefit - Last payroll period benefit * Method name refactor	2018-06-22 17:27:54 +05:30
Sushant Nadkar	00f0f0f5fc	Added adational filters to Tax Rule doctype (#14639 )	2018-06-22 15:57:19 +05:30
Shreya Shah	5b64e98c5b	Fetch company on employee selection (#14633 )	2018-06-22 15:41:57 +05:30
rohitwaghchaure	d3fb0fbb20	Added test cases for asset accounting, asset value adjustment (#14572 ) * Added test cases for asset accounting, asset value adjustment * Accounting entry for the asset created manually * Added asset movement test cases and validation * Added validation to make asset from purchase receupt, invoice only	2018-06-22 15:40:59 +05:30
Ranjith Kurungadam	ce26610d39	Fix tax calculation (#14635 ) * Salary Detail - field is_additional_component * TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax * fix indentation	2018-06-22 15:39:49 +05:30
Ameya Shenoy	4e96f55eff	Merge branch 'master' into develop	2018-06-22 05:10:29 +00:00
Ameya Shenoy	774f676a25	bumped to version 10.1.40	2018-06-22 05:10:27 +00:00
Prateeksha Singh	c92bbcb9fa	Merge pull request #14629 from pratu16x7/css-fixes [portal] fix item-preview column #13077	2018-06-21 22:47:41 +05:30
Prateeksha Singh	9a138f07f7	[portal] fix item-preview column #13077	2018-06-21 22:42:03 +05:30
Nabin Hait	3ebc15cc8f	test fixes	2018-06-21 17:55:32 +05:30
Nabin Hait	e5b3a56cea	Test case fixes	2018-06-21 15:21:17 +05:30
Zlash65	4cf46edabc	expense_claim related fix in payment entry outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added	2018-06-21 15:18:13 +05:30
rohitwaghchaure	ae276bcaa1	Don't allow to sale asset item from POS (#14623 )	2018-06-21 13:18:01 +05:30
Shreya Shah	c8a40f3ef0	[Tests] Employee Onboarding & Separation (#14606 ) * Set query on department * Add test for Employee Onboarding * Add fetch for Employee Separation fields * Add test for Employee Separation * Fix Staffing Plan test case	2018-06-21 13:06:47 +05:30
Sachin Mane	19a5a5dcf4	improve performance of stock_value retrieval using tabBin instead of … (#14584 ) * improve performance of stock_value retrieval using tabBin instead of stock ledger * rename fn * rename fn * Update warehouse.py	2018-06-21 13:01:48 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604 ) * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
rohitwaghchaure	4d80c05125	[Fix] Deferred account must be liability account (#14612 )	2018-06-21 11:55:49 +05:30
Shreya Shah	22bb61b58c	Merge pull request #14608 from shreyashah115/fix-onboard [Enhance] Employee Onboarding & Separation	2018-06-21 11:51:39 +05:30
Jamsheer	f76dbbae68	Compensatory Leave Request (#14611 ) * Compensatory Leave Request - Validate Holidays and Attendance * Compensatory Leave Request - Cancel * Half Day in Compensatory Leave Request * Leave allocation on Compensatory Leave Request - Fix * Unused import	2018-06-21 11:38:38 +05:30
Nabin Hait	227489193b	Test case fixes	2018-06-21 11:36:13 +05:30
umaepoch	0484547150	BOM Stock Calculation Report (#14561 ) * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * Update bom_stock_calculated.json	2018-06-21 11:27:54 +05:30
Zarrar	e25dcd2737	[Minor] Report related fixes (#14620 ) * fix in query incase list is empty * periodicity not found error when called from consolidated financial statements and custom cash flow is activated * unset currency filter to apply default currency or so * python 2 - 3 fix	2018-06-21 10:53:12 +05:30
Siddhi Sawant	51e4d641c8	Job Applicant Source (#14543 ) * New doctype - Job Applicant Source * Source and source name field in job applicant * Updated install_fixtures with default options * Update install_fixtures.py * Fixes codacy	2018-06-21 10:47:54 +05:30
Frappe PR Bot	748c0240db	[Translation] Updated Translations (#14615 )	2018-06-21 10:34:28 +05:30
Charles-Henri Decultot	fc2292f08c	Email alert renamed to Notification (#14618 )	2018-06-21 09:17:52 +05:30
Nabin Hait	3946b77555	changed fieldname of inventory section break in Item	2018-06-20 22:33:34 +05:30
Shreya Shah	b125ba9ed8	Update status if tasks have been completed (#14601 )	2018-06-20 17:52:21 +05:30
Manas Solanki	616a6d2bc2	Test leave management (#14587 ) * test max allowed days in leave policy * test the leave period * test leave encashment	2018-06-20 17:47:45 +05:30
Suraj Shetty	be3ce16352	Daily work summary reply report (#14583 ) * Add daily work summary reply report * Show user name instead of email * Remove print statement * Change field datatype * ReRun Travis	2018-06-20 17:46:03 +05:30
Nabin Hait	7aae0e66df	minor fix	2018-06-20 17:45:39 +05:30
Bassam Ramadan	45725c2c7b	add missing brand filter to stock balance report (#14597 ) add missing brand filter to stock balance report	2018-06-20 17:41:29 +05:30
Shreya	3fd21d4273	Fix codacy	2018-06-20 16:09:16 +05:30
Shreya	5c6ade4bd8	Update and set status on the basis of project completion	2018-06-20 15:55:27 +05:30
Shreya	a5afd96019	Employee Onboarding and Separation lists	2018-06-20 15:55:14 +05:30
Saurabh	59798b4e88	resolved merge conflict	2018-06-20 15:23:25 +05:30
Saurabh	98b7bb5679	bumped to version 10.1.39	2018-06-20 15:51:40 +06:00
Zarrar	99017b173d	naming for asset maintenance task should be task name (#14607 )	2018-06-20 14:53:13 +05:30
Ranjith Kurungadam	c1030a3958	fix - Employee Transfer, Promotion (#14603 )	2018-06-20 12:42:58 +05:30
Jamsheer	a1bb94e59d	Pro-rata component consistency for monthly Salary slip (#14595 ) * Pro-rata component consistency for monthly Salary slip * Resolve merge conflict	2018-06-20 12:41:32 +05:30
Ranjith Kurungadam	05d00397d0	Update tax calculation (#14564 ) * Tax Slab remove to_amt mandatory, condition data type Code * Salary Slip - consider condition in tax slab * Payroll Period - help text for tax slab condition	2018-06-20 12:33:02 +05:30
Ranjith Kurungadam	4f9744a56d	HRA fix (#14589 ) * hra - fix var ref before assignment * Tax Exemption Category - remove deduction component	2018-06-20 11:10:56 +05:30
Jamsheer	55a2f4da71	Employee Benefit (#14571 ) * Rename - filed is_pro_rata_applicable to pay_against_benefit_claim * Employee Benefit Application - Validate previous benefit claim * Employee Benefit Claim - Code refactor * Salary Slip - additional salary - fix	2018-06-20 11:04:21 +05:30
Jamsheer	c526cad183	[Fix] Additional Salary Component and tax calculation (#14581 ) * Additional salary not include in tax calculation * Additional salary get doubled in salary slip via Payroll Entry - Fix * Salary Component - if is_additional_component hide flexi	2018-06-20 10:52:20 +05:30
Shreya Shah	222c550c29	Parse left out time (#14586 )	2018-06-20 10:51:32 +05:30
Shreya Shah	0cb0c0b642	[Tests] Staffing Plan (#14585 ) * Add test case for Staffing Plan * Fix codacy	2018-06-20 10:50:54 +05:30
Zarrar	42f2d1a7a8	fix incase no customer fetched (#14596 )	2018-06-20 10:50:11 +05:30
Ranjith Kurungadam	f972e7b259	Staffing Plan - remove department filter, query by dates (#14590 )	2018-06-20 10:48:40 +05:30
rohitwaghchaure	fd5ac45775	[Fix] Not able to make invoice in the subscription (#14594 )	2018-06-20 10:47:55 +05:30
Nabin Hait	a125a6199c	Allowed paid amount against debit/credit note	2018-06-19 12:07:02 +05:30
Shreya Shah	b0575265fb	Test case for Attendance Request (#14566 ) * Add test case for Attendance Request * Add a message if attendance not submitted * Add test for cancelled document	2018-06-19 10:47:40 +05:30
Shreya Shah	97124e92fa	[Fixes] Tax withholding category and Bank Guarantee (#14576 ) * Fetch withheld percentage * Set query for accounts on the basis of company * Fix bank guarantee error on submit * Remove errors caused by fields which are removed	2018-06-19 10:46:41 +05:30
Zarrar	ba1cdc6c57	fix opening invoice related authorization control - item=None (#14567 )	2018-06-19 10:45:47 +05:30
Shreya Shah	cbff30f718	[Tests] Shift Planning (#14570 ) * Cancel shift assignment on cancellation of shift request * [minor] Fix shift type test * Modify test for shift request * Add test case for shift assignment * Fix syntax * Fix codacy	2018-06-19 10:45:33 +05:30
asbasawaraj	b0fafa9774	Additional fields in Certified Consultant DocType (#14573 )	2018-06-19 10:43:55 +05:30
Shreya Shah	77de8dc102	Change Restaurant icon type to module (#14578 )	2018-06-19 10:43:08 +05:30
Nabin Hait	875c941f3d	fixes in setting itemised tax breakup	2018-06-18 17:41:27 +05:30
Nabin Hait	8eeb5694ba	Fixed qty in item-wise sales history report	2018-06-18 17:41:27 +05:30
Nabin Hait	0bef91c241	minor fix in item type validation	2018-06-18 17:41:27 +05:30
Nabin Hait	ae02209b6a	Removed autoname of child table	2018-06-18 17:41:27 +05:30
Shreya Shah	5c3929c5ea	Fix positioning of fields (#14562 )	2018-06-18 15:49:59 +05:30
Zarrar	e0adb6bbd6	cost_center overridden by company's default fix in SI (#14560 )	2018-06-18 15:49:12 +05:30
Shreya Shah	1ac5585151	Bug - Add batch while creating serial nos (#14559 )	2018-06-18 15:44:10 +05:30
Ranjith Kurungadam	5f7c7bfc78	remove patch to add hra fields (#14552 )	2018-06-18 15:43:45 +05:30
Ranjith Kurungadam	6cca03195f	fix- Salary Structure filter (#14558 )	2018-06-18 15:42:38 +05:30
Ranjith Kurungadam	28f49a5a8e	fix - link validation error (#14547 )	2018-06-18 10:40:23 +05:30
Zarrar	80ff296e97	data not filled in acc. receivable report for some field fix (#14546 )	2018-06-17 11:21:10 +05:30
Manas Solanki	efa191c72e	[minor fix] change the unicode/str to the datetime obejct (#14534 )	2018-06-15 18:04:12 +05:30
rohitwaghchaure	83a2612a18	[Fix] Consolidated Financial Statement report (#14537 )	2018-06-15 18:03:50 +05:30
rohitwaghchaure	77a45b43aa	Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535 )	2018-06-15 18:03:31 +05:30
Shreya Shah	27eff99190	[minor] Fixes for Exchange rate revaluation doctype (#14533 ) * Add set query for account and party_type * Fix asset category error	2018-06-15 16:30:15 +05:30
Shreya Shah	5f855d5da4	Add test case for Inter company Journal Entry (#14531 )	2018-06-15 15:33:21 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
Ameya Shenoy	ed77429496	bumped to version 10.1.38	2018-06-15 09:29:56 +00:00
Nabin Hait	380a74732c	salary structure related test case fixes	2018-06-15 14:42:12 +05:30
Nabin Hait	2f89a04511	create user permissions on save of employee	2018-06-15 13:16:44 +05:30
rohitwaghchaure	e647c1f3cb	Renamed asset adjustment to asset value adjustment (#14532 )	2018-06-15 13:06:28 +05:30
Nabin Hait	fcaeea70d2	Update employee.py	2018-06-15 12:47:45 +05:30
Nabin Hait	5bc533f65d	Test case fixes	2018-06-15 11:59:58 +05:30
asbasawaraj	4c263480c9	Certfication Application Doctype and webform,Certfied Consultant DocType (#14528 )	2018-06-15 10:04:19 +05:30
Ranjith Kurungadam	0e5c8283fa	Salary Slip - update period factor for tax calc (#14527 )	2018-06-15 10:03:57 +05:30
Nabin Hait	2737b08f0f	blanket order related fixes	2018-06-14 18:07:34 +05:30
Shreya Shah	0b9b8d6826	Remove unused code (#14526 )	2018-06-14 17:57:39 +05:30
Shreya Shah	02575d1f2c	Merge pull request #14205 from Alchez/frappe-contract [Feature] Managing Contracts in ERPNext	2018-06-14 17:57:02 +05:30
Ranjith Kurungadam	a8e047afc8	HRA tax exemption Indian regional (#14520 ) * remove HRA fields fom declaration, proof submission * HRA fields, methods India regional * Company - remove Payroll Settings * HRA India regional, override methods * Patch to add HRA fields for India	2018-06-14 17:56:16 +05:30
Manas Solanki	c7afbea708	Update bom.py (#14524 )	2018-06-14 17:30:26 +05:30
Nabin Hait	d1f40ad0b6	minor fix	2018-06-14 17:09:55 +05:30
Shreya	cdd3982b44	[minor] Fix	2018-06-14 16:43:47 +05:30
Shreya	f333536446	Remove test_records.json and modify test	2018-06-14 16:43:07 +05:30
Nabin Hait	44341c1637	removed blanket order docs	2018-06-14 15:58:41 +05:30
Nabin Hait	b2d3c0f040	Update ordered qty in blanket order	2018-06-14 15:56:29 +05:30
Manas Solanki	9a31dd7062	test + documentation	2018-06-14 15:56:29 +05:30
Manas Solanki	2df1b31707	[minor] minor fixes along with the codacy	2018-06-14 15:55:38 +05:30
Manas Solanki	e5e87f7137	[feature] Blanket Order - Creaete Sales or Purchase order from the blanket order - If there is any blanket order for the customer/supplier rates will be fetched from that order - Manually selecting the Blanket order will change the rates accordingly - Upon submission of the order, the ordered qty will be updated in the Blanket Order	2018-06-14 15:55:38 +05:30
Manas Solanki	2fb63e1724	init the blanket order	2018-06-14 15:55:37 +05:30
Rushabh Mehta	1198d94904	[rename] Email Alert -> Notification	2018-06-14 13:18:21 +05:30
Shreya Shah	c3d1353ab5	Merge pull request #14518 from shreyashah115/patch-fix Check if table exists else return	2018-06-14 13:08:49 +05:30
Shreya	df385ac3c0	Check if table exists else return	2018-06-14 13:07:52 +05:30
Zarrar	14a9c0706b	Merge pull request #14461 from mntechnique/sales_partner_type Partner Type as Link field added in Sales Partner	2018-06-14 12:48:24 +05:30
Zarrar	6ffdf94003	[Fixes] Defaults and User-Permission based fixes in treeview (#14501 ) * utility function added for treeview function to distinguish defaults from user permission and return appropriate data * make use of utility function for treeview	2018-06-14 12:24:16 +05:30
Shreya Shah	06ef4270f2	Merge pull request #14447 from zerodhatech/loan_application [Enhancement] toggle required fields on select of repayment option in loan application	2018-06-14 12:05:46 +05:30
Jamsheer	c7743932ab	[Fix] HR Fixes (#14511 ) * Payroll Entry - fix in db query * Salary Structure Assignment - Company read_only = 1 * Fixes in hr util and benefit claim * Employee Benefit Application - Late application - fix	2018-06-14 11:55:17 +05:30
Zarrar	17089eeac3	[Minor] Fetching and appending items in Stock Reconciliation fix (#14509 ) * minor fix in get_list of items in stock reconciliation * reload doc fails because of backdated modified date * item and item defaults should load prior to shopify refactor * attribute value should't be none or empty, could be zero though * Update item.py	2018-06-14 11:54:18 +05:30
Shreya Shah	dd8fba6783	Do not check for batch on cancellation (#14506 )	2018-06-14 11:49:45 +05:30
Saurabh	8e74df09a4	[fix] On deletion of salary slip decrease the series count (#14508 )	2018-06-14 11:47:21 +05:30
Rushabh Mehta	0d19744b17	[fix] for notification	2018-06-14 09:23:32 +05:30
IOWEB TECHNOLOGIES	62805e2101	Fix unicode literal issue that prevents payment entries to be created (#14515 )	2018-06-14 09:14:07 +05:30
rohitwaghchaure	fb997d6539	[Fix] Woocommerce test cases (#14513 )	2018-06-14 09:13:39 +05:30
Prateeksha Singh	0738483343	[docs] remove docs folder 💥, update docs app to foundation (#14516 )	2018-06-14 09:11:05 +05:30
Manas Solanki	687c6bb002	Merge pull request #14510 from rohitwaghchaure/test_cases_for_material_consumption [Fix] Travis for the test case test_material_consumption	2018-06-13 18:41:12 +05:30
Rohit Waghchaure	80d4477d1e	[Fix] Travis for test_material_consumption	2018-06-13 18:37:03 +05:30
Shreya Shah	a2056a39bd	Fix patch (#14503 ) * Modify patch to move leave approvers from Employee master to Department master * Rename child table names - Rename leave approver to leave approvers - Rename expense approver to expense approvers * Import cstr * Fix a condition	2018-06-13 17:11:17 +05:30
Manas Solanki	aa17294979	Update utils.py	2018-06-13 16:47:41 +05:30
Shreya Shah	3d73a6f7f2	Fetch details from Journal Entry in Accounts Payable report (#14495 ) * Fetch bill_no, bill_date from Journal Entry * Fix as per suggestion * Fetch details only if bill_no exists	2018-06-13 16:33:06 +05:30
FinByz Tech Pvt. Ltd	46c8ccc6a8	Fix conflict for taxable value having same item in GSTR-1 Report (#14492 ) * Update gstr_1.py Merge conflict for taxable value having same item * Update gstr_1.py * Minor Fix * Update gstr_1.py	2018-06-13 15:34:17 +05:30
Jamsheer	30f37b2eb1	Payroll Entry - Separate JE for flexi salary component (#14502 ) * Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry * Journal Entry - validate cheque info on submit * Payroll Entry - Make Bamk Entry - Separate JE for benefit component	2018-06-13 15:29:38 +05:30
Jamsheer	cc25eb00b5	Employee benefit application depends on lwp (#14494 ) * Employee benefit - pro-rata amount - depends on lwp and working days * HR Util - get holidays for employee * Employee Benefit Application - calculate remainig on max benefit * Employee benefit - late application - depends on lwp * missing semicolon	2018-06-13 15:14:24 +05:30
rohitwaghchaure	93e8bbac84	[Fix] Travis for employee_tax_exemption_declaration (#14500 )	2018-06-13 15:12:32 +05:30
Shreya Shah	4fe2a91b9f	Remove docstatus=1 to show pending leaves as well (#14498 )	2018-06-13 15:11:43 +05:30
Manas Solanki	9385cd5203	Merge pull request #14496 from rohitwaghchaure/stock_entry_test_cases [Fix] Travis for stock entry	2018-06-13 14:06:20 +05:30
Rohit Waghchaure	0eef3f665d	[Fix] Travis for stock entry	2018-06-13 13:06:25 +05:30
Manas Solanki	b12f0d90af	fix the timesheet	2018-06-13 12:30:02 +05:30
Jamsheer	f6d7b5d0c8	Salary slip - additional salary - deductions (#14476 )	2018-06-13 11:36:43 +05:30
Tom Price	32c984cd3c	Fix fields being hidden by default. (#14490 ) Modify the title property to be sensible for general usage, unique and translatable. Add allow_in_quick_entry properties appropriately.	2018-06-13 11:14:44 +05:30
Manas Solanki	176e7c5ce2	fix the test case for the payroll (#14480 ) * fix the test case for the payroll * fix the shopify and stock entry * more structured test cases for payroll	2018-06-13 11:13:01 +05:30
Prateeksha Singh	d1fffb6ba1	Merge pull request #14484 from pratu16x7/help-portal [help-portal] don't show issues to guest	2018-06-12 17:40:36 +05:30
Prateeksha Singh	8d58429b69	[help-portal] don't show issues to guest	2018-06-12 17:39:12 +05:30
Nabin Hait	76c51b3068	minor ux fix	2018-06-12 16:29:10 +05:30
deepak-mnt	b95f60c6f3	minor changes	2018-06-12 16:04:49 +05:30
Rohit Waghchaure	b6381c66d8	[Fix] Purchase receipt test cases	2018-06-12 13:54:40 +05:30
rohitwaghchaure	a6b346f827	Merge pull request #14475 from rohitwaghchaure/asset_test_cases_fixes [Fix] Test cases for asset	2018-06-12 12:21:11 +05:30
Rohit Waghchaure	f270567c45	[Fix] Test cases for asset	2018-06-12 12:20:52 +05:30
Ranjith Kurungadam	138e6abaff	Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof (#14428 )	2018-06-12 12:19:36 +05:30
Suraj Shetty	e06ecd2494	Check if user permission for employee exists (#14474 ) - Also check if user has permission to add user permission to avoid insufficient permission error while updating user profile	2018-06-12 12:06:41 +05:30
Jamsheer	8d66f1e45d	Employee benefit - Late employee benefit application (#14465 ) * HR Utils - get salary slip total benefit given for a payroll period * Late employee benefit application * Additional Salary - code refactor - get_amount * new line in salary detail json * Employee benefit late application - validation refactor * Codacy fix	2018-06-12 11:30:59 +05:30
rohitwaghchaure	2354c1eba3	Merge pull request #14467 from rohitwaghchaure/update_location_in_serial_no Code cleanup and fixes for the asset	2018-06-12 11:19:01 +05:30
Manas Solanki	65b55a53a6	Update test_leave_application.py	2018-06-12 11:18:01 +05:30
Rohit Waghchaure	ec2a2ac47e	[Fix] patch	2018-06-12 01:16:28 +05:30
Manas Solanki	d7f6d45e28	Merge pull request #14468 from manassolanki/fix-travis-1 fix the salary slip test cases	2018-06-11 19:29:28 +05:30
Manas Solanki	f226b50d6d	fix the salary slip test cases	2018-06-11 19:27:46 +05:30
Rohit Waghchaure	647d595158	Code cleanup and fixes for the asset	2018-06-11 19:15:08 +05:30
Shridhar Patil	c3f5849ac0	typo fixed	2018-06-11 18:26:45 +05:30
Manas Solanki	e832aa4fe2	Merge pull request #14436 from shreyashah115/fix-trav Travis again	2018-06-11 17:45:11 +05:30
Shreya Shah	157815ff0c	Patch for total quantity (#14458 ) * Add path to patches.txt * Modify patch	2018-06-11 17:32:17 +05:30
Jamsheer	0ca76323af	Clinical Procedure Template - get_item_details - fix (#14449 )	2018-06-11 17:25:49 +05:30
Prateeksha Singh	252d0bf255	Merge pull request #14455 from frappe/kennethsequeira-patch-3 Fix minor div issue in Accounts index page	2018-06-11 16:33:51 +05:30
rohitwaghchaure	7cd59a2089	Merge pull request #14453 from rohitwaghchaure/item_alternative_fixes_for_backflush [Fix] Alternative item, transferred qty issue for backflush method	2018-06-11 15:44:37 +05:30
Shreya	9680dc476f	Remove commented code	2018-06-11 15:40:09 +05:30
deepak-mnt	bb6753f206	Merge branch 'develop' of https://github.com/frappe/erpnext into sales_partner_type	2018-06-11 15:01:43 +05:30
deepak-mnt	4ec283d775	patch for sales partner type field	2018-06-11 14:53:25 +05:30
Manas Solanki	7e8cbf288c	Update cost_center.py	2018-06-11 14:25:27 +05:30
Kenneth Sequeira	061492a9af	Fix minor div issue in Accounts	2018-06-11 14:24:19 +05:30
Rohit Waghchaure	86026d31cf	[Fix] Alternative item, transferred qty issue for backflush method	2018-06-11 14:11:00 +05:30
Rohit Waghchaure	cdec44ee81	Removed company data from test item records	2018-06-11 13:32:34 +05:30
Prateeksha Singh	ea7533fa75	[tax-breakup] store itemized tax by item_name when can	2018-06-11 13:31:33 +05:30
Shridhar Patil	6a00a17c14	toggle required fields on select of repayment option in loan application	2018-06-11 12:48:31 +05:30
rohitwaghchaure	7048925016	[Enhance] Standalone debit/credit note (#14269 ) * [Enhance] Standalone debit/credit note * Test cases * Test cases and documentation * Removed credit, debit note links from accounts module	2018-06-11 12:02:14 +05:30
Manas Solanki	3639b85663	Merge pull request #14363 from frappe/manassolanki-patch-10 PR to check the current state of Travis	2018-06-11 11:40:40 +05:30
Ranjith Kurungadam	e46639f47c	Employee Transfer allow same company, update internal work history (#14430 )	2018-06-11 11:24:44 +05:30
Zarrar	88a90ff3b5	minor fix in account and account utils (#14432 )	2018-06-11 11:21:17 +05:30
Shreya	83d5dc119b	Fix Employee tax declaration test case	2018-06-11 10:31:40 +05:30
Shreya	664f30a018	Fix asset maintenance json	2018-06-11 10:31:40 +05:30
Shreya	294238abfd	Fix shopify test case	2018-06-11 10:31:39 +05:30
Shreya	956277b121	Fix tests	2018-06-11 10:31:39 +05:30
Zarrar	65994210f6	fix patch to add email template in hr settings (#14427 )	2018-06-08 16:57:06 +05:30
Zarrar	44175904c6	Tree fix (#14425 ) * use frm.set_value instead of this.set_value * generic methods moved to accounts/utils * clean up code, and make use of methods added in utils	2018-06-08 16:35:21 +05:30
Suraj Shetty	f553b53fbf	Add patch to set update_field and update_value (#14421 ) * Add patch to set update_field and update_value - set update_field and update_value if empty since expense claim workflow is dependent on it. * Set update_field for workflow state of leave application * Update patch entry * Fix bug * Update set_update_field_and_value_in_workflow_state.py	2018-06-08 16:28:36 +05:30
Alchez	ca8138fd13	[Agriculture] Sort crop tasks chronologically and optimize disease task creation (#14367 ) * Improve max crop period check and sort agriculture tasks chronologically * Reformat crop cycle logic and add field to optimize task creation	2018-06-08 14:55:07 +05:30
Doridel Cahanap	ebb530385a	Add Employee Status Temporary Leave (#14423 )	2018-06-08 14:54:31 +05:30
rohitwaghchaure	8fc64a9717	[Fix] Travis data (#14422 )	2018-06-08 14:43:50 +05:30
Zarrar	7ab70ca2d7	[ Fixes ] v11 Tree based doctype testing (#14419 ) * location tree fixes validate if child present while deleting, filter lists down only group enabled node * department tree fixes Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash * Company tree fix Check if child exist while deleting a node validation added. * Supplier Group tree fixes on_trash validation added if child node present * Cost Center tree fixes Adding child to root node throws error because parent_cost_center picks up root name	2018-06-08 14:33:15 +05:30
Gaurav Naik	094617d29a	Fix to allow migration of individual sites (#14413 )	2018-06-08 11:44:27 +05:30
Shreya Shah	b9399d8781	Cancel attendance if leave application is cancelled (#14372 ) * Cancel attendance if leave application is cancelled * Fix as per review	2018-06-08 11:24:08 +05:30
Zarrar	8cd0f67b25	query fix if name contains apostrophe (#14370 )	2018-06-07 16:48:31 +05:30
Zarrar	13f9851609	[Docs] Update doc for Supplier Group (#14373 ) * add breadcrumb for Supplier Group tree * change occurrences of supplier-type to supplier-group * update supplier-group doc, update pngs	2018-06-07 16:47:30 +05:30
Zarrar	209d8f36f7	doctype was not reloaded to pickup changes (#14371 )	2018-06-07 16:43:55 +05:30
Prateeksha Singh	50ae6b891b	Merge pull request #14410 from pratu16x7/hub-fixes Hub fixes	2018-06-07 14:19:01 +05:30
rohitwaghchaure	2704bef0b3	Merge pull request #14368 from shreyashah115/fix-trav Some more travis fixes	2018-06-07 14:14:33 +05:30
Prateeksha Singh	00ab78d768	[hub] set page title dynamically	2018-06-07 14:13:00 +05:30
Shreya	88591314b0	Fix Leave Application test cases	2018-06-07 13:56:27 +05:30
Rohit Waghchaure	de82ad1c5f	[Fix] Clenaup code if supplier gstin is none	2018-06-07 13:24:25 +05:30
Prateeksha Singh	9a7f957ace	[hub] fix item page recursion	2018-06-07 12:40:40 +05:30
Shreya	88fe0d59d9	Fix daily work summary test	2018-06-07 11:22:26 +05:30
Shreya	4638d1ab97	Fix POS Profile test	2018-06-06 16:23:16 +05:30
Shreya	71316aaec8	Modify asset movement test cases and files	2018-06-06 15:55:30 +05:30
Zarrar	32a118d68c	fix precision in stock entry (#14366 )	2018-06-06 15:06:52 +05:30
Saurabh	eb579a11e1	Fix demo (#14365 ) * fix demo * Update asset.json	2018-06-06 15:05:31 +05:30
Shreya	90bdfed3db	Modify all asset test cases	2018-06-06 14:27:55 +05:30
Manas Solanki	3504a2342e	PR to check the current state of Travis	2018-06-06 12:46:06 +05:30
Ranjith Kurungadam	cff14793d8	Salary Structure, Slip - make fields readonly (#14358 ) * Salary Structure, Slip - make fields readonly * codacy fixes * Salary Component - reorder fields, removed is_group for flexi * Update salary_structure.js	2018-06-06 12:04:25 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
Ameya Shenoy	36cd433999	bumped to version 10.1.37	2018-06-06 05:41:37 +00:00
Charles-Henri Decultot	a774f3d7a0	POS closing voucher (#14270 ) * POS closing voucher * Codacy corrections + improvements * Codacy corrections * POS Closing Voucher improvements	2018-06-06 10:22:13 +05:30
Alchez	eb0ac37587	Fix ISO standard references in Agriculture (#14361 )	2018-06-06 10:10:56 +05:30
Shreya Shah	59af3a0296	[Enhancement] UOM Conversion Factors (#13853 ) * new doctype UOM category * new doctype UOM Conversion Factor * bootstrap json data for uom conversions * uom conversion in item * Patch to add all conversions and categories * Fetch conversions multi-way * fix codacy * Rebase with develop * [minor] Fix * Add a test case * Improvise as per review comment * Add json data for UOMs * Commonify function and call from patch * Update uom_conversion_data.py	2018-06-06 09:44:46 +05:30
Sushant Nadkar	d458f7710f	[UX Improvement] Removed uri encoding from search results on front end (#14266 ) * removed uri encoding from search results on front end * decode search string using html2text	2018-06-06 09:23:38 +05:30
Shreya Shah	c37fd050c5	Remove unnecessary variable (#14352 ) * Remove unnecessary variable * Replace cur_frm with frm * Update material_request.js	2018-06-06 09:19:48 +05:30
Shreya	9aa7d8fe5f	Update asset related test cases	2018-06-06 04:27:59 +05:30
Shreya	80a1e156cb	Create location for asset test	2018-06-06 03:11:18 +05:30
Shreya	9c801b976d	Fix share transfer test	2018-06-06 02:58:23 +05:30
Shreya	8f692f9a27	Fix batch test	2018-06-06 02:09:17 +05:30
Shreya	2ad81726d5	Fix utils.py	2018-06-06 02:09:17 +05:30
Manas Solanki	dabe21051c	Update test_company.py (#14360 )	2018-06-05 16:28:27 +05:30
Nabin Hait	2f273e73b2	minor fixes	2018-06-05 14:40:48 +05:30
Nabin Hait	e0a2ea64c0	Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop	2018-06-05 14:21:57 +05:30
Shreya Shah	6ff3a094e2	Fix currency exchange tests (#14356 )	2018-06-05 14:16:10 +05:30
rohitwaghchaure	50d8c4a10f	[Fix] Not able to save purchase invoice, due to invalid condition (#14355 )	2018-06-05 13:08:10 +05:30
rohitwaghchaure	2da6b3d628	[enhance] Provision to backflush raw materials based on stock entries for subcontracted items (#14296 )	2018-06-05 13:06:52 +05:30
Shreya Shah	630721aacc	Travis (#14354 ) * Fix Purchase Receipt tests * Fix Item test * Fix daily work summary test * Modify currency exchange test cases * Fix Leave Application test * Update working hours when making salary slip from timesheet * Replace fixer.io with exchangeratesapi * Fix codacy	2018-06-05 12:56:10 +05:30
Nabin Hait	81d12cc9c8	Get default income account from Item	2018-06-05 12:49:03 +05:30
Ranjith Kurungadam	d580c92377	Staffing Plan (#14346 ) * validate staffing plan * staffing plan docs * get_active_staffing_plan_and_vacancies now returns dict, mandatory fields set * validate with parent and child company plans, plan now considers open job openings * Failure details in validate error messages * Fixed sql injection	2018-06-05 11:40:58 +05:30
Shreya Shah	4fa600a8dd	Apply GST based on Origin and Place of supply GST Code (#14288 ) * Add new gst field in Taxes and Charges template - is_inter_state * Add a patch * Add a regional function to fetch taxes on the basis of GSTin * Add regional function to hooks.py * Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN * Fixes in the setup.py for India region * Set is_inter_state field For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account. * Fix as per review comment	2018-06-05 11:27:53 +05:30
Shreya Shah	5103454642	New Report Address and Contacts (#14307 ) * New Report Address and Contacts * Fix codacy * Add links to report in module pages	2018-06-05 10:44:36 +05:30
Sushant Nadkar	565bf203e5	[Improvement] Added display settings for item price, availibility and stock levels (#14308 ) * display item price on website even when cart is disabled * added display settings for item price, availibility and stock levels * Update shopping_cart_settings.json	2018-06-05 10:43:11 +05:30
Alchez	31ab64822c	Make the item UOM more visible (#14315 )	2018-06-05 10:35:55 +05:30
Shreya Shah	f1e54836cb	Remove hardcoded workflow patches (#14340 )	2018-06-05 10:35:07 +05:30
Shreya Shah	b75e77a2cc	Fix syntax (#14342 )	2018-06-05 10:33:29 +05:30
Sushant Nadkar	64907e5083	Validate response message for frappe call (#14343 )	2018-06-05 10:33:04 +05:30
Zarrar	7c088ff623	dont validate items if item_code not found (#14344 ) item_code field is not set when created using invoice creation tool	2018-06-05 10:32:09 +05:30
rohitwaghchaure	7cf01e7c75	Replaced fixer api with exchangeratesapi (#14347 )	2018-06-05 10:30:20 +05:30
asbasawaraj	1b16b772ab	Report to Track Expiring Memberships - Monthwise (#14207 )	2018-06-05 10:30:03 +05:30
Nabin Hait	c4eec99bc4	minor fix	2018-06-05 09:06:30 +05:30
Prateeksha Singh	2141bfab89	[patch][update] naming_series field in member patch	2018-06-04 16:36:12 +05:30
Rohan Bansal	841d54c49d	Start adding tests for contracts	2018-06-04 15:56:38 +05:30
Rohan Bansal	bf0f0aaf6f	Add Contract-related doctypes to ERPNext	2018-06-04 15:56:38 +05:30
Prateeksha Singh	37678d4838	[patch][new] rename old members as per naming series (#14339 )	2018-06-04 14:25:51 +05:30
Sushant Nadkar	ebf76163ad	show uom in list view of material request (#14338 )	2018-06-04 14:23:25 +05:30
Ranjith Kurungadam	f576c570c9	Salary Slip - fix when no pyroll period found for tax calc (#14335 )	2018-06-04 12:53:23 +05:30
Zarrar	fc03a0463c	[Fix] Validate items for saleable, purchaseable or subcontractable in transactions (#14316 ) * validate items to see if they are saleable * check if items are subcontractable or saleable * improvise name,error message and code Validate type function validates item if they are of proper type for that transaction and throws descriptive error.	2018-06-04 12:52:52 +05:30
Nabin Hait	8c7af497a0	Fixed merge conflict	2018-06-04 11:23:36 +05:30
Ranjith Kurungadam	ed4e49c6b2	Salary Slip - Deduct Tax (#14255 ) * Salary Slip - Deduct Tax For Unclaimed Employee Benefits, Unsubmitted Tax Exemption Proof * fix - missing return statement	2018-06-04 11:17:55 +05:30
Nabin Hait	a55090dc88	Fixed merge conflict	2018-06-04 11:14:50 +05:30
Jamsheer	398f15754d	Rename - Additional Salary Component to Additional Salary (#14302 ) * Rename Doctype Additional Salary Component to Additional Salary * Remove unused import	2018-06-04 11:02:53 +05:30
rohitwaghchaure	5ecc26bf15	[Fix] get_shipping_address() takes at least 1 argument (0 given) (#14328 )	2018-06-04 11:00:24 +05:30
Prateeksha Singh	8ac7dfee36	Merge pull request #14329 from pratu16x7/hub-fixes [hub][minor] remove links #14309	2018-06-04 10:28:47 +05:30
Prateeksha Singh	e73df88863	[hub][minor] remove links #14309	2018-06-04 10:26:49 +05:30
rohitwaghchaure	c1cf495a93	[Fix] Special character issue (#14322 )	2018-06-03 16:00:31 +05:30
Nabin Hait	953ea93f7b	Update leave_type.json	2018-06-03 15:31:35 +05:30
Shreya Shah	d3255b1d3d	Add docs for Inter Company Invoice creation (#14314 )	2018-06-03 10:28:51 +05:30
Tropicalrambler	8b38e57af2	Correcting typo in the User Documentation (#14326 ) This corrects a simple typo in the Pricing rule topic for documentation	2018-06-03 10:27:38 +05:30
Ranjith Kurungadam	375db6181d	Earned Leave (#14143 ) * Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this * Earned Leave monthly scheduler method, test * remove whitelist of method	2018-06-01 16:09:28 +05:30
rohitwaghchaure	ce642d73cb	[Fix] Special character issue while upadting customer group in customer (#14312 )	2018-06-01 15:11:21 +05:30
rohitwaghchaure	2fa057e4ad	[Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same (#14311 )	2018-06-01 15:10:55 +05:30
Zarrar	7e0e85912b	item_name not fetched in packing slip (#14310 )	2018-06-01 15:10:33 +05:30
Saurabh	824e068d0a	typo fix	2018-05-31 18:11:05 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
Saurabh	fccf7f2a68	bumped to version 10.1.36	2018-05-31 17:54:53 +06:00
Ranjith	590bf4ce3a	codacy fixes	2018-05-31 12:08:14 +05:30
Shreya Shah	c55f774fbf	Address filter in gstr1 report (#14290 )	2018-05-31 09:33:36 +05:30
AMS Fauzi	f3a6d95634	Develop: Batch Number Series (#14251 )	2018-05-31 09:31:57 +05:30
rohitwaghchaure	780952ea03	Show actual qty in warehouse link search (#14258 )	2018-05-31 09:29:18 +05:30
Ahmad M Abdelrahman	f12b446dc8	Bank Account #13714 PR (#14295 )	2018-05-31 08:58:23 +05:30
Saurabh	e5d076d495	[minor][fix] fix query syntax (#14294 ) * [minor][fix] fix query syntax * Update pos.py	2018-05-31 08:54:31 +05:30
Umair Sayed	5225c0e541	May docs (#14298 ) * manual update * Added new videos in learn section. Updated other help pages. * project module rewrite * employee and supplier master * employee and supplier master fixes	2018-05-31 08:43:22 +05:30
rohitwaghchaure	26833cf506	Merge pull request #14299 from rohitwaghchaure/field_rearrange_for_budget Rearrange fields	2018-05-31 00:27:45 +05:30
Rohit Waghchaure	7c0dd7a142	Rearrange fields	2018-05-31 00:27:05 +05:30
Ranjith	0cb2684130	Tax Exemption Proof Submission - validations, eligible hra calc	2018-05-30 20:51:37 +05:30
Ranjith	793f8e8caa	Tax Exemption Declaration - update fields, move generic methods to utils	2018-05-30 20:50:48 +05:30
rohitwaghchaure	31a96d2a3f	[Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item (#14287 )	2018-05-30 18:13:47 +05:30
Prateeksha Singh	c62de0831e	Merge pull request #14291 from pratu16x7/help-page [fix] help page issue listing	2018-05-30 17:27:49 +05:30
Prateeksha Singh	66425c6e7f	[fix] help page issue listing	2018-05-30 17:26:03 +05:30
Shreya Shah	47335e5e60	Stocking out items with expired batches (#14249 ) * Add dropdown in Stock Entry to get expired batch items * Fetch all the items with expired batches * Add the fetched item details to stock entry details * Modify as per the review comments	2018-05-30 15:44:41 +05:30
rohitwaghchaure	05152dad0b	[Enhance] Provision to set overproduction percentage for work order (#14248 )	2018-05-30 15:28:09 +05:30
Prateeksha Singh	09e46a4e5f	Hub fixes (#14281 ) * [hub] remove list freeze * [hub] fix svg in icon * [hub] implement route options in hub list view	2018-05-30 15:12:20 +05:30
Jignesh Greycube	9aca025be2	Documentation to Fetch value in Child Table for a field (#14282 ) * Fetch value in Child Table for a field Sample Script to fetch value in child table * Update fetch value in child table field	2018-05-30 15:08:55 +05:30
Ranjith	806cd93791	Merge remote-tracking branch 'frappe/develop' into dev_hra	2018-05-30 13:37:47 +05:30
Ranjith	155ecc1b4a	Tax Exemption Declaration - HRA Calculation	2018-05-30 13:37:15 +05:30
Faris Ansari	6ac9c0f71e	Merge pull request #14267 from surajshetty3416/workflow-doc-changes Add doc related to workflow action	2018-05-30 12:34:21 +05:30
Zarrar	39c0add5a2	query fix sales-person-target-variance-item-group-wise (#14271 )	2018-05-30 11:56:58 +05:30
Zarrar	58200182b4	update timeline data form Activity Log (#14276 ) Documents updated are stored in Activity Log rather than Communication	2018-05-30 11:56:23 +05:30
Prateeksha Singh	865e16621c	[docs] fix embed issues (#14268 )	2018-05-29 17:09:56 +05:30
Suraj Shetty	e51e51e138	Add requested changes	2018-05-29 16:46:19 +05:30
Nabin Hait	348a6a8b17	patch fixes	2018-05-29 16:17:15 +05:30
Suraj Shetty	77aed9d58b	Move video section to bottom	2018-05-29 15:45:22 +05:30
Suraj Shetty	16d3494efc	Add doc related to workflow action	2018-05-29 15:29:18 +05:30
Vladyslav Baidak	13d4391e70	Fixed SQL syntax error in Get Loan Details (#14265 )	2018-05-29 15:22:05 +05:30
Ranjith	7bb621d2bf	Tax Exemption Declaration, Proof Submission HRA fields	2018-05-29 13:58:31 +05:30
Ranjith	fb257ba19c	Company - Payroll Settings- fields	2018-05-29 13:57:27 +05:30
Nabin Hait	4d0c73a5c8	Submit auto created salary structure assignments	2018-05-29 13:25:28 +05:30
Nabin Hait	3aa205f19d	Fixes related to department tree	2018-05-29 13:08:48 +05:30
Saurabh	d3a8c9308b	[fix] add ignore validate flag (#14238 )	2018-05-29 13:07:27 +05:30
Nabin Hait	288cbcafce	Create demo data for salary structure	2018-05-29 11:04:11 +05:30
Nabin Hait	153536bf70	minor test fixes	2018-05-29 10:58:57 +05:30
Shreya Shah	ae95a8aa15	Update status in Purchase Receipt (#14257 ) * Update status on submission if per_billed = 100 * Add patch to update existing records	2018-05-28 18:24:28 +05:30
Zarrar	b9f54ca946	[Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250 ) * add doctypes allowed to group items, average the rate * add check field to group items during print * call common before_print in delivery note * fix precision issue while calculating average	2018-05-28 17:41:09 +05:30
rohitwaghchaure	a8c6ec27c0	Merge pull request #14252 from rohitwaghchaure/leaderboard_translation_issue [Fix] Translation issue in leaderboard	2018-05-28 15:51:00 +05:30
Saurabh	3c1b153cdb	Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix [fix] Stock Ledger report item filter	2018-05-28 15:23:21 +05:30
rohitwaghchaure	bd2989a541	Merge pull request #14254 from rohitwaghchaure/leave_application_issue_for_leave_approver [Fix] Leave application, leave approver not fetching	2018-05-28 15:11:08 +05:30
Rohit Waghchaure	81302a8b12	[Fix] Leave application, leave approver not fetching	2018-05-28 15:10:19 +05:30
rohitwaghchaure	65684564c2	Merge pull request #14253 from rohitwaghchaure/financial_report_issue [Fix] Data not displaying in financial reports	2018-05-28 15:03:43 +05:30
Rohit Waghchaure	c89a84b61e	Fixed data not displaying in financial reports	2018-05-28 15:01:57 +05:30
Rohit Waghchaure	06f91e2dc1	[Fix] Translation issue in leaderboard	2018-05-28 14:43:17 +05:30
rohitwaghchaure	30c88fe1a5	Merge pull request #14247 from rohitwaghchaure/patch_fixed_for_asset_warehouse Fixed patch, checked warehouse available in the asset	2018-05-28 12:30:55 +05:30
Rohit Waghchaure	ad184f62e3	Fixed patch, checked warehouse available in the asset	2018-05-28 12:29:42 +05:30
Shreya Shah	13f39eb821	Display rate on the basis of stock UOM (#14246 )	2018-05-28 11:50:28 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114 ) * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
tundebabzy	3eb235a53b	Sales Payment Summart Report Improvement (#14243 ) * fix iteritems() takes exactly 1 argument (2 given) * adds new helper functions * use new functions to make POS invoices filterable on warehouse and cost center * more PEP8 fixes	2018-05-28 10:26:45 +05:30
Kenneth Sequeira	119cc5dec6	Documentation - Open Divs and Video Resolutions (#14242 ) * fixed open div tag in edu docs * fixed open div tag in projects page * fixed open div for item variants, serialized inventory article * fixed video aspect ratio and open div for Selling, Workflow, and Material Request	2018-05-28 10:24:43 +05:30
Ameya Shenoy	67c9566e77	Duct tape for demo (#14241 ) The demo is just too old and needs a complete refactor. This is just a workaroud to keep the demo working	2018-05-27 12:45:32 +05:30
Solufyin	64d02f917a	[ADD] Department Analytics Bar Chart Feature (#14217 )	2018-05-26 09:26:03 +05:30
rohitwaghchaure	a8fb2db001	[Fix] If two po consolidated in one purchase invoice, Total Net Weight not get summed (#14230 )	2018-05-26 09:23:02 +05:30
Kenneth Sequeira	089a41c679	Fixed code in Embed Link (#14228 )	2018-05-26 09:22:43 +05:30
Suraj Shetty	084b0b3a67	Treeview permission (#14232 ) * Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) * Replace frappe.db.sql to frappe.get_list to apply permission - All get_children method had frappe.db.sql in them which had no permission check, now its replaced with frappe.get_list which will check permission based on the user. * Fix codacy - Remove trailing whitespace * Add parent filter * Add ifnull checks	2018-05-26 09:12:59 +05:30
Suraj Shetty	aadfaa4493	Minor fixes (#14231 ) * Parse date using getdate to avoid TypeError * Fix alignment of application dashboard table text * Use `user` instead of `email` to get value from user table	2018-05-26 09:10:47 +05:30
Nabin Hait	33df0b4fbf	Test case fixes (#14219 ) * Test case fixes * fetch_from fixes	2018-05-26 09:09:02 +05:30
Jamsheer	e6eef3085c	Remove unused imports	2018-05-25 15:20:50 +05:30
Jamsheer	9416ac4ad4	Leave Priod - fix - grant leave allocation filter by grade	2018-05-25 14:46:31 +05:30
Manas Solanki	730cb3b547	Update employee.py	2018-05-25 14:46:21 +05:30
Jamsheer	fca88a6b22	Employee benefits - get_assigned_salary_structure	2018-05-25 14:35:02 +05:30
Jamsheer	79a6b42353	Salary Slip - options to fetch from migration	2018-05-25 12:56:22 +05:30
Jamsheer	ce89199abb	taxable salary slabs remove from Salary Component and add to Payroll Period	2018-05-25 12:52:23 +05:30
Jamsheer	f1d10bf286	Salary Component - remove flexi_default	2018-05-25 12:52:23 +05:30
Jamsheer	620c3a872c	Employee Benefit Claim - non pro-rata claim validation updated	2018-05-25 12:52:23 +05:30
Jamsheer	dc698a891d	options to fetch from migration	2018-05-25 12:52:23 +05:30
Jamsheer	8eec40cb8a	Employee Benefits in Salary Slip - Application and Claim	2018-05-25 12:46:31 +05:30
Jamsheer	16e924333e	get payroll period days - fix	2018-05-25 12:46:31 +05:30
Jamsheer	47d865baa0	Calculate remaining benefit amount in Employee Benefit Application	2018-05-25 12:46:31 +05:30
Jamsheer	8a953ba516	Validate remaining benefit amount in Employee Benefit Application	2018-05-25 12:46:31 +05:30
Jamsheer	772f257ff3	Employee Benefit Claim - date default to Today	2018-05-25 12:46:31 +05:30
Jamsheer	eacaad3aec	Max benefit amount in Employee Benefit Application Detail	2018-05-25 12:42:21 +05:30
Jamsheer	c1ae88ba02	Employee Benefit Calim - earning component filter updated	2018-05-25 12:42:20 +05:30
Jamsheer	c5629efe0e	Employee Benefit Application - refactor validation	2018-05-25 12:42:20 +05:30
Jamsheer	9d5d328a4f	Salary Structure - validate flexi with max benefit	2018-05-25 12:42:20 +05:30
Jamsheer	65a5e47e68	Payroll Period - validate dates and overlap	2018-05-25 12:37:36 +05:30
Jamsheer	cf414cc499	Payroll Period - fields refactor	2018-05-25 12:37:36 +05:30
Jamsheer	2ee211ad21	Salary Structure - validate max benefits with flexi	2018-05-25 12:37:36 +05:30
Jamsheer	ce7310255e	Salary Structure - filter for earnings	2018-05-25 12:37:36 +05:30
Jamsheer	43e191289c	Employee Benefit Application - earning component filter by salary structure flexi component	2018-05-25 12:37:36 +05:30
Jamsheer	77a91f0d01	Salary Component - account mandatory for separate payment entry	2018-05-25 12:37:36 +05:30
Jamsheer	1248f6a752	Codacy fix	2018-05-25 12:37:36 +05:30
Jamsheer	0493c22f3c	Additional Salary Component - filter updated - salary_component	2018-05-25 12:37:35 +05:30
Jamsheer	f647aa15af	Salary Component - fields - refactor fields behaviour	2018-05-25 12:37:35 +05:30
Jamsheer	334bd189a7	Employee Benefit Application - filter updated - earning component	2018-05-25 12:37:35 +05:30
Jamsheer	da24722beb	Employee Benefit Claim - filter for earning component	2018-05-25 12:37:35 +05:30
Jamsheer	ce88bdf005	Employee Benefit Claim - Validation Updated - Code refactor	2018-05-25 12:37:35 +05:30
Nabin Hait	f87ec61043	Test case fixes for item defaults	2018-05-24 18:19:21 +05:30
Ranjith Kurungadam	27cf190269	healthcare fix - str encode to utf-8 (#14213 )	2018-05-24 17:15:22 +05:30
Nabin Hait	b903fc4e71	Item defaults query fixes	2018-05-24 17:07:51 +05:30
Prateeksha Singh	05283b8af0	[fix] distribution page embed	2018-05-24 16:17:22 +05:30
Zarrar	ea064d4c5c	module import fix in patch (#14203 )	2018-05-24 15:54:48 +05:30
Ameya Shenoy	95e60927b4	Merge branch 'master' into develop	2018-05-24 08:45:14 +00:00
Ameya Shenoy	475729cefe	bumped to version 10.1.35	2018-05-24 08:45:12 +00:00
neckos	7663bb91c5	return list(filter()) not filter() (#14191 ) filter constructs an iterator that is iterable only once	2018-05-23 19:45:34 +05:30
neckos	225af4a4cb	unicode error in python3 (#14192 )	2018-05-23 19:43:53 +05:30
Manas Solanki	f7713ebfa7	[optimize] introduce two filter in the report in order to handle large item master data (#14193 )	2018-05-23 19:43:04 +05:30
Nabin Hait	5f861756a2	Item Default fixes	2018-05-23 19:37:06 +05:30
Nabin Hait	d5cb4c10a1	Set parent department if missing and not root itself	2018-05-23 18:36:18 +05:30
Rushabh Mehta	315dbd2ed1	[minor] chart_of_accounts.py for python3	2018-05-23 16:14:35 +05:30
Rushabh Mehta	f7414519bb	[fix] set default supplier group in test	2018-05-23 16:14:35 +05:30
Rushabh Mehta	8788688431	[fix] inconsistent indentation	2018-05-23 16:14:35 +05:30
Nabin Hait	46600406b8	Update rename_field_max_days_allowed.py	2018-05-23 13:12:24 +05:30
Achilles Rasquinha	efb731941d	ran 2to3, evaluation (#13499 ) * ran 2to3, evaluation * Update update_gstin.py * Update accounts_receivable_summary.py	2018-05-23 11:31:24 +05:30
Zarrar	c141eb00ee	[Enhance] Department added wherever applicable (#14121 ) * set All Department as default parent_department * add department field in employee_transfer * copied data from options to fetch_from * add department field wherever employee's link field present * empty options field where fetch_from is added	2018-05-23 11:11:36 +05:30
Deepak kumar	e4c2ef03e1	Link Share Transfer to Account (#14127 ) * Link Share Transfer to Account * minor changes * minoor changes	2018-05-23 10:50:22 +05:30
OSS Technolab	4fb4ca6b10	Project Budget does not filter per Project (#14179 ) * Project Budget does not filter per Project Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project. * Update budget.py	2018-05-23 10:47:53 +05:30
Prateeksha Singh	2f69254e56	[company][dashboard] implement heatmap with linked doctypes (#14185 ) * [company][dashboard] implement heatmap with linked doctypes * [company][dashboard] cache transaction history data, schedule query daily	2018-05-23 10:41:26 +05:30
Suraj Shetty	e03937fd6a	Send daily work summary alert to only enabled users (#14175 ) * Send daily work summary alert to only enabled users * Fix import	2018-05-23 10:32:55 +05:30
Faris Ansari	26eb513274	Rename occurences of max_days_allowed to max_continuous allowed (#14180 )	2018-05-23 10:31:39 +05:30
Faris Ansari	83149644e3	Merge pull request #14160 from shreyashah115/patches-fixes-travis Fix patches for Travis	2018-05-22 15:26:49 +05:30
Faris Ansari	7a5221bd95	Add rename_field	2018-05-22 15:26:21 +05:30
Ameya Shenoy	1cc7500be9	Merge branch 'master' into develop	2018-05-22 09:18:38 +00:00
Ameya Shenoy	826f020862	bumped to version 10.1.34	2018-05-22 09:06:38 +00:00
Prateeksha Singh	b44ea4c8dc	[website] Support Portal (#14144 ) * [init] support portal * [support-portal] Get started sections and forum activity * [support-portal] integrate API search for forums, docs, etc * [support-portal] integrate doctype docs search via global search * [support-portal] /help page UI	2018-05-22 11:57:21 +05:30
Rohit Waghchaure	7529bbb7b4	[Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference'	2018-05-22 11:55:48 +05:30
Zarrar	93a186aa11	fetch customer_gstin or billing_address_gstin optionally (#14075 )	2018-05-22 09:16:42 +05:30
rohitwaghchaure	742d3e5549	[Fix] General ledger default_currency issue for member party type (#14172 )	2018-05-22 09:10:01 +05:30
mnatalia	5f0e8d6e09	Added possibility to translate (#14173 )	2018-05-22 09:08:50 +05:30
Rohit Waghchaure	8e12a59d9b	[Fix] Patch	2018-05-21 18:52:07 +05:30
rohitwaghchaure	3ec43966da	Merge pull request #14170 from codingCoffee/sal salary structure patch run if active employee	2018-05-21 18:39:10 +05:30
Ameya Shenoy	a7d402132f	salary structure patch run if active employee	2018-05-21 18:38:18 +05:30
Prateeksha Singh	bcbe32ce7c	Merge pull request #14169 from pratu16x7/hotfix [hotfix][charts] update, without new build system	2018-05-21 18:31:39 +05:30
Prateeksha Singh	b434f2687e	[charts] update, without new build system	2018-05-21 18:04:50 +05:30
Manas Solanki	a96421279d	Remove the debugger from the material_request.js	2018-05-21 17:27:01 +05:30
rohitwaghchaure	734b874f3e	Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget [Fix] Patch, default cost center, expense account for the item	2018-05-21 17:18:58 +05:30
Faris Ansari	d2b4ec5044	[fix] Set null values to '0' before changing column type	2018-05-21 16:55:31 +05:30
Zlash65	004bf218a0	remove changes for max_days_allowed patch	2018-05-21 16:52:08 +05:30
Rohit Waghchaure	0ca7ba3247	[Fix] Patch, default cost center, expense account for the item	2018-05-21 16:43:50 +05:30
Faris Ansari	e479057148	Merge pull request #14165 from codingCoffee/min relieving_date wasnt of type datetime	2018-05-21 16:42:41 +05:30
Ameya Shenoy	35984daf72	relieving_date wasnt of type datetime	2018-05-21 16:37:27 +05:30
Manas Solanki	a752eca82c	Merge pull request #14163 from manassolanki/fix-20 [fix] don't update the modified of item price while updating item	2018-05-21 16:37:01 +05:30
rohitwaghchaure	22619a8e0c	Merge pull request #14164 from rohitwaghchaure/fixed_alias_issue [Fix] Unknown column 'i.stock_uom' in 'field list'	2018-05-21 16:22:23 +05:30
Rohit Waghchaure	abc6cf0aa5	[Fix] Unknown column 'i.stock_uom' in 'field list'	2018-05-21 16:18:37 +05:30
Manas Solanki	b5d9b38dee	don't update the modified of the item price	2018-05-21 15:40:51 +05:30
Rohit Waghchaure	11e2a9ac90	[Fix] Permission issue while saving leave application	2018-05-21 15:39:38 +05:30
Zlash65	41cb6cc491	patch fix - skip query if no when_then case	2018-05-21 15:10:06 +05:30
Shreya	70f9d07df8	Fix patches for Travis	2018-05-21 15:04:13 +05:30
Faris Ansari	6d2dfac44e	[fix][patch] Shopify (#14159 )	2018-05-21 14:41:11 +05:30
rohitwaghchaure	1275ea5123	Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver Set leave approver in the leave application	2018-05-21 11:58:41 +05:30
Nabin Hait	19ce904030	Report added in Selling module	2018-05-21 11:07:04 +05:30
Nabin Hait	2cfc247d88	customers without any sales transactions	2018-05-21 11:03:02 +05:30
Nabin Hait	1bf2576e0e	Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818	2018-05-21 10:47:40 +05:30
Valmik	bfb8a73377	Append company after (#14119 )	2018-05-21 10:44:35 +05:30
asbasawaraj	5f6b44e142	Formatted chapter member display (#14128 )	2018-05-21 10:31:45 +05:30
Shridhar Patil	4c790488ea	job opening designation made mandatory (#14153 )	2018-05-21 10:30:17 +05:30
Valmik	c28378f448	[fix] get barcode string instead of dict (#14139 ) * [fix] get barcode string instead of dict * Update pos.py	2018-05-21 10:06:05 +05:30
Rohit Waghchaure	812224e56e	Set leave approver in the leave application	2018-05-20 21:21:33 +05:30
Manas Solanki	f87762887a	fetch defualt supplier from the item table (#14113 )	2018-05-20 10:58:26 +05:30
Zarrar	42231df33a	[Minor] Supplier Group test fix & default supplier in item fix (#14150 ) * fix supplier group test * item - default_supplier fix	2018-05-20 10:46:10 +05:30
Zarrar	1f3f18534b	[Fix] Leave Application & Expense Claim query fix \| Leave Balance Report fix (#14149 ) * move set_query to setup function * rectify leave balance report according to deparmtent changes	2018-05-20 10:45:14 +05:30
Gaurav Naik	8f17281011	Initialized dynamic link on Warehouse (#14135 ) * Initialized dynamic link for Warehouse * Codacy Fixes	2018-05-20 10:39:14 +05:30
rohitwaghchaure	d08ac1fe79	Merge pull request #14136 from rohitwaghchaure/multiple_fixes_for_v11 Fixes in material request, asset maintenance	2018-05-18 16:39:48 +05:30
Rohit Waghchaure	73a99441ca	Fixed get_query for default data in item	2018-05-18 16:39:08 +05:30
Rohit Waghchaure	6cdaa6e861	Fixes in material request, asset maintenance	2018-05-18 16:30:14 +05:30
Manas Solanki	d976c04b69	Merge pull request #14134 from manassolanki/fix-salary-patch [fix] patch for the salary structure assignment for old employees	2018-05-18 15:47:14 +05:30
Manas Solanki	33c1a38dc8	[fix] patch for the salary structure assignment for old employees	2018-05-18 15:46:35 +05:30
rohitwaghchaure	7d834b946f	Merge pull request #14117 from shreyashah115/fixes Fix patch	2018-05-18 12:45:06 +05:30
Rohit Waghchaure	f61e94e162	Changed condition of finance book in reports	2018-05-18 09:10:07 +05:30
Rohit Waghchaure	f689d01a0c	Added finance book in Asset Depreciation Ledger report, fixed asset issue	2018-05-17 23:29:37 +05:30
Prateeksha Singh	984a7a7e61	[item-query] change order of description terms, name first	2018-05-17 17:29:36 +05:30
Shreya	65dd1f6b4c	Mark attendance only if to_date <= nowdate in Leave Application	2018-05-17 17:13:56 +05:30
Basawaraj	6d334b8135	Added Report : Customers Without Any Sales Transactions	2018-05-17 16:54:03 +05:30
Shreya	362e0a9f6e	Fix patch	2018-05-17 15:43:03 +05:30
Rohit Waghchaure	f2ccde0454	[Fix] Heatmap issue in the project	2018-05-17 15:40:32 +05:30
rohitwaghchaure	8c6b7557db	Merge branch 'develop' into jam_enterprise_emp_benefit	2018-05-17 14:08:06 +05:30
rohitwaghchaure	4444430200	Merge pull request #14108 from ESS-LLP/tax_deduction Variable tax deduction	2018-05-17 13:55:52 +05:30
Valmik Jangla	b52d5b21a1	Add UOM to Item View with Price	2018-05-17 00:09:21 -07:00
Faris Ansari	9e4889d756	[fix] Stock Ledger report item filter - breaks when Item Code contains % symbol	2018-05-17 12:18:28 +05:30
rohitwaghchaure	d2f0d08234	Merge pull request #14105 from Zlash65/fix-dept [Minor] Typo in Employee Transfer	2018-05-17 11:23:52 +05:30
Rohit Waghchaure	992fb34c95	[Fix] Asset adjustment issues	2018-05-17 11:22:59 +05:30
Ranjith	fcfb5a3769	Merge remote-tracking branch 'frappe/develop' into develop	2018-05-17 10:07:23 +05:30
Ranjith	58363e6bbd	get_payroll_period return name, fix hard coded leave period	2018-05-17 10:00:33 +05:30
Zlash65	e3f7e8b101	typo in frappe.throw in employee_transfer	2018-05-17 01:34:35 +05:30
Rohit Waghchaure	585945e65d	Allow to select Asset Received But Not Billed in expense account head	2018-05-17 00:23:27 +05:30
rohitwaghchaure	e8ef69ec33	Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty [Fix] Validation issue	2018-05-16 23:58:09 +05:30
Rohit Waghchaure	2868840e6b	[Fix] Validation issue	2018-05-16 23:57:28 +05:30
Rohit Waghchaure	44fda65b1d	[Fix] Company mandatory issue	2018-05-16 23:31:09 +05:30
Ranjith	31eeff00f7	merge frappe/develop	2018-05-16 23:24:34 +05:30
Rohit Waghchaure	a91765707a	[Fix] TDS issue	2018-05-16 23:13:02 +05:30
Ranjith	b485b1ef80	Salary Slip calc tax, except for flexi benefits	2018-05-16 23:01:40 +05:30
Ranjith	c6b2575a9c	fields in salary detail, copy data from salary component on change	2018-05-16 22:59:21 +05:30
rohitwaghchaure	274f890246	Merge pull request #14099 from rohitwaghchaure/fixed_asset_date Multiple fixes in asset	2018-05-16 22:13:15 +05:30
Rohit Waghchaure	e6acd4c57a	Multiple fixes in asset	2018-05-16 22:12:39 +05:30
rohitwaghchaure	64e81b436e	Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing [Fix] Custom buttons not showing	2018-05-16 21:45:12 +05:30
Rohit Waghchaure	976af6b422	[Fix] Cystom buttons not showing	2018-05-16 21:43:16 +05:30
rohitwaghchaure	660ca9b6c0	Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue [Fix] Gl Enrty issue	2018-05-16 21:34:44 +05:30
Rohit Waghchaure	1a328d02d2	[Fix] Gl Enrty issue	2018-05-16 21:34:06 +05:30
rohitwaghchaure	513cd189f0	Merge pull request #14095 from rohitwaghchaure/leave_application_issue_v11 [Fix] onload set default employee, leave approver, company	2018-05-16 19:57:09 +05:30
Rohit Waghchaure	8e4f676c8c	[Fix] onload set default employee, leave approver, company	2018-05-16 19:55:52 +05:30
Jamsheer	8b86d18f73	Remove unused imports	2018-05-16 19:50:30 +05:30
Jamsheer	3434aabc28	Employee Benefit Claim in Salary Slip	2018-05-16 19:50:30 +05:30
Jamsheer	3abae9c1ba	Employee Benefit Application - whitlist method get_max_benefits	2018-05-16 19:50:30 +05:30
Jamsheer	3e64297a3d	Employee Benefit Application - validate maximun benefit	2018-05-16 19:50:30 +05:30
Jamsheer	3cd0ad4c98	Codacy fixes	2018-05-16 19:50:30 +05:30
Jamsheer	c9287b5b88	Manage grouping of salary component for flexible benefit	2018-05-16 19:50:30 +05:30
Jamsheer	6410022cab	minor fixes	2018-05-16 19:49:39 +05:30
Jamsheer	c678d037e7	Salary slip - throw if no default flexi component	2018-05-16 19:49:39 +05:30
Jamsheer	5f6e274505	Salary slip - default flexi component	2018-05-16 19:49:39 +05:30
Jamsheer	43740a6511	Employee Benefit Application - employee benefit in salary slip	2018-05-16 19:49:39 +05:30
Jamsheer	0bc665c0a5	Salary Copmonent - Default flexible componnent	2018-05-16 19:49:39 +05:30
Jamsheer	15613e46ad	Salary Copmonent - Defualt flexible componnent	2018-05-16 19:48:47 +05:30
Jamsheer	d63c39a514	Payroll Period - get payroll period days	2018-05-16 19:47:18 +05:30
Jamsheer	d66fb842c1	Employee Benefit Application - validate max benefit for employee	2018-05-16 19:47:18 +05:30
Jamsheer	2d6901d5dc	Employee Benefit Application - validate max benefit amount for component	2018-05-16 19:47:18 +05:30
Jamsheer	9cb2fc2766	Employee Benefit Application - calcluate benefit amount	2018-05-16 19:47:18 +05:30
Jamsheer	d48998bae1	Employee Benefit Application - Calculate benefit amounts	2018-05-16 19:47:18 +05:30
Jamsheer	779f8ebbb3	Employee Benefit Application - get max benefit	2018-05-16 19:47:18 +05:30
Jamsheer	41616de9cc	Employee Benefit Application - validate duplicate	2018-05-16 19:47:18 +05:30
Jamsheer	9cd292b187	Employee Benefit Application - filter updated	2018-05-16 19:47:18 +05:30
Jamsheer	4d93d339f7	Employee benefit - filters fro earning component	2018-05-16 19:47:18 +05:30
Ranjith	29e0ed3da1	Exemption Declaration - field total_amount	2018-05-16 19:10:35 +05:30
Manas Solanki	df0ffab16c	Merge pull request #14093 from manassolanki/poc-fixes-1 [ui] more fields in the list view of assets	2018-05-16 18:25:37 +05:30
Manas Solanki	f3f1ba37b9	[ui] more fields in the list view of assets	2018-05-16 18:24:35 +05:30
rohitwaghchaure	4ea97c84ac	Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual [Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:21:20 +05:30
Rohit Waghchaure	421697250b	[Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:20:52 +05:30
Manas Solanki	5b34c00ba6	Added the travel request on the config page	2018-05-16 18:09:43 +05:30
Manas Solanki	fa57cdd86d	Merge pull request #14090 from manassolanki/poc-fixes create item default on making of invoice	2018-05-16 17:46:53 +05:30
Manas Solanki	5b93562ce3	create default on making of invoice	2018-05-16 17:44:51 +05:30
rohitwaghchaure	19a2260ce7	Merge pull request #14089 from shreyashah115/fixes [Fix] General Ledger report filters error	2018-05-16 17:41:19 +05:30
Shreya	63d14cfac8	Instead of throwing error, just return	2018-05-16 17:30:58 +05:30
Shreya	df9516e906	Add Finance Book to route options	2018-05-16 17:30:35 +05:30
Manas Solanki	e3bb1d0e3b	more fixes for the item defaults	2018-05-16 17:14:59 +05:30
Manas Solanki	38667ab8da	return defaults according to the company	2018-05-16 17:00:05 +05:30
Rohit Waghchaure	b233e9d643	[Fix] Multiple fixes	2018-05-16 16:41:34 +05:30
Manas Solanki	028e2ad246	Merge pull request #14083 from frappe/codingCoffee-patch-3 spaces to tabs	2018-05-16 16:25:25 +05:30
rohitwaghchaure	de796266f2	Merge pull request #14084 from shreyashah115/fixes [minor] Fix error	2018-05-16 16:21:14 +05:30
rohitwaghchaure	9c0a87e804	Merge pull request #14082 from manassolanki/item-fixes [fixes] fix in the item defaults	2018-05-16 16:19:39 +05:30
Manas Solanki	e3910fb2a6	[fixes] fix in the item defaults	2018-05-16 16:16:34 +05:30
Shreya	fda15702bc	Fix error	2018-05-16 16:14:34 +05:30
Ameya Shenoy	6e92958578	spaces to tabs	2018-05-16 16:11:20 +05:30
Rohit Waghchaure	23942701f1	[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'	2018-05-16 15:41:00 +05:30
Manas Solanki	8e184569a1	Update item.json	2018-05-16 15:11:52 +05:30
rohitwaghchaure	9122f19e69	Merge pull request #14079 from saurabh6790/TDS_sprint [fix] calculate withholding only on invoice	2018-05-16 15:01:46 +05:30
Saurabh	3c204122cd	[fix] calculate withholding only on invoice	2018-05-16 15:00:19 +05:30
Manas Solanki	b81ece9ddf	Merge pull request #14076 from chdecultot/pricing_rule Missing parentheses in price list rate determination	2018-05-16 14:55:32 +05:30
Manas Solanki	4534df36a9	Merge pull request #14078 from manassolanki/pos-fix [enterprise] minor fixes	2018-05-16 14:53:21 +05:30
Manas Solanki	4256a34220	[enterprise] minor fixes make the employee name mandatory in the employee onboarding added the retention bonus amount	2018-05-16 14:51:25 +05:30
Manas Solanki	9b53b93e37	Merge pull request #14077 from manassolanki/travel-request [rename] Photo ID -> Identification Document	2018-05-16 14:13:13 +05:30
Manas Solanki	6eb7f346bd	[rename] Photo ID -> Identification Document	2018-05-16 14:12:22 +05:30
Charles-Henri Decultot	2f822476dd	Removal of debugging print	2018-05-16 08:40:16 +00:00
rohitwaghchaure	9ad0ac9557	Merge pull request #14068 from manassolanki/travel-request [feature] added travel request doctype in HR	2018-05-16 14:05:26 +05:30
rohitwaghchaure	eff678d2d6	Merge pull request #13918 from manassolanki/item-level-defualts [enhancement] add the item defaults in the child-table for multi-company	2018-05-16 14:04:47 +05:30
Charles-Henri Decultot	dcfe19d868	Missing parentheses in price list rate determination	2018-05-16 08:34:41 +00:00
Suraj Shetty	fbb6b3da5f	Undo replace of frappe.db.sql with frappe.get_list (#14074 )	2018-05-16 13:53:31 +05:30
lasalesi	265005d30d	apply sorting for make multiple variant attributes (#14073 )	2018-05-16 13:10:25 +05:30
Ranjith Kurungadam	cdd4704485	Fixes, fields in Salary Component (#14071 ) * remove duplicate fields * Salary Component - fields is_tax_applicable, is_payable * fix intendation	2018-05-16 13:10:08 +05:30
Rushabh Mehta	e07b332514	fix for tests	2018-05-16 13:05:13 +05:30
Manas Solanki	64614374d8	fix codacy	2018-05-16 13:00:56 +05:30
Manas Solanki	bbd8508783	optimize the patch	2018-05-16 13:00:56 +05:30
Manas Solanki	b16a4ec79e	changes for the default cost center	2018-05-16 13:00:56 +05:30
Rushabh Mehta	0b628386de	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
Manas Solanki	087a2259d9	update for default warehouse	2018-05-16 12:44:07 +05:30

... 19 20 21 22 23 ...

16510 Commits