15610 Commits

Author	SHA1	Message	Date
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