25431 Commits

Author	SHA1	Message	Date
Nabin Hait	0788df412c	fix: Removed permissions from UAE VAT Settings	2020-12-25 20:54:01 +05:30
Nabin Hait	f8c1cb5dc3	fix: Removed permissions from UAE VAT Settings	2020-12-25 20:53:18 +05:30
Deepesh Garg	5269f02919	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-25 18:35:26 +05:30
Deepesh Garg	bfc17e487c	fix: Commonify code for Stock Entry	2020-12-25 18:34:39 +05:30
rohitwaghchaure	49d7499990	fix: added shipment link in delivery note dashboard (#24210) ... * fix: added shipment link in delivery note dashboard * Update shipment.py	2020-12-25 18:15:35 +05:30
rohitwaghchaure	0917c1ec7c	fix: travis failing (#24211)	2020-12-25 18:13:12 +05:30
Nabin Hait	b99c77b753	Reposting fixes (#24202) ... * fix: finished item validation and rate * fix: Check if stock and account balance in sync after reposting * fix: validate stock accounts in journal entry * fix: validate expense against budget	2020-12-25 18:12:35 +05:30
Nabin Hait	327f03566a	Reposting fixes pre release (#24203) ... * fix: finished item validation and rate * fix: Check if stock and account balance in sync after reposting * fix: validate stock accounts in journal entry * fix: validate expense against budget	2020-12-25 18:11:54 +05:30
hasnain2808@gmail.com	46d5f4c7f1	refactor(analytics report): linting	2020-12-25 16:34:43 +05:30
rohitwaghchaure	fa0a075e95	Merge pull request #24196 from scmmishra/fix-file-url-employee ... fix: use file_url to save file and not file name	2020-12-25 16:22:15 +05:30
rohitwaghchaure	ebcd4c454e	Merge pull request #24209 from rohitwaghchaure/added-shipment-link-in-delivery-note ... fix: added shipment link in delivery note dashboard	2020-12-25 16:07:35 +05:30
Rohit Waghchaure	dab1ab990d	fix: partial serial no return issue	2020-12-25 15:25:16 +05:30
rohitwaghchaure	de10d7dcf2	Update shipment.py	2020-12-25 15:15:55 +05:30
Rohit Waghchaure	5bcc6c6b15	fix: added shipment link in delivery note dashboard	2020-12-25 15:02:53 +05:30
rohitwaghchaure	fc01a838b5	Merge pull request #24208 from rohitwaghchaure/fixed-serial-no-return-issue-v13 ... fix: partial serial no return issue	2020-12-25 13:32:36 +05:30
Rohit Waghchaure	adc369f726	fix: partial serial no return issue	2020-12-25 13:28:47 +05:30
Saqib	6d74f5b59b	feat: GST E Invoicing (#23455) ... * feat: init e-invoice settings * feat: read public key file * feat: rsa encryption with public key * feat: save token and sek from auth request * chore: handle error response * feat: AES decryption of SEK with appkey * feat: decrypt json data with SEK * feat: make e invoice from erpnext sales invoice * feat: generate IRN * feat: decode signed json and QR code * chore: validations * feat: cancel IRN * feat: complete e-invoice schema * chore: move e-invoice settings to regional * chore: split einvoice settings and operations * chore: rename schema to template & js cleanup * feat: make IRN field on regional setup * feat: Generate & Cancel IRN from Sales Invoice * chore: minor fixes * fix: item discount * chore: show irn cancelled check after cancellation * fix: hide cancel irn dialog on error * fix: public key is required on validate * fix: cannot find attached key file * fix: validation if e invoicing is disabled * fix: do not show generate irn for invalid supply type * fix: update irn_cancelled after cancelling irn * chore: show irn field for proper gst_category * feat: e-way bill details in e-invoice * fix: save e-way bill no on irn generation * chore: no copy on e invoice custom fields * feat: cancel e-way bill before cancelling IRN * feat: manual download / upload json * chore: group e-invoicing actions * fix: fn name * chore: save signed invoice and qrcode after uplaoding irn * fix: fetch token if not valid * chore: move einvoicing stuff to seperate folder * feat: QRCode Image and E-Invoice Print Format * fix: bug * fix: invalid syntax * chore: code cleanup * chore: clean up e invoice actions * fix: download & upload e-invoice * fix: print format * fix: validations * fix: add permissions on regional setup * feat: add patch * fix: validate document name * fix: return date * fix: credit note einvoice * fix: validations * fix: error logging * fix: e_invoice module not found * fix: add missing package * fix: rename e_invoice_utils.py * fix: einvoice field validation * fix: patch * fix: invoice totals calculation * fix: other charges calculation * chore: improve document name validation message * fix: qr code image string * feat: initialize GSP connector * chore: remove unwanted fields * fix: qr code generation * feat: fetch and cache GSTIN details * feat: generate & cancel IRN * feat: cancel eway bill * chore: remove unwanted fuctions * chore: clean up einvoice actions * fix: attach qrcode on irn generation * fix: generate & cancel IRN * fix: show/hide eway bill fields * fix: valiations * feat: generate eway bill from IRN * chore: remove unwanted imports * chore: error logging * feat: header & footer in GST E Invoice * chore: remove test pincode * fix: invalid syntax * feat: cess non advolem on einvoice item * chore: remove fetch token from e invocie settings * fix: imports * fix: error handling * feat: update timeline on einvoice actions * fix: qrcode image size * fix: exclude intra company transactions * fix: eway bill test * fix: ewaybill mandatory conditions * chore: add tests * fix: returning condition * feat: log e-invocing requests * chore: add ack date and ack no field for print formats * fix: sider issues * feat: show e-invoice preview before IRN generation * fix: use as_list for error message * fix: minor ux issues * fix: dialog is undefined * fix: error handling * feat: add docs link to e invoice settings * feat: multiple gstins for e invoicing * fix: uncomment test condition * fix: remove test pincode * fix: cannot cancel irn without submitting sales invoice * chore: code cleanup * fix: sider issues * fix: e invoice request log permissions Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-25 10:26:43 +05:30
rohitwaghchaure	4e9361f74b	Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin ... fix: multiple pricing rule with margin type as Percentage is not working	2020-12-25 09:33:39 +05:30
Rohit Waghchaure	ba5b603a0b	fix: multiple pricing rule with margin type not working	2020-12-24 22:49:38 +05:30
Rohit Waghchaure	aea62da544	fix: multiple pricing rule with margin type not working	2020-12-24 22:44:31 +05:30
rohitwaghchaure	b9352b729a	Merge pull request #24063 from rohitwaghchaure/fixed-job-card-cacncel-flow-develop ... fix: don't cancel job card if manufacturing entry has made	2020-12-24 17:46:45 +05:30
rohitwaghchaure	630258f493	Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop ... fix: do not manufacture same serial no multiple times	2020-12-24 17:46:26 +05:30
Rucha Mahabal	d013d94e8d	Merge branch 'develop' into fix-therapy-type-filter	2020-12-24 17:44:25 +05:30
Rohit Waghchaure	304100db3b	fix: don't cancel job card if manufacturing entry has made	2020-12-24 16:36:37 +05:30
Rohit Waghchaure	ed20819432	fix: travis	2020-12-24 16:24:10 +05:30
Anurag Mishra	527a156512	feat: validated employees whose salary has been already precessed	2020-12-24 13:59:12 +05:30
Jannat Patel	29dd7e5fc4	Merge branch 'develop' into partially-submit-drop-ship-items-issue	2020-12-24 13:44:42 +05:30
Rucha Mahabal	9fe7f235d0	fix: Do not cancel reference document on Quality Inspection cancellation (#24198)	2020-12-24 11:03:48 +05:30
Rucha Mahabal	d2f91e8c11	fix: Do not cancel reference document on Quality Inspection cancellation (#24197)	2020-12-24 11:03:36 +05:30
Deepesh Garg	aa7ab211be	Merge pull request #24171 from deepeshgarg007/breadcrum_schema ... fix: Add breadcrumbs to item group page	2020-12-23 16:52:48 +05:30
Shivam Mishra	1ab4f09ee9	fix: use file_url to save file and not file name	2020-12-23 15:18:41 +05:30
Anurag Mishra	d884216c6f	fix: leave policy dashboard fix ... fix: leave policy dashboard fix	2020-12-23 13:19:12 +05:30
Anurag Mishra	d556847fca	fix: allow addition and removal of employee in payroll Entry	2020-12-23 12:59:48 +05:30
Nabin Hait	0411a43c6e	fix: set finished good item rate based on qty	2020-12-23 12:14:41 +05:30
Afshan	adf9b49e14	fix: sal slip popup error	2020-12-23 11:39:38 +05:30
Saqib Ansari	09c6842199	fix: accounting entries of asset when submitting purchase receipt	2020-12-23 11:29:26 +05:30
Tim Gates	1fb412e3f6	docs: fix simple typo, udpate -> update ... There is a small typo in erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py. Should read `update` rather than `udpate`.	2020-12-23 11:39:37 +11:00
barredterra	df8ea19406	fix: whitespace	2020-12-22 17:34:31 +01:00
barredterra	2acd8cbc02	fix: sider	2020-12-22 17:34:22 +01:00
Jannat Patel	b07914d185	Merge branch 'develop' into project-template-and-tasks	2020-12-22 20:47:30 +05:30
pateljannat	8dec1c142f	fix: removed unused imports	2020-12-22 19:55:31 +05:30
Deepesh Garg	e5e2ad646a	fix: Test Cases	2020-12-22 19:53:07 +05:30
pateljannat	6cf018c762	fix: holiday update in tests	2020-12-22 19:40:41 +05:30
pateljannat	4ebee5014e	feat: aholiday check before setting start and end date in task	2020-12-22 18:14:46 +05:30
barredterra	511be6466d	Revert "fix: fail silently" ... This reverts commit 6900a79421.	2020-12-22 11:43:33 +01:00
barredterra	a69021018a	test: add test for accounts controller	2020-12-22 11:38:09 +01:00
barredterra	5adbe49ca6	refactor: translation syntax	2020-12-22 11:37:43 +01:00
barredterra	6900a79421	fix: fail silently	2020-12-22 11:37:13 +01:00
Deepesh Garg	e1320c7e47	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-22 13:32:59 +05:30
Deepesh Garg	468f67a4de	fix: Add parent for all-products page	2020-12-22 12:44:09 +05:30
Mohammad Hasnain Mohsin Rajan	61b92b312a	Merge branch 'develop' into fix-analytics-reports	2020-12-22 12:41:43 +05:30
pateljannat	3a26f26671	fix: get_doc to avoid modified error	2020-12-22 11:56:59 +05:30
Anurag Mishra	0a1390a7ca	fix: leave policy dashboard fix and roles (#24170)	2020-12-22 11:16:36 +05:30
Ganga Manoj	090783804b	fix: Improve month_to_date computation	2020-12-21 23:52:05 +05:30
Ganga Manoj	c36cab81f2	fix: Update year_to_date and month_to_date field labels to show company currency	2020-12-21 23:46:02 +05:30
pateljannat	9466e42e70	fix: change request modifications	2020-12-21 20:52:20 +05:30
Nabin Hait	bd4bdca6ad	feat: Repost item costing (#24183) ... * Repost item valuation (#24031) * feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis * fix: removed duplicate field from pos profile	2020-12-21 20:03:59 +05:30
Nabin Hait	a77b8c9fcc	Repost item valuation (#24031) ... * feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis	2020-12-21 14:45:50 +05:30
marination	eae31f02cc	fix: Sider (missing semi-colons)	2020-12-21 13:58:44 +05:30
Shivam Mishra	0e222173ea	fix: don't set primary action if workflow is set	2020-12-21 13:44:03 +05:30
marination	68f91c9640	chore: Added tests for new ux ... - Test for value based inspection - tweaks in test for formula based inspection - tweaks in create_quality_inspection as status in child row is auto set now	2020-12-21 12:24:45 +05:30
marination	0c4f97368d	chore: UX improvement ... - Removed 'single reading' checkbox, unnecessary - Removed 'Mean' field and added computed mean to formula data - Changed 'Value Based' to 'Non-Numeric' - Re-arranged fields	2020-12-21 11:44:48 +05:30
Ganga Manoj	ddd9fe49fc	feat: Add month_to_date field	2020-12-18 23:58:05 +05:30
Ganga Manoj	59fbf702da	feat: Compute month_to_date	2020-12-18 23:52:11 +05:30
Ganga Manoj	1b1df6b6bc	feat: Add month_to_date field	2020-12-18 23:51:05 +05:30
marination	d6277cdc7f	feat: Value Based and Numeric Quality Inspection ... - Acceptance Formula is optional - Choose between Value based and Numeric QI - If numeric, select single or multiple readings - Added Min, Max and Mean Values for numeric inspection to avoid formula usage - Deprecated code cleanup in js file	2020-12-18 21:37:19 +05:30
Ganga Manoj	89a02d7d3f	feat: Changed Fiscal Year to Payroll Period	2020-12-18 15:31:45 +05:30
Afshan	a81519f557	fix: error popup for submitted doc	2020-12-18 11:16:01 +05:30
Ganga Manoj	9f1e018e4f	feat: Compute year_to_date	2020-12-18 01:35:27 +05:30
Ganga Manoj	04f48a011d	feat: Add year_to_date field	2020-12-18 01:31:00 +05:30
pateljannat	b8e656512e	fix: test cleanup	2020-12-17 20:22:06 +05:30
Deepesh Garg	e77e3aa36d	fix: Typo in tax category doctype query	2020-12-17 18:49:58 +05:30
Deepesh Garg	b074334dcf	fix: Typo in tax category doctype query	2020-12-17 18:46:59 +05:30
pateljannat	79b71462cb	fix: patch	2020-12-17 18:21:34 +05:30
Deepesh Garg	5a06908bbc	fix: Add breadccrumbs to item group page	2020-12-17 17:38:53 +05:30
pateljannat	09f0e9111d	fix: patch	2020-12-17 17:20:21 +05:30
Anurag Mishra	611b42733b	fix: leave policy dashboard fix and roles	2020-12-17 16:34:15 +05:30
Anurag Mishra	5e8e0037d6	Merge branch 'develop' into do-not-manufacture-same-serial-no-two-develop	2020-12-17 16:01:42 +05:30
Anurag Mishra	7e641f457c	Merge pull request #24166 from scmmishra/appointment-fix ... fix: wrap assignees in a list	2020-12-17 16:00:48 +05:30
pateljannat	2dbb1d6bc7	fix: indentation	2020-12-17 15:49:52 +05:30
Shivam Mishra	1872e2c1ac	fix: wrap assignees in a list	2020-12-17 14:29:52 +05:30
Deepesh Garg	5432ee3364	Merge pull request #24095 from frappe/skr04_equity_dev ... feat: separate equity tree in CoA SKR04	2020-12-17 12:37:28 +05:30
Deepesh Garg	51892efd60	fix: Translation issues	2020-12-17 12:35:22 +05:30
Deepesh Garg	f48296ddf0	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-17 12:20:16 +05:30
Deepesh Garg	6f99c0850c	fix: Linting Issues	2020-12-17 12:19:58 +05:30
pateljannat	2f4c88b228	Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks	2020-12-17 11:56:06 +05:30
pateljannat	f2bff8e220	fix: patch relaod doctype	2020-12-17 11:54:59 +05:30
Deepesh Garg	d6cd02d29d	fix: Add tests	2020-12-17 09:21:24 +05:30
Deepesh Garg	5a2030c2f2	fix: Add server side methods and other fixes	2020-12-17 09:21:11 +05:30
Rucha Mahabal	f1854f9196	Merge branch 'develop' into fix-therapy-type-filter	2020-12-17 08:46:39 +05:30
Rohit Waghchaure	c9f63accdd	fix: do not manufacture same serial no multiple times	2020-12-17 00:18:17 +05:30
Deepesh Garg	a9db5a200f	Merge pull request #24160 from deepeshgarg007/tax_template_update_customer_v13 ... fix: Tax template update on customer address change	2020-12-16 21:51:01 +05:30
Deepesh Garg	ad59726f20	fix: Tax template update on customer address change	2020-12-16 20:51:59 +05:30
Jannat Patel	28098d6f93	Merge branch 'develop' into project-template-and-tasks	2020-12-16 20:09:27 +05:30
Rucha Mahabal	21168eab7f	fix: Remove patch for setting next date in Subscription (#24158)	2020-12-16 19:39:34 +05:30
pateljannat	2528d5ee15	fix: tests	2020-12-16 18:29:49 +05:30
Rucha Mahabal	23d6afe43a	fix: Auto Repeat Import (#24157)	2020-12-16 18:21:08 +05:30
Prssanna Desai	230bc1f2d8	Merge pull request #24155 from prssanna/job-card-gantt-version-13 ... fix: override field_map for job card gantt	2020-12-16 17:02:34 +05:30
prssanna	6273d3ada6	fix: override field_map for job card gantt	2020-12-16 17:01:20 +05:30
Prssanna Desai	421bfee874	Merge branch 'develop' into job-card-gantt-v13	2020-12-16 16:59:50 +05:30
prssanna	ff59f18012	fix: override field_map for job card gantt	2020-12-16 16:56:30 +05:30
pateljannat	d44f45c57b	fix: sider issues	2020-12-16 16:28:09 +05:30
hasnain2808@gmail.com	2da0035a0f	Merge branch 'develop' into fix-analytics-reports	2020-12-16 16:14:23 +05:30
Rucha Mahabal	f2a431d866	fix: filter Therapy Types and Therapy Plan in Patient Appointment	2020-12-16 16:09:58 +05:30
Rucha Mahabal	5a8a52b9c6	fix: Therapy Type and Therapy Plan field visibility in Patient Appointment	2020-12-16 15:54:06 +05:30
Deepesh Garg	924f99bead	fix: Help message	2020-12-16 15:42:50 +05:30
Deepesh Garg	4638f604ed	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-16 14:59:30 +05:30
Rucha Mahabal	b184d43e75	refactor: Auto Repeat next schedule date function params (#23959) ... * refactor: Auto Repeat next schedule date function params * refactor: Auto Repeat next schedule date function params	2020-12-16 14:51:42 +05:30
hasnain2808@gmail.com	9962ba86d0	fix: charts not displaying when tree_type changed	2020-12-16 14:41:04 +05:30
pateljannat	87b477a311	feat: patch for project template tasks	2020-12-16 13:37:21 +05:30
Deepesh Garg	bc462fa140	Merge pull request #24146 from deepeshgarg007/tax_template_update_customer ... fix: Tax template update on customer address change	2020-12-16 13:02:00 +05:30
Deepesh Garg	96a5e4effa	fix: Tax template update on customer address change	2020-12-16 13:00:55 +05:30
Rucha Mahabal	02ebc9a11e	Merge branch 'develop' into patient-history-enhancements	2020-12-16 12:51:45 +05:30
Leela vadlamudi	29778e2fba	feat: Voice Call Settings doctype added (#24126)	2020-12-15 21:23:17 +05:30
Mohammad Hasnain Mohsin Rajan	c553453825	fix: user is not a field (#24129)	2020-12-15 16:29:10 +05:30
pateljannat	a6fef7ae6b	feat: parent-child relation tasks	2020-12-15 11:50:18 +05:30
pateljannat	caf67e608f	fix: tests	2020-12-15 10:00:31 +05:30
pateljannat	23f0debf88	fix: tests	2020-12-15 10:00:21 +05:30
Rucha Mahabal	85213fa8cb	fix(Asset): set current asset value before calculating difference amount (#24119)	2020-12-15 09:32:02 +05:30
Afshan	89d14fdf68	fix: minor ui changes (#24125) ... * fix: minor ui changes * fix: slider	2020-12-15 09:31:30 +05:30
Afshan	58e8e06ab7	fix: retention filters (#24123) ... * fix: retention filters * fix: slider	2020-12-15 09:17:17 +05:30
Afshan	e64718b2ae	fix: selecting salary component (#24121)	2020-12-15 09:16:27 +05:30
Nabin Hait	13dc63499a	Merge branch 'develop' into version-13-beta-pre-release	2020-12-15 09:06:27 +05:30
Deepesh Garg	46f3c65b00	feat: Multi currency in landed cost voucher	2020-12-14 23:09:19 +05:30
pateljannat	f9751f1f95	feat: project template having dependent tasks	2020-12-14 16:20:02 +05:30
Marica	406af27b9e	Merge branch 'develop' into putaway	2020-12-14 13:07:50 +05:30
Anurag Mishra	0fc4bb02d1	Merge pull request #24100 from hasnain2808/add-fb-to-je ... fix(asset_val_adj): finance book not getting added in journal Entry of asset value adjustment	2020-12-14 12:36:03 +05:30
marination	c47d38dc18	chore: Stock Entry Tests and fixes ... - Maintain item-warehouse wise rules for Stock Entry Material Transfer - Test cases for Stock Entry with more use cases - Sider fixes	2020-12-14 12:12:49 +05:30
Deepesh Garg	05e8479521	Merge pull request #24117 from deepeshgarg007/gstr_opening_invoices ... fix: Opening invoices in GSTR-1 report	2020-12-14 11:14:23 +05:30
Mohammad Hasnain Mohsin Rajan	b59d573009	Merge branch 'develop' into add-fb-to-je	2020-12-14 11:13:46 +05:30
Deepesh Garg	c838682188	fix: Opening invoices in GSTR-1 report	2020-12-14 10:35:16 +05:30
rohitwaghchaure	cf5f895617	Merge pull request #24110 from marination/status-updater-same-source-target-tables ... fix: Same source and target tables in Status Updater's update query	2020-12-13 21:29:19 +05:30
rohitwaghchaure	d06ac9a958	Merge pull request #24114 from rohitwaghchaure/shipping-charges-not-added-in-invoice-develop ... fix: shipping chanrges not sync in erpnext from shopify	2020-12-13 13:31:39 +05:30
rohitwaghchaure	8b8ef8d364	Merge pull request #24116 from rohitwaghchaure/fixed-stock-entry-multi-consumption-develop ... fix: incorrect stock quantity if 'Allow Multiple Material Consumption…	2020-12-13 13:31:25 +05:30
rohitwaghchaure	e5e6d8297b	Merge pull request #24115 from rohitwaghchaure/delete-receive-at-warehouse-entry-develop ... fix: delete Receive at Warehouse entry on cancellation of Send to War…	2020-12-13 12:33:50 +05:30
Nabin Hait	3423d94145	fix: Fixed merge conflict	2020-12-12 21:12:56 +05:30
Deepesh Garg	ced3b13492	fix: Check for paid field	2020-12-12 19:31:05 +05:30
Deepesh Garg	68fce6d029	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix	2020-12-12 19:28:50 +05:30
Rohit Waghchaure	edb99d4e53	fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled	2020-12-12 16:03:07 +05:30
Rohit Waghchaure	5bfd6831c4	fix: delete Receive at Warehouse entry on cancellation of Send to Warehouse entry	2020-12-12 16:00:28 +05:30
Rohit Waghchaure	67dfe5db0d	fix: shipping chanrges not sync in erpnext from shopify	2020-12-12 15:59:17 +05:30
Deepesh Garg	f17ea2ccab	fix: Accounting for internal transfer invoices within same company (#24021) ... * fix: Accounting for internal transfer invoices within same company * fix: warehouse fetching * fix: Linting issues * fix: GL entry fixes and validation for intercompany account * fix: Account naming changes and other fixes * fix: Add test for internal transfer * fix: Test Case * fix: Add description for fields * fix: Commonfied code * fix: Map warehouse and serial no	2020-12-11 21:30:39 +05:30
Rohit Waghchaure	3eea3c6c95	fix: Table 'tabStock Entry Detail' is specified twice	2020-12-11 18:45:39 +05:30
Mohammad Hasnain Mohsin Rajan	f8d6726990	fix(acc recv report): columns mismatch (#24109) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-12-11 13:28:23 +05:30
Jannat Patel	79fe7758d4	Merge branch 'develop' into partially-submit-drop-ship-items-issue	2020-12-11 11:57:09 +05:30
pateljannat	06961a261e	fix: conflicts	2020-12-11 11:46:43 +05:30
pateljannat	fa72671929	fix: partial order for drop ship	2020-12-11 11:16:54 +05:30
Mohammad Hasnain Mohsin Rajan	f60e303ac7	Merge branch 'develop' into add-fb-to-je	2020-12-11 09:35:36 +05:30
pateljannat	6574404536	Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks	2020-12-10 20:55:40 +05:30
pateljannat	e15ef1e19f	fix: corrected tests	2020-12-10 20:55:25 +05:30
Marica	d857d70a96	Merge branch 'develop' into stock-entry-for-medication-entries	2020-12-10 20:44:10 +05:30
Marica	3bc69e59ec	Merge branch 'develop' into update-barcode-if-scan-barcode-used	2020-12-10 18:05:00 +05:30
Mohammad Hasnain Mohsin Rajan	8abe7b91fe	fix: linting ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin Rajan	ce1ca28296	fix: linting ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-12-10 17:48:05 +05:30
Anurag Mishra	fcf0a733ac	Merge branch 'develop' into add-fb-to-je	2020-12-10 17:30:38 +05:30
Saqib	7acb42d6df	feat(POS): hide images & auto add item checkbox (#24102)	2020-12-10 16:22:01 +05:30
Deepesh Garg	009721a3b2	Merge pull request #24035 from nextchamp-saqib/abs-value-in-pf ... fix: get formatted value in 'taxes' print template	2020-12-10 15:33:41 +05:30
Raffael Meyer	7f387452ca	Merge branch 'develop' into skr04_equity_dev	2020-12-10 10:51:55 +01:00
Mohammad Hasnain	f82997e3c3	fix(asset_val_adj): fb not getting added in je	2020-12-10 13:34:01 +05:30
Saqib	dc3e9f4216	fix: asset with value zero doesn't show up in fixed asset register (#24091)	2020-12-10 12:30:15 +05:30
barredterra	52d37edf98	feat: separate equity tree in CoA SKR04	2020-12-09 17:57:29 +01:00
Deepesh Garg	6e58260d26	Merge pull request #24082 from ruchamahabal/fix-item-details-in-reports ... feat(reports): get item details from Item document instead of the Transactions	2020-12-09 18:28:28 +05:30
Deepesh Garg	249595a2d8	fix: Sider Issues	2020-12-09 18:13:23 +05:30
Jannat Patel	ad705d04a7	Merge branch 'develop' into project-template-and-tasks	2020-12-09 18:12:25 +05:30
Marica	4efbee57f3	Merge branch 'develop' into cont-temp	2020-12-09 17:33:26 +05:30
pateljannat	f936e8a334	fix: sider issues fixed	2020-12-09 17:09:22 +05:30
marination	a5d8d32775	chore: Test and fixes ... - Tests as per new design flow - Fixed duplicate data bug in Warehouse Capacity Summary - Set Amount currently on applying rule in client side - Apply rules on server side before validate	2020-12-09 16:27:18 +05:30
Deepesh Garg	c41fb7556b	fix: Add test case for batch pricing	2020-12-09 15:55:39 +05:30
pateljannat	811629a961	feat: tasks in project template and tests	2020-12-09 15:52:05 +05:30
Deepesh Garg	bc0a2859e4	fix: Rate for items with no batch	2020-12-09 12:40:09 +05:30
Mohammad Hasnain Mohsin Rajan	deaf2e80cb	fix: linting	2020-12-09 12:36:14 +05:30
Mohammad Hasnain	69514c4761	fix: scan barcode does not update barcode item field in sales order	2020-12-09 12:10:28 +05:30
Deepesh Garg	91e1136d2c	feat: Batch wise item pricing	2020-12-08 22:53:03 +05:30
marination	0f3cfc502b	feat: Trigger rule application from client side ... - Table is reset and overwritten with applied rules on checkbox trigger - Sider fixes	2020-12-08 19:44:29 +05:30
rohitwaghchaure	08d57e3530	Merge pull request #24074 from hasnain2808/required-qty-multiplying-fix ... fix(Production Planning Report): incorrect required_qty	2020-12-08 12:52:12 +05:30
Rucha Mahabal	fa950662b9	fix: import statement	2020-12-08 12:32:19 +05:30
Rucha Mahabal	db0bbfac97	feat(reports): get item details from Item doctype instead of the Transaction	2020-12-08 12:20:07 +05:30
Marica	0b68243979	Merge branch 'develop' into putaway	2020-12-08 11:44:00 +05:30
Mohammad Hasnain	59dffb96b3	fix(Production Planning): incorrect required qty	2020-12-08 11:13:00 +05:30
pateljannat	c82b52855c	fix: template filter for tasks	2020-12-08 11:07:59 +05:30
Afshan	727b2f9b97	fix: throw an error when no pos profile exist (#24025) ... * fix: throw an error when no pos profile exist * fix: throw an error when no pos profile exist * fix: test cases * fix: tests * fix: test * fix: space as indent * fix: travis	2020-12-08 09:45:19 +05:30
Walstan Baptista	0baebbdafe	fix: added Purchase Order to Global Search (#24055)	2020-12-08 09:43:29 +05:30
Anuja Pawar	d369710c65	fix: fixed home desk page (#24075) ... * fix: fixed home desk page * fix: suggested changes Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: suggested changes Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-12-08 09:40:08 +05:30
Jannat Patel	797f0cfa61	fix: sales invoice add button from sales order dashboard (#24077) ... Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-12-08 09:33:13 +05:30
Afshan	749d36a4dd	fix: double exception in payroll (#24078)	2020-12-08 09:32:04 +05:30
Afshan	01eca12fa7	fix: overriding po (#24022) ... * fix: overriding po * fix: po * fix: refactor condition * fix: condition * fix: missing code	2020-12-08 09:27:56 +05:30
marination	fac4035f23	feat: Apply Putaway Rules within transaction itself ... - Added checkbox 'Apply Putaway Rule' in PR and SE - Added link to rule in child tables - Rule is applied on Save - Validation for over receipt - Apply Rule on Stock Entry as well for Material Transfer and Receipt	2020-12-07 21:35:49 +05:30
pateljannat	71b1a0ca7d	fix: cancelling both test po created	2020-12-07 19:09:29 +05:30
pateljannat	32e77d73cf	fix: added supplier to second item in test	2020-12-07 17:39:37 +05:30
pateljannat	89624ad622	fix: sider issue fixed	2020-12-07 16:50:03 +05:30
pateljannat	5597e386b4	fix: added test for drop ship partial order	2020-12-07 15:53:45 +05:30
pateljannat	c32ac223ed	feat: adding task field in project template	2020-12-07 14:53:15 +05:30
Marica	654a71e35a	Merge pull request #24065 from Anuja-pawar/company_fiscal_year_fix ... fix: Added TDS Payable account number and an error message	2020-12-07 13:21:18 +05:30
Marica	724d03ec68	Merge branch 'develop' into fix-si-pos-return	2020-12-07 12:01:19 +05:30
Kenneth Sequeira	85af44b7ed	fix: client side UX fixes	2020-12-07 11:18:20 +05:30
Anuja P	550cb9c78f	fix: suggested changes	2020-12-07 11:11:00 +05:30
Kenneth Sequeira	00510e7f12	Merge branch 'cont-temp' of https://github.com/kennethsequeira/erpnext into cont-temp ... pull latest	2020-12-07 10:56:30 +05:30
Anuja P	47b4b7009d	Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix ... Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix	2020-12-07 10:55:44 +05:30
Kenneth Sequeira	5f95ba57a8	fix: py code clean up and doc help	2020-12-07 10:45:13 +05:30
Rucha Mahabal	063be69b58	fix(patch): set update_modified to False while setting issue/opportunity metrics (#24073)	2020-12-07 10:41:05 +05:30
Marica	13dcd18ede	Merge branch 'develop' into cont-temp	2020-12-07 09:53:23 +05:30
Deepesh Garg	6c35767995	Merge pull request #24069 from deepeshgarg007/gstr_3b_report_ims ... fix: Show tax amount in base currencies	2020-12-06 23:24:24 +05:30
rohitwaghchaure	0a672b69e6	Merge pull request #22859 from marination/pr-dn-return ... feat: Return tracking in PR/DN	2020-12-06 22:43:34 +05:30
Deepesh Garg	cfeca0dc87	fix: Show tax amount in base currencies	2020-12-06 18:28:30 +05:30
Michelle Alva	c9067e40cb	fix: Change validation message ... grammatical fix	2020-12-06 10:48:32 +05:30
Deepesh Garg	2d1cfae596	fix: fieldname	2020-12-05 22:44:45 +05:30
Deepesh Garg	ceefd66090	Merge pull request #24041 from saurabh6790/v13-patch-fixes-1 ... fix: reload doctype number card link	2020-12-05 22:43:46 +05:30
Anuja P	b6cf75d2a8	fix: error messsage indent fix	2020-12-05 22:25:17 +05:30
Anuja P	d3157c9347	Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix ... Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix	2020-12-05 22:21:03 +05:30
Marica	3b2da41f84	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-12-05 17:04:26 +05:30
Anuja P	2e4faf96f2	fix: Added TDS Payable account number and an error message	2020-12-05 13:36:43 +05:30
Deepesh Garg	eb951f3996	Merge pull request #24060 from deepeshgarg007/template_update ... fix(India): Tax template update on supplier change	2020-12-05 12:38:10 +05:30
Marica	067f35df26	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-12-04 21:13:23 +05:30
marination	c866abca56	fix: (travis) Disable update stock for deferred accounting item's Sales Invoice	2020-12-04 20:12:52 +05:30
Anurag Mishra	26b3328af7	fix: leave policy assignment patch (#24061)	2020-12-04 19:50:24 +05:30
pateljannat	7fef622b13	fix: drop ship partial order fixed	2020-12-04 19:18:36 +05:30
Deepesh Garg	a767085276	fix: Tax template update on supplier	2020-12-04 18:07:46 +05:30
Marica	afc517b8bf	Merge branch 'develop' into link-to-mr	2020-12-04 16:30:40 +05:30
Anuja Pawar	8a8a91c6b9	Merge branch 'develop' into issue_customer_filter	2020-12-04 15:26:40 +05:30
Anuja P	2e48cf7308	Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter ... Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter	2020-12-04 15:19:06 +05:30
Kenneth Sequeira	c4eb41c92b	fix; styling for sider	2020-12-04 15:00:22 +05:30
Anuja P	931f2e73a7	fix: sider changes	2020-12-04 14:57:23 +05:30
Anuja Pawar	84166a931e	Merge branch 'develop' into issue_customer_filter	2020-12-04 13:33:18 +05:30
marination	6a2431586e	fix: Make new Customers for account missing test and set company	2020-12-04 13:31:36 +05:30
Rucha Mahabal	edee530d4c	fix: paid amount in Sales Invoice POS return resets to 0	2020-12-04 12:13:26 +05:30
Rohit Waghchaure	28e86cf183	fix: pricing rule with transaction not working for additional product	2020-12-04 11:57:56 +05:30
Deepesh Garg	7b2d518059	fix: Dimension filters in accounting reports	2020-12-04 11:28:26 +05:30
Anuja P	0139109de2	fix: consistency check	2020-12-04 11:28:13 +05:30
Marica	4bf951a85b	Merge branch 'develop' into v13-patch-fixes-1	2020-12-03 19:55:03 +05:30
Anuja P	25e058833a	fix: sider changes	2020-12-03 18:13:24 +05:30
Anuja P	26cc662a78	feat: added filter for customer field	2020-12-03 17:45:34 +05:30
Rohit Waghchaure	8474476316	fix: incorrect balance value in stock balance report	2020-12-03 13:43:11 +05:30
Kenneth Sequeira	131e46bab7	chore: add help section for Jinja	2020-12-02 21:37:55 +05:30
Kenneth Sequeira	9abc685504	feat: add jinja templating in contract template	2020-12-02 21:13:50 +05:30
Joshua Angelo Bienes	324622bd2a	Merge branch 'develop' into shipment_with_integration	2020-12-02 19:21:32 +08:00
marination	523c464a92	fix: Test Payment Based on Leave Application (Travis)	2020-12-02 16:01:35 +05:30
jbienesdev	8e68f128c1	fix: travis build error ... - Removed shipment notification and subscription files - Minor changes on shipment field configuration - Add shipment to desk	2020-12-02 08:56:49 +00:00
Deepesh Garg	12b45b3f2a	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-02 12:46:23 +05:30
jbienesdev	b4b542d1c3	chore: linter issues and sider checks	2020-12-02 07:15:16 +00:00
jbienesdev	99361b4a9e	chore: remove notification details section	2020-12-02 07:15:14 +00:00
jbienesdev	28055f483d	fix(shipment): change shipment test and refactor shipment.js	2020-12-02 07:15:13 +00:00
jbienesdev	ac3c1f1493	chore: remove packlink, letmeship, and sendcloud files	2020-12-02 07:15:11 +00:00
jbienesdev	000494f548	fix(shipment): apply code review	2020-12-02 07:15:05 +00:00
jbienesdev	1c9410e5e8	feat(shipment): Shipment Doctype with Integrations	2020-12-02 07:14:58 +00:00
Deepesh Garg	59820004b8	fix: Exception naming	2020-12-02 12:34:59 +05:30
Deepesh Garg	ab5053ef9c	fix: Accounting dimension import in PCV	2020-12-02 12:34:40 +05:30
Deepesh Garg	d8aeaed6ab	Merge pull request #24039 from rohitwaghchaure/fixed-incorrect-gstr-report-issue ... fix: GSTR B2C report	2020-12-01 20:44:33 +05:30
Saurabh	2e27f074c3	feat: reload doctype number card link	2020-12-01 18:08:04 +05:30
Rohit Waghchaure	1ac040a418	fix: GSTR report	2020-12-01 13:50:01 +05:30
Rucha Mahabal	288853d8f0	Merge branch 'develop' into patient-history-enhancements	2020-12-01 13:44:16 +05:30
Anurag Mishra	0e9eb95b22	Merge branch 'develop' into bom-fix	2020-12-01 13:18:00 +05:30
Leela vadlamudi	a3845a95ed	feat: Introducing telephony module (#24032)	2020-12-01 13:04:53 +05:30
Nabin Hait	029b9c08dd	Update bom.py	2020-12-01 09:33:17 +05:30
Suraj Shetty	ad57eef40c	fix(product-listing): Check if customer exists (#24030) ... - It might happen that perty_name might not always be Customer (it might be Supplier as well)	2020-12-01 09:14:57 +05:30
Afshan	ccf5dc66e2	feat: multi-currency payroll (#23519) ... * feat: multi-currency payroll * fix: refactor and added conditions * fix: uncommented code * style: removed comments * fix: missing argument * style: styling changes * fix: test cases * Update asset_value_adjustment.py * patch: update columns * style: formating * style: formatting * fix: 1st review * fix: refactor * Revert "fix: refactor" This reverts commit eca0e17d11a192d60f249b2af992971c625aec46. reverting to previous state * Revert "fix: 1st review" This reverts commit 7eac48b102157df4353598f73b2ea97308af436a. reverting before 1st review * fix: 2nd review changes * fix: test cases * fix: added call to fetch exchange rate * fix: remove unnecessary code * fix: refactor * fix: refactor patch * fix: refactor * fix: refactor * fix: clear test data * fix: slider * feat: multi-currency payroll * fix: refactor and added conditions * fix: uncommented code * style: removed comments * fix: missing argument * style: styling changes * fix: test cases * patch: update columns * Update asset_value_adjustment.py * style: formating * style: formatting * fix: 1st review * fix: refactor * Revert "fix: refactor" This reverts commit eca0e17d11a192d60f249b2af992971c625aec46. reverting to previous state * Revert "fix: 1st review" This reverts commit 7eac48b102157df4353598f73b2ea97308af436a. reverting before 1st review * fix: 2nd review changes * fix: test cases * fix: added call to fetch exchange rate * fix: remove unnecessary code * fix: refactor * fix: refactor patch * fix: refactor * fix: refactor * fix: clear test data * fix: slider * feat: Added company field in leave encashment and employee benefit * refactor: Refactored multi-currency payroll patch * fix: currency column in salary register * refactor: Refactored code for making bank and return entry against employee advance * fix: minor cleanup * fix: fixed translation * fix: removed salary component type * fix: fixed sider issues * fix: translation and slider * style: formatted msg * fix: fixed slider * fix: travis * fix: refactor * fix: slider * fix: slider * fix: slider * fix: travis * fix: patch * fix: patch * fix: travis * fix: travis * fix: travis * fix: travis * fix: travis * fix: travis * fix: re-run travis * fix: rerun travis * fix: rerun travis * fix: rerun travis * fix: travis rerun * fix: increased throttle_user_limit from 60 to 100 * fix: patch * fix: patch * fix: assign payroll payable account as default payroll payable account in SSA * fix: removed debugger * fix: slider Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-01 09:11:05 +05:30
Anurag Mishra	66e8a12d0f	fix: KeyError 'sourced_by_supplier'	2020-11-30 17:53:28 +05:30
Rucha Mahabal	f6756838ba	fix: patch	2020-11-30 17:51:56 +05:30
Rucha Mahabal	b5b8c5474a	refactor: move call to fetch doctype fields to server-side	2020-11-30 16:09:15 +05:30
Saqib Ansari	19d5074c25	fix: get formatted value in 'taxes' print template	2020-11-30 15:49:00 +05:30
Rucha Mahabal	0d43ea5ebb	refactor: show Patient History feed as per configured date instead of creation	2020-11-30 15:00:42 +05:30
Rucha Mahabal	ed3fc20731	fix: sider issues	2020-11-30 14:56:24 +05:30
Rucha Mahabal	7a69a3367c	Merge branch 'develop' into patient-history-enhancements	2020-11-30 14:16:46 +05:30
Rucha Mahabal	4ee293d2f4	fix: handle non-configured fields	2020-11-30 14:12:48 +05:30
Rucha Mahabal	5e3c51bf7d	refactor: format value using standard formatters	2020-11-30 13:35:00 +05:30
Anurag Mishra	8b6c58d560	Merge pull request #24005 from Anurag810/leave_ledger_patch ... fix: ignore exception during leave ledger creation from patch	2020-11-30 13:26:47 +05:30
Rucha Mahabal	c538a4a31d	refactor: remove medical record creation methods from individual doctypes	2020-11-30 13:22:34 +05:30
Rucha Mahabal	c0fcc807d3	feat: hooks for updating and deleting medical records	2020-11-30 13:22:01 +05:30
marination	724e16bca1	chore: Use JSON style response and use ORM ... - Use JSON style response for report columns - Use ORM instead of frappe.db.sql - Remove returned % from list view	2020-11-30 12:55:30 +05:30
Rucha Mahabal	4097e89f8b	feat: Standard doctype config for Patient History	2020-11-30 12:48:39 +05:30
Rucha Mahabal	f3df5c9f3c	feat: patch to setup standard doctype config in Patient History Settings	2020-11-30 12:16:28 +05:30
Rucha Mahabal	06e7cc2c35	fix: Handle table field rendering in Patient Medical record	2020-11-30 12:01:48 +05:30
Deepesh Garg	8db507bfd9	Merge pull request #24027 from resilient-tech/fix-taxjar ... fix: import taxjar globally in the taxjar_integration module	2020-11-30 11:23:32 +05:30
Deepesh Garg	6302de9290	Merge pull request #23975 from deepeshgarg007/jv_zero_value ... fix: Validation for journal entry with 0 debit and credit values	2020-11-30 10:56:40 +05:30
Deepesh Garg	452cbcd6ea	fix: Update payments directly in Loan Interest Accrual	2020-11-30 10:55:12 +05:30
Rucha Mahabal	4d6d115a4d	feat: date range filter for Patient History	2020-11-29 23:16:12 +05:30
Deepesh Garg	681c0e297c	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix	2020-11-29 23:07:14 +05:30
Rucha Mahabal	4af3d4e4bb	fix: feed not visible when filter is reset	2020-11-29 22:43:56 +05:30
Rucha Mahabal	fc1e352adf	feat: Doctype filter for Patient History	2020-11-29 22:38:14 +05:30
Deepesh Garg	2d5530da96	fix: Invoice discounting test	2020-11-29 22:17:47 +05:30
Sagar Vora	38e4635a10	fix: import taxjar globally in the taxjar_integration module	2020-11-29 20:26:26 +05:30
Rucha Mahabal	cbdbb9e65d	chore: code clean-up	2020-11-28 23:58:00 +05:30
Rucha Mahabal	a75f79762f	feat: Link for individual documents in Patient History	2020-11-28 23:09:07 +05:30
Rucha Mahabal	c91e03c891	feat: Create Patient Medical Record on configured doctype submission	2020-11-28 20:24:06 +05:30
Rucha Mahabal	f2932d7208	feat: set date field in Settings for Patient Medical Record	2020-11-28 19:19:58 +05:30
Rucha Mahabal	2c114053ad	feat: Patient History Settings	2020-11-27 15:05:28 +05:30
Rucha Mahabal	cf012ca9c3	fix: show stock entry button only if update stock is enabled	2020-11-27 12:39:33 +05:30
Rucha Mahabal	f5eddce407	test: Inpatient Medication Entry Drug Shortage	2020-11-27 12:27:17 +05:30
Rucha Mahabal	ac8ee249d5	feat: Medication doctypes added to Desk page and Patient dashboard	2020-11-26 22:11:20 +05:30
Rucha Mahabal	54228691e7	feat(IPME): Button to create Stock Entry for Drug Shortage	2020-11-26 16:38:28 +05:30
marination	1087d97c03	feat: Warehouse Capacity Summary ... - Added Page Warehouse Capacity Summary - Added Page to Desk and Putaway List View - Reused Item Dashboard/Stock Balance page render code - Added naming series to Putaway Rule	2020-11-26 10:45:44 +05:30
Marica	307bd01504	Merge branch 'develop' into pr-dn-return	2020-11-25 17:24:03 +05:30
Anurag Mishra	755b773616	feat: Leave policy assignment (#23112) ... * feat: Leave Policy Assignment * feat: linking with leave allocation and valiations * style: removed old code from leave period * feat: Bulk Leave policy Assignment and grant Leaves * fix: overlap validation * feat: earned leaves based on joining date * feat: automatic grant leave based on leave policy * patch: create leave policy assignment based on employee current leave policy * fix: dependent test cases * test: Leave policy assignment * fix: some enhancement * style: break large function into small function * fix:requested Changes * fix(patch): Handled old Leave allocatioln * fix:codacy * fix: travis and sider,codacy * fix: codacy * fix: codacy * fix: requested changes and sider Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-11-25 16:05:17 +05:30
Anurag Mishra	f32cff1080	feat : Leave type with partial payment (#23173) ... * feat: Partially paid Leaves * feat: some importatnt validation * fix: requested changes * fix: requested changes * fix: travis, sider, codacy * fix: changes requested * test: Partially Paid Leaves	2020-11-25 16:00:15 +05:30
Mohammad Hasnain Mohsin Rajan	90e33e53fd	refactor: Format translation strings (#24004) ... * fix: translation strings * fix: linting	2020-11-25 15:37:54 +05:30
Prssanna Desai	e60a62bde5	fix: function imports in account_balance_timeline.py (#24003)	2020-11-25 15:37:02 +05:30
Mohammad Hasnain Mohsin Rajan	e15b6a91de	Filters for tax templates (#23998) ... * feat: add company filter to tax templates * fix: remove filer from PO because it is from tran * fix: linting * fix: solve translation string issues * fix: remove doctype name	2020-11-25 15:36:41 +05:30
Anurag Mishra	7824e81298	fix: ignore exception during leave ledger creation from patch	2020-11-25 14:54:50 +05:30
Deepesh Garg	1a4390de44	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-11-25 14:51:11 +05:30
Deepesh Garg	6b9dda5f3e	fix: Move filter setup to doctype controllers	2020-11-25 14:49:10 +05:30
Deepesh Garg	92b3449789	fix: Label changes	2020-11-25 14:01:57 +05:30
Deepesh Garg	4e991fe668	fix: Define specific exceptions and fix tests	2020-11-25 13:46:07 +05:30
Deepesh Garg	df065f7044	fix: form layout and naming fixes	2020-11-25 13:44:52 +05:30
Deepesh Garg	6c17b84cae	fix: Replace raw query with ORM	2020-11-25 13:42:16 +05:30
Marica	df17b4ff83	Merge branch 'develop' into pr-dn-return	2020-11-25 10:43:55 +05:30
Rucha Mahabal	6b57cf3285	feat: Quality Inspection on Job Card (#23964) ... * feat: Quality Inspection on Job Card * fix(Job Card): quality inspection filter query * fix: sider issues	2020-11-25 09:17:16 +05:30
Nabin Hait	0508e6bdfa	fix: Added link of bank reconciliation and clearance in accounting desk page (#23809)	2020-11-25 09:16:12 +05:30
Raffael Meyer	fbcc3c1b70	fix: Translatable strings (#23783) ... * fix: start_pattern * fix: translatable strings * fix: add missing semicolon (task) * fix: add missing semicolon (setup_wizard) * fix: text should start on the same line Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * fix: move out HTML element as variable Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * fix: pull out message, translate "Undo". Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * fix: typo Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * fix: text should start on the same line Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * Revert "fix: start_pattern" This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d. Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-11-25 09:11:51 +05:30
Rucha Mahabal	c66bd45ba4	feat: Inpatient Medication Orders Script Report (#23984) ... * feat: Inpatient Medication Orders Script Report * feat: add chart for Inpatient Medication Order Report * feat: add report to Desk Page * feat: added filters for dates and healthcare service unit * test: Inpatient Medication Orders report	2020-11-25 09:09:40 +05:30
Deepesh Garg	a339752ba4	fix: Loan disbursement amount validation (#24000)	2020-11-25 08:54:51 +05:30
Mohammad Hasnain Mohsin Rajan	e4755828c4	fix: template errors in pricing rule (#23999) ... * fix: solve microtemplating errors	2020-11-24 23:31:06 +05:30
rohitwaghchaure	f38abdeac0	Merge pull request #23994 from rohitwaghchaure/bom-stock-project-item-color-develop ... fix: bom stock report color showing always red	2020-11-24 21:16:51 +05:30
marination	2ed80656aa	chore: Code Cleanup ... - Validate capacity < stock level only on new rule - Mention stock uom while validating capacity in new rule - Separate function to format and display unassigned items - Format ORM args	2020-11-24 21:07:56 +05:30
marination	2fbaa5dc58	Merge branch 'putaway' of https://github.com/marination/erpnext into putaway	2020-11-24 17:39:19 +05:30
marination	68a49efc80	chore: Added Putaway Rule to Desk Page and added Priority to List View	2020-11-24 17:38:34 +05:30
Marica	e762bc67eb	Merge branch 'develop' into putaway	2020-11-24 17:28:34 +05:30
rohitwaghchaure	5ab2e6c1ff	Merge pull request #23991 from pateljannat/job-card-operation-field-error ... fix: job card error handling for operations field	2020-11-24 17:05:44 +05:30
Rohit Waghchaure	5a33f2c394	fix: bom stock report color showing always red	2020-11-24 16:59:36 +05:30
rohitwaghchaure	ccd554c19c	Merge pull request #23989 from Anurag810/item-maintain-stock-fixes ... fix: maintain stock can't be changed it there is product bundle	2020-11-24 15:57:01 +05:30
pateljannat	b67ebc7636	fix: job card error handling for operations field	2020-11-24 15:37:30 +05:30
Deepesh Garg	d39ebf248e	Merge pull request #23990 from deepeshgarg007/shopify_order_id_sync ... fix: Old shopify order syncing date	2020-11-24 15:12:53 +05:30
Deepesh Garg	43a830f3f5	fix: Old shopify order syncing date	2020-11-24 15:10:36 +05:30
Anurag Mishra	927106f552	fix: maintain stock can't be changed it there is product bundle	2020-11-24 15:02:52 +05:30
marination	ccbd432b56	chore: Added Tests ... - Fixed Sider Issues - Added perms to Putaway Rule - Added Unit Tests to check warehouse assignment	2020-11-24 12:47:13 +05:30
Deepesh Garg	d07447aa5f	fix: Validation for duplicate Tax Category (#23978) ... * fix: Validation for duplicate Tax Category * Update utils.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-11-24 08:09:17 +05:30
Afshan	6aa6ec1832	fix: clear error message when approval not available (#23971)	2020-11-24 08:01:19 +05:30
marination	0cec1477f2	chore: Format unassigned Items dialog and add freeze message	2020-11-23 19:19:35 +05:30
marination	90598ea19c	chore: Multi UOM support for Putaway ... - Added UOM & conversion factor field in Putaway Rule - Items are split and assigned as per UOM - Handled Whole UOMs too	2020-11-23 17:35:13 +05:30
rohitwaghchaure	b9b8a13393	Merge pull request #23980 from rohitwaghchaure/color-not-showing-in-bom-stock-report-develop ... fix: bom stock report color issue	2020-11-23 16:43:32 +05:30
Rucha Mahabal	9a73a67dcd	Merge pull request #23982 from pateljannat/track-changes-in-stock-settings ... fix: enabling track changes for stock settings	2020-11-23 15:57:48 +05:30
rohitwaghchaure	f9a44000d9	Update bom_stock_report.js	2020-11-23 15:40:06 +05:30
pateljannat	34f381df17	fix: enabling track changes for stock settings	2020-11-23 15:31:08 +05:30
Rohit Waghchaure	610d9ca649	fix: bom stock report color issue	2020-11-23 14:10:55 +05:30
marination	9596276b95	fix: Linter and Sider	2020-11-23 10:32:17 +05:30
Deepesh Garg	20d6143c38	fix: Validation for journal entry with 0 debit and credit values	2020-11-21 12:09:11 +05:30
Jannat Patel	34d07b6306	fix: purchase receipt to purchase invoice bill date mapping (#23967) ... Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-11-20 19:22:35 +05:30
Saurabh	ecc50c8c24	bumped to version 13.0.0-beta.6	2020-11-20 15:22:00 +05:50
rohitwaghchaure	6b53ef7cce	Merge pull request #23947 from rohitwaghchaure/incorrect-delink-serial-no-and-batch ... fix: incorrect delink serial no and batch	2020-11-20 13:45:17 +05:30
Rohit Waghchaure	0b71801462	fix: incorrect delink serial no and batch	2020-11-20 12:59:00 +05:30
marination	c7991f8561	feat: Putaway Rule	2020-11-20 11:53:20 +05:30
Deepesh Garg	06e16eb748	Merge pull request #23941 from pateljannat/place-of-supply-change-issue ... fix: place of supply change on address change	2020-11-20 11:13:19 +05:30
Rohit Waghchaure	ceab692f73	fix: incorrect delink serial no and batch	2020-11-20 00:25:03 +05:30
pateljannat	1d5d863e9a	fix: removing return_taxes condition	2020-11-19 20:11:45 +05:30
Smit Vora	8aeb340dc8	fix: add remarks to sales invoice	2020-11-19 19:18:48 +05:30
Rohit Waghchaure	f0b1670abc	fix: tds test case	2020-11-19 18:40:13 +05:30
Rohit Waghchaure	b6ef59f8e9	fix: incorrect delink serial no and batch	2020-11-19 16:15:32 +05:30
marination	86e03325c3	Merge branch 'develop' of https://github.com/frappe/erpnext into putaway	2020-11-19 14:07:48 +05:30
Jannat Patel	c1187bc1d5	fix: duplicate items validation for POS Invoice when allow multiple items is disabled (#23896) ... * fix: duplicate items validation for POS when allow multiple items in disabled * fix: variable name change for duplicate item validation Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-11-19 13:10:24 +05:30
Nabin Hait	93bb7b0000	Merge branch 'develop' into membership-enhancements-2	2020-11-19 13:05:17 +05:30
Marica	9b897c4073	Merge branch 'develop' into pr-dn-return	2020-11-19 12:21:38 +05:30
pateljannat	cd05b34691	fix: company filter added again	2020-11-19 11:37:08 +05:30
Deepesh Garg	dd7a6d948c	Merge pull request #23672 from rohitwaghchaure/skip-non-apply-tds-invoices-develop ... fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled	2020-11-19 11:27:38 +05:30
Deepesh Garg	ebdc8cee5b	Merge pull request #23825 from igormbq/fix-demo ... fix: location data on Asset to use command(make_demo)	2020-11-19 11:26:12 +05:30
Nabin Hait	2afc0bd87b	Merge branch 'develop' into naming-series-proj	2020-11-19 08:24:32 +05:30
Rucha Mahabal	14514f776b	fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776) ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-19 08:17:16 +05:30
Marica	6dafe1eabf	feat: Formula based Quality Inspection (#23916) ... * feat: Formula based Quality Inspection * chore: Added Test for Formula Based QI reading	2020-11-19 08:12:58 +05:30
rohitwaghchaure	6e974bf246	Merge pull request #23949 from pateljannat/email-digest-user-not-found-issue ... fix: email digest user not found	2020-11-18 23:54:34 +05:30
Smit Vora	bbe4933a52	fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ	2020-11-18 21:00:09 +05:30
pateljannat	188657d05a	fix: email digest user not found	2020-11-18 17:15:54 +05:30
rohitwaghchaure	67ba0462e9	Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking ... fix: Item price duplicate checking	2020-11-18 16:41:48 +05:30
pateljannat	410db04b48	fix: linter issue for translation syntax	2020-11-18 15:57:16 +05:30
Deepesh Garg	a0b17c4ef6	Merge pull request #23836 from pateljannat/purchase-taxes-and-charges-account-name-issue ... fix: correcting description field in taxes and charges for accounts with account number + account name	2020-11-18 15:31:25 +05:30
Deepesh Garg	81f6ef3e1a	Merge pull request #23934 from Anurag810/memebership-fixes ... fix: validation for membership	2020-11-18 15:25:24 +05:30
Deepesh Garg	f0187f6db2	Merge pull request #23447 from hasnain2808/UAE-VAT-Format ... feat: UAE VAT 201 Report	2020-11-18 15:15:00 +05:30
pateljannat	d0c528143f	Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue	2020-11-18 12:52:24 +05:30
pateljannat	8c9b60edfe	fix: reversing previous commits and adding condition in regional controller	2020-11-18 12:51:13 +05:30
Saqib	d82b76fe0a	fix: pos item search includes non stock items (#23914) ... * fix: pos item search includes non stock items * chore: add validation for non stock items	2020-11-18 11:56:49 +05:30
Jannat Patel	96a0c17626	Merge branch 'develop' into place-of-supply-change-issue	2020-11-18 10:27:20 +05:30
Deepesh Garg	69232f8dd1	fix: Loan application link on creating loan	2020-11-17 22:00:41 +05:30
pateljannat	6b10d87d46	fix: place of supply change on address change	2020-11-17 20:34:51 +05:30
Anurag Mishra	3271437314	fix: Handle for custom field IFSC code in Bank remittance report. (#23905) ... * fix: Handel for custom field IFSC code * fix: changes_requested	2020-11-17 17:52:59 +05:30
Anurag Mishra	a77f2ba0de	fix: validation for membership	2020-11-17 15:34:05 +05:30
Deepesh Garg	350972ece4	fix: Account filters	2020-11-17 13:51:58 +05:30
Deepesh Garg	8b4d92d4fc	fix: Disable filters after test	2020-11-17 13:19:29 +05:30
rohitwaghchaure	7aa60d1dea	fix: stock ageing report not working (#23923)	2020-11-17 12:10:27 +05:30
Afshan	c72b693223	fix: Handle the "no leave_allocation found" case (#23922) ... * fix: Handle the "no leave_allocation found" case * fix: format of error msg	2020-11-17 12:08:31 +05:30
Marica	23614b650e	fix: Don't copy terms and discount from SO to PO (#23903) ... * fix: Dont copy terms, discount and required by from SO to PO * fix: Let delivery date and required by date get mapped	2020-11-17 11:12:31 +05:30
Deepesh Garg	6456c3dc24	fix: Linting and test cases	2020-11-17 11:10:00 +05:30
Suraj Shetty	5e8b00207b	fix: Typo (Enchashment > Encashment) (#23919)	2020-11-17 10:58:09 +05:30
pateljannat	642819b955	fix: place of supply change when address changes	2020-11-17 09:47:10 +05:30
Deepesh Garg	4bd52b4842	fix: Add test case	2020-11-16 23:01:36 +05:30
Deepesh Garg	d82c0f3bea	fix: Add disable and mandatory check for accounting dimension filters	2020-11-16 20:32:16 +05:30
Mohammad Hasnain	d2477e6cc5	fix(UAE VAT 201): remove branch parts	2020-11-16 18:47:05 +05:30
Mohammad Hasnain	2e1787300d	feat(UAE VAT 201): emirate according to branch	2020-11-16 17:36:27 +05:30
Anurag Mishra	d6e6c51f37	Merge branch 'develop' into salary_slip_fixes	2020-11-16 15:56:22 +05:30
Anurag Mishra	17d5ce3e41	fix: payroll attendance error (#23887) ... * fix: payroll attendance error * fix: change query to frappe.get_all	2020-11-16 14:20:18 +05:30
Marica	06f522cb27	Merge branch 'develop' into naming-series-proj	2020-11-16 13:32:24 +05:30
Deepesh Garg	0c6319194e	fix: GL Entry validation for dimensions	2020-11-16 13:20:19 +05:30
Mohammad Hasnain	b8d0b546a7	feat(UAE VAT Format): use company address for emir	2020-11-16 12:58:38 +05:30
marination	d51c953c22	chore: Fix Tests, use project name instead of project_name field	2020-11-16 12:48:40 +05:30
rohitwaghchaure	6094d66a6d	Merge pull request #23636 from marination/item-price-pricing-rule-conflict ... fix: Dont overrule Item Price via Pricing Rule Rate if 0	2020-11-16 12:22:30 +05:30
Deepesh Garg	9e9ea96582	fix: linting	2020-11-16 12:03:47 +05:30
Deepesh Garg	1f9b03345d	fix: Remove project filter	2020-11-16 09:55:35 +05:30
Deepesh Garg	f916bc048f	fix: Remove cost center query from doctypes	2020-11-15 22:44:39 +05:30
Deepesh Garg	6e5748e2a3	fix: dimension filter query	2020-11-15 22:43:48 +05:30
Deepesh Garg	96e874bfda	fix: dimension filter query	2020-11-15 22:43:01 +05:30
Deepesh Garg	8b6370bb45	feat: Add accounting dimension filter doctype	2020-11-15 22:41:36 +05:30
Anurag Mishra	69be37f88d	fix: Error handling in Upload Attendance (#23907)	2020-11-15 11:14:35 +05:30
Raffael Meyer	7178df8567	fix: improve UX of DATEV report (#23892) ... * feat(DATEV Settings): button to show report * feat(desk): add DATEV to Reports under Accounting * fix(report DATEV): last calendar month as default * fix: let user create DATEV Settings (Instead of showing an error message.)	2020-11-15 09:45:10 +05:30
Kenneth Sequeira	c5966d3d70	fix: make contract template editable (#23891)	2020-11-15 09:44:36 +05:30
rohitwaghchaure	1c8c1d78e9	fix: default cost center in item master not set in stock entry (#23877) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-15 09:40:44 +05:30
Raffael Meyer	8ff0d0cff6	feat: make account number length configurable (#23845)	2020-11-15 09:34:05 +05:30
Raffael Meyer	4bf09dd02b	fix: fiscal year can be shorter than 12 months (#23838) ... * fix: replace unnecessary SQL query * feat: checkbox "Is Short Year" Also, set checkbox and dates only once. * fix: toggle no longer necessary Date fields use set_only_once. * feat: short years can be less than 12 months * fix: if short year, don't add 12 months to start date * test: short year * fix: move short fiscal year to test records	2020-11-15 09:32:24 +05:30
Marica	188ecd7b39	chore: PO cleanup (#23774) ... * chore: Subcontracting section and items section enhancement - Set target warehouse moved to Items section - Added subcontraction label to supply RM section * chore: PO & PO Item Form Cleanup * chore: PO Get Items from cleanup * fix: Taxes and Charges field visibility * chore: Cleanup * fix: Translation styling	2020-11-15 09:17:42 +05:30
Rohit Waghchaure	30c704a4cb	fix: not able to save bom	2020-11-14 07:15:19 +05:30
rohitwaghchaure	a8eedb057b	Merge pull request #23910 from rohitwaghchaure/not-able-to-save-bom ... fix: not able to save bom	2020-11-14 07:12:22 +05:30
Rohit Waghchaure	4abc5657ab	fix: not able to save bom	2020-11-13 22:18:48 +05:30
Deepesh Garg	a862eb25e6	fix: Make repayment entry only if amount exists	2020-11-13 17:57:57 +05:30
Afshan	3e7f7e3374	Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance ... Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance	2020-11-13 17:04:18 +05:30
Afshan	1a4cafb97d	fix: change query to frappe.get_all	2020-11-13 17:04:05 +05:30
Deepesh Garg	37dc369af9	feat: Sync old shopify orders (#23841) ... * feat: Sync old shopify orders * fix: Old orders syncing by date * fix: Remove unnecessary code * fix: Remove unintentional changes Co-authored-by: Saurabh <saurabh@erpnext.com>	2020-11-13 16:53:35 +05:30
Marica	510b389838	Merge branch 'develop' into naming-series-proj	2020-11-13 13:37:19 +05:30
Afshan	5cffb6c72f	Merge branch 'develop' into fix-payroll-attendance	2020-11-13 13:01:51 +05:30
Deepesh Garg	78690af440	fix: Update only if loans to close	2020-11-12 18:47:34 +05:30
Deepesh Garg	c51b340ddf	fix: Update closed loans	2020-11-12 18:43:43 +05:30
Anurag Mishra	2f5d896f8c	fix: added wrong absent days calculation in salary slip	2020-11-12 16:57:42 +05:30
Deepesh Garg	b58dca8d94	fix: Only update open loans	2020-11-12 13:37:11 +05:30
Jannat Patel	0ea0a7495c	fix: making company address read-only in delivery note (#23890)	2020-11-12 11:10:59 +05:30
marination	c1b0e65f9f	feat: Putaway	2020-11-12 09:54:44 +05:30
Rucha Mahabal	159d3bf14b	Merge branch 'develop' into production-planning-status-filter	2020-11-11 22:36:21 +05:30
Deepesh Garg	5e0f4e2f4b	Merge pull request #23582 from deepeshgarg007/loan_repayment_type_remove ... fix: Loan repayment type option remove	2020-11-11 22:08:41 +05:30
Marica	a8ac101f5c	Merge branch 'develop' into fix-po-no-fetching	2020-11-11 16:55:13 +05:30
Jannat Patel	a9e02bba77	Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue	2020-11-11 16:46:01 +05:30
Mangesh-Khairnar	a91b68c868	feat: add communication channel to communication medium (#23793) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-11-11 16:34:43 +05:30
Afshan	6c95bc5e11	fix: payroll attendance error	2020-11-11 15:13:38 +05:30
Deepesh Garg	a2dc1740df	fix: Use autoname for loan creation	2020-11-11 13:57:10 +05:30
Deepesh Garg	0dc052e635	fix: Return loan type name	2020-11-11 12:57:16 +05:30
Marica	78cccbe015	Merge branch 'develop' into fix-po-no-fetching	2020-11-11 12:18:14 +05:30
Rushabh Mehta	780b6b466b	fix(hooks): include js/css with full path	2020-11-11 11:44:28 +05:30
Marica	2b44f22cf4	Merge branch 'develop' into fix-po-no-fetching	2020-11-11 11:10:34 +05:30
Deepesh Garg	13d1dda74b	fix: Handle loan type naming collisions	2020-11-11 11:07:17 +05:30
Jannat Patel	e008f85816	Merge branch 'develop' into production-planning-status-filter	2020-11-11 10:00:39 +05:30
pateljannat	7e4d115e36	fix: sider issues fixed	2020-11-11 09:52:27 +05:30
Deepesh Garg	73bde45bc5	fix: Pass updated loan type	2020-11-10 22:08:02 +05:30
Deepesh Garg	1c969d64a2	fix: Handle cases where same loan type is used for multiple companies	2020-11-10 20:25:35 +05:30
pateljannat	b648b9cf93	fix: code review changes	2020-11-10 18:50:02 +05:30
pateljannat	d08c91673a	fix: removed unnecessary filter options	2020-11-10 18:04:30 +05:30
Deepesh Garg	101bad3ea1	fix: Remarks for penalty GL Entry	2020-11-10 17:53:50 +05:30
Afshan	1e564bc02d	fix: refactor	2020-11-10 13:23:59 +05:30
Afshan	a75708b02e	Merge branch 'fix-po-no-fetching' of https://github.com/AfshanKhan/erpnext into fix-po-no-fetching	2020-11-10 13:19:53 +05:30
Afshan	1924019531	fix: refactor	2020-11-10 13:19:21 +05:30
Mohammad Hasnain Mohsin Rajan	72adb0b218	Merge branch 'develop' into UAE-VAT-Format	2020-11-10 09:58:45 +05:30
Raffael Meyer	57ce0462d9	fix: remove check for exempt_from_sales_tax	2020-11-09 19:04:46 +01:00
Anurag Mishra	91fdb7aa69	feat: added column cost_center to receivable reports (#23835)	2020-11-09 20:20:05 +05:30
Raffael Meyer	4f880e7454	refactor: zip_and_download (#23844)	2020-11-09 20:17:56 +05:30
Shivam Mishra	f38a1c305e	refactor: show form buttons only if permissions exist (#23851) ... * refactor: show form buttons only if permissions exist * style: add semicolon * fix: typo in conditions	2020-11-09 20:16:28 +05:30
Deepesh Garg	8cfb210dc4	fix: Ignore doctypes on company transaction deleted (#23864)	2020-11-09 20:14:53 +05:30
UrvashiKishnani	bc64f5dfbb	fix: spelling error in filter label (#23867)	2020-11-09 20:14:06 +05:30
Suraj Shetty	e3fe8ff195	Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue	2020-11-09 19:16:23 +05:30
Rucha Mahabal	30d58cc3d7	feat: Consider Holiday List in Student Leave Application and Attendance (#23388) ... * feat: Consider holiday list in Student Attendance and Leave Application * feat: Show Holidays as 'H' in Student Monthly Attendance Sheet * fix: check if date is a holiday in attendance reports * test: skip attendance record creation for holidays * fix: holiday list validation * fix: clean up after test * fix: codacy * fix: show date in user format * fix: remove ununsed imports * fix: sider * fix: test Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-11-09 18:41:03 +05:30
Frappe PR Bot	7915a3acae	chore: Update translations (#23856) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-11-09 18:37:28 +05:30