22459 Commits

Author	SHA1	Message	Date
marination	3568dc75be	fix: Make Company the first filter	2020-05-01 00:01:37 +05:30
Shivam Mishra	d76c5e83ca	fix: elif block error	2020-04-30 22:39:03 +05:30
Deepesh Garg	61363d2ced	fix: Initialize interest_paid as zero	2020-04-30 22:22:44 +05:30
Deepesh Garg	4226191ec7	fix: Loan Closure without loan interest accrual	2020-04-30 22:11:57 +05:30
Mangesh-Khairnar	367b644d9e	fix: delete hub tracked item on unpublish	2020-04-30 20:31:12 +05:30
Saqib	dac51ea1cf	Merge branch 'develop' into validate-paid-inv-msg	2020-04-30 20:08:18 +05:30
Marica	66e99d5767	Merge branch 'develop' into razorpay-subscription	2020-04-30 20:07:05 +05:30
Saqib Ansari	dfa60e0ed8	chore: calculate total row month-wise in sales analytics	2020-04-30 20:06:30 +05:30
Rucha Mahabal	f65fb1fcf8	fix: Move Video Doctype from Education module to Core (#21234) ... * fix: move Video Doctype from Education module to Core * fix: patch to retain Permissions Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-04-30 19:47:18 +05:30
Mangesh-Khairnar	7f374e7ba5	fix: pre-process both the existing and new products	2020-04-30 18:56:27 +05:30
Saqib	4422ffdb22	chore: asset accounts should have company currency (#21524)	2020-04-30 18:39:13 +05:30
Saqib Ansari	10d9974e77	chore: add total row in sales analytics report	2020-04-30 16:28:52 +05:30
Raffael Meyer	3484a79ccf	Update datev_settings.json (#21482)	2020-04-30 16:27:11 +05:30
Michelle Alva	95b186268c	fix: only check for payment_account on bank entry (#21445) ... * fix: only check for payment_account on bank entry Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission. * fix: cur_frm to frm Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-30 16:24:51 +05:30
Suraj Shetty	bd849f5925	Merge branch 'version-13-beta-pre-release' into fix-healthcare-v13-beta	2020-04-30 15:03:39 +05:30
marination	89c41d8384	chore: Added company filter and minor cleanup in Stock Balance Report	2020-04-30 13:56:49 +05:30
Saqib Ansari	c604109287	chore: handle credit note validation	2020-04-30 13:23:59 +05:30
Deepesh Garg	758f0f0780	Merge branch 'develop' into patch-8	2020-04-30 11:37:27 +05:30
Saqib	a8779872ee	feat: force cost center renaming from cost center form (#21503)	2020-04-30 11:28:43 +05:30
Saqib	090e6093f2	fix: list index out of range error (#21467) ... * fix: list index out of range error * fix: condititon	2020-04-30 11:04:44 +05:30
Nabin Hait	b8d633cb4a	fix: Desk links for Income Tax Slab and Employee Other Income (#21510)	2020-04-30 11:03:49 +05:30
Nabin Hait	62394d7762	fix: Tax calcualtion based on slab (#21496) ... Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-04-30 11:02:53 +05:30
Nabin Hait	691f69c731	fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21474)	2020-04-30 11:02:28 +05:30
Saqib	078c95c438	fix: print heading field shown in gst section for india region (#21499)	2020-04-30 10:57:38 +05:30
Deepesh Garg	2a9c5badc6	feat: Immutable ledger (#18740) ... * fix: Reverse GL entry on cancellation of document * fix: Removed set posting time field for multiple docs * fix: Stop future reposting and reverse entry for purchase receipt and delivery note * fix: Change is_cancelled field from select to check * Revert "fix: Removed set posting time field for multiple docs" This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8. * fix: Multiple fixes in GL Entry * fix: Remove future reporting from doctypes * fix: Canceled entry filters in Stock Ledger and General Ledger Report * fix: Remove print statement * fix: Validation for back dated entries * fix: Codacy fixes * fix: Add ignore links to multiple doctypes * fix: Codacy Fixes * fix: Ignore GL Entry and Stock Ledger entry while cancel * fix: Test case fixes * fix: Patch * fix: Codacy * fix: Budget Test Cases * fix: Patch * fix: Patch * fix: Multiple test cases * fix: changes in make_reverse_entry function * fix: Update patch * fix: Test Cases * fix: Test Case fixes * fix: Move patch upward in patches.txt * fix: Budget Test Cases * fix: Test Case and codacy * fix: Patch * fix: Minor label and UX fixes * fix: Move freezing date check * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Test Case * fix: Remove update_gl_entries_after function * fix: Remove update_gl_entries_after function * fix: Test Cases * fix: Fiscal Year wise backdated entry * fix: Update entries only for current SLE * fix: Remove is_cancelled * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Uncomment account and stock balance sync logic * fix: Stock balance and Account balance out of sync fixes * fix: Test Cases * fix: Test cases for POS, Stock Reco and Purchase Receipt * fix: Stock Reco tests * fix: Test stock reco precision * fix: Test stock reco for fifo precision * fix: Test stock reco for fifo precision * fix: Stock Entry test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-30 10:38:58 +05:30
rohitwaghchaure	c9a6f37199	Merge pull request #21471 from Alchez/dev-update-lead-contact ... fix: update lead if contact details are changed (develop)	2020-04-30 03:15:44 +05:30
Suraj Shetty	7c5f43d794	chore: Update Translations	2020-04-29 18:11:03 +00:00
Deepesh Garg	b134abd3bd	Merge pull request #21513 from deepeshgarg007/get_period_api_v13 ... fix: get_period_list API change fixes	2020-04-29 22:23:15 +05:30
Deepesh Garg	fb992159b5	Merge pull request #21512 from deepeshgarg007/get_period_api ... fix: get_period_list API change fixes	2020-04-29 22:20:06 +05:30
Deepesh Garg	7c2d50fa15	fix: Remove print	2020-04-29 22:19:15 +05:30
Deepesh Garg	9d5fabd7ac	fix: get_period_list API change fixes	2020-04-29 22:19:02 +05:30
Deepesh Garg	8113294d6e	fix: Remove print	2020-04-29 22:16:47 +05:30
Deepesh Garg	0a6450115f	fix: get_period_list API change fixes	2020-04-29 22:14:45 +05:30
rohitwaghchaure	38f7cb487a	Merge pull request #21508 from ruchamahabal/fix-healthcare ... fix: Healthcare Fixes	2020-04-29 22:13:55 +05:30
Rucha Mahabal	57fc3a5c3c	fix: exercise type	2020-04-29 19:49:46 +05:30
Rucha Mahabal	5e8f748a63	feat: add create Sales Invoice option from Therapy Session	2020-04-29 19:49:31 +05:30
Rucha Mahabal	cf10fde5ec	fix: mark form as dirty when editing or deleting exercise card	2020-04-29 19:49:15 +05:30
Rucha Mahabal	589440c5ad	feat: create medical record for therapy sessions	2020-04-29 19:48:58 +05:30
Rucha Mahabal	033886ae3e	fix: change Patient Medical Record subject fieldtype to Text Editor	2020-04-29 19:48:41 +05:30
Rucha Mahabal	b30c9a5735	fix: reload procedure doc on completion	2020-04-29 19:48:17 +05:30
Rucha Mahabal	298c7e5be5	fix: exercise type	2020-04-29 19:23:16 +05:30
Rucha Mahabal	b4b3872ff2	feat: add create Sales Invoice option from Therapy Session	2020-04-29 17:34:36 +05:30
Saqib Ansari	769c0ce72b	chore: validate and warn payment against paid invoices	2020-04-29 15:19:08 +05:30
Abhishek Balam	b59e46d773	fix semicolons as per codacy review	2020-04-29 15:01:56 +05:30
Rucha Mahabal	706f6b0030	fix: mark form as dirty when editing or deleting exercise card	2020-04-29 14:19:27 +05:30
Rucha Mahabal	7a0f425674	feat: create medical record for therapy sessions	2020-04-29 13:47:14 +05:30
Deepesh Garg	91e94587b6	fix: Autoname for loan security	2020-04-29 13:43:26 +05:30
Rohan Bansal	7835bf91e4	fix: AttributeError	2020-04-29 13:10:53 +05:30
Rucha Mahabal	708bceba6e	fix: change Patient Medical Record subject fieldtype to Text Editor	2020-04-29 13:06:52 +05:30
Deepesh Garg	c544b91e14	Merge pull request #21495 from deepeshgarg007/item_wise_sale_purchase_v13 ... fix: Group by filter fix in item wise sales and purchase register	2020-04-29 12:37:26 +05:30
Deepesh Garg	0d8f66dafa	Merge pull request #21493 from deepeshgarg007/item_wise_sale_purchase ... fix: Group by filter fix in item wise sales and purchase register	2020-04-29 12:36:08 +05:30
Deepesh Garg	60256e7299	fix: Group by filter fix in item wise sales and purchase register	2020-04-29 12:26:47 +05:30
Abhishek Balam	e35bb16436	added journal entry template to accounting desk page	2020-04-29 12:18:33 +05:30
Deepesh Garg	3d8dadaab6	fix: Group by filter fix in item wise sales and purchase register	2020-04-29 12:05:56 +05:30
Abhishek Balam	0c4ce4dbba	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-29 12:02:13 +05:30
Anurag Mishra	33793d4e0d	fix: Permission issue Employee Tax exemption (#21490)	2020-04-29 11:48:41 +05:30
Abhishek Balam	3b26b24af6	fix semicolons as per codacy review	2020-04-29 11:28:40 +05:30
Shivam Mishra	357d11adbe	Merge branch 'develop' into razorpay-subscription	2020-04-29 11:17:44 +05:30
Rucha Mahabal	9bf733d82e	fix: reload procedure doc on completion	2020-04-29 11:16:34 +05:30
Abhishek Balam	8dbc4e648b	rearranged fields in journal entry and journal entry type	2020-04-29 11:13:55 +05:30
Deepesh Garg	e006a76f8d	Merge pull request #21486 from rohitwaghchaure/not-able-to-make-payment-request-against-fees ... fix: payment request not able to make against fees	2020-04-29 09:36:37 +05:30
rohitwaghchaure	e8ca145ec1	Merge pull request #21483 from alyf-de/bank_account_dashboards ... feat: add Bank Account to dashboards	2020-04-29 05:06:30 +05:30
rohitwaghchaure	20fa73ff9c	Merge pull request #21388 from marination/stock-entry-form-cleanup ... chore: Stock Entry Form Cleanup	2020-04-29 03:13:12 +05:30
Rohit Waghchaure	50b4106d1d	fix: payment request not able to make against fees	2020-04-29 02:27:47 +05:30
Suraj Shetty	4632379636	chore: Update Translations	2020-04-28 18:04:41 +00:00
Raffael Meyer	49bb8ccd2e	feat: add Bank Account to dashboards	2020-04-28 18:56:47 +02:00
marination	769145caba	fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report	2020-04-28 21:36:25 +05:30
marination	6c871d6bcf	fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report	2020-04-28 21:28:53 +05:30
Deepesh Garg	e317b79361	Merge pull request #21478 from deepeshgarg007/duplicate_code_v13 ... fix: Remove duplicate code from accounting dimension	2020-04-28 20:36:50 +05:30
Deepesh Garg	7889ca564c	fix: Remove duplicate code from accounting dimension	2020-04-28 20:32:32 +05:30
Suraj Shetty	9d185ac4ee	Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations	2020-04-28 20:26:29 +05:30
Deepesh Garg	2b73dbeae0	Merge pull request #21476 from deepeshgarg007/duplicate_code ... fix: Remove duplicate code from accounting dimension	2020-04-28 20:25:31 +05:30
Deepesh Garg	8705df6283	fix: Remove duplicate code from accounting dimension	2020-04-28 20:19:26 +05:30
marination	b7f6878222	fix: Handle empty child table	2020-04-28 19:18:45 +05:30
Shivam Mishra	525138c42a	Merge branch 'develop' into razorpay-subscription	2020-04-28 19:06:02 +05:30
Rohan Bansal	76825ab2bd	fix: update lead if contact details are changed	2020-04-28 16:13:53 +05:30
Shivam Mishra	d445ffc458	feat: whitelist api	2020-04-28 16:04:31 +05:30
Shivam Mishra	7b836e9a92	refactor: update susbcription values all the time	2020-04-28 15:43:04 +05:30
Deepesh Garg	dcef7a96ef	Merge pull request #21463 from deepeshgarg007/allow_loan_security_rename ... fix: Allow rename for Loan Security	2020-04-28 14:31:56 +05:30
Deepesh Garg	7b14721e2f	fix: Allow rename for Loan Security	2020-04-28 14:25:36 +05:30
Deepesh Garg	43ade21f1e	Merge pull request #21462 from deepeshgarg007/consolidate_statement_fix_v13 ... fix: Report summary fix in consolidated financial statement for report type Profit and Loss	2020-04-28 13:30:25 +05:30
Deepesh Garg	428978762b	Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix ... fix: Report summary fix in consolidated financial statement for report type Profit and Loss	2020-04-28 13:30:12 +05:30
Deepesh Garg	c26db6a606	fix: Report summary fix in consolidated financial statement for report type Profit and Loss	2020-04-28 13:16:49 +05:30
Nabin Hait	1bd6de41e6	Merge branch 'develop' into refactor-addiional-salary	2020-04-28 13:15:18 +05:30
Deepesh Garg	fa2eecc5fc	fix: Report summary fix in consolidated financial statement for report type Profit and Loss	2020-04-28 13:12:22 +05:30
rohitwaghchaure	28a4880b48	fix: added validation to not allow to select expired batch (#21455)	2020-04-28 13:01:43 +05:30
Marica	ac98eb5448	fix: Blanket Order in SO/PO child tables (#21443)	2020-04-28 13:00:44 +05:30
Marica	299e217668	fix: Blanket Order in SO/PO child tables (#21442)	2020-04-28 13:00:04 +05:30
rohitwaghchaure	daf37e7570	fix: better validation message for the expense claim and set default cost center in the expenses table (#21454)	2020-04-28 12:48:22 +05:30
Deepesh Garg	558f6aa4cb	Merge pull request #21456 from deepeshgarg007/gross_profit_width ... fix: Default column width in Gross profit report	2020-04-28 12:35:50 +05:30
Deepesh Garg	bc346b5bea	fix: Default column width in Gross profit report	2020-04-28 12:30:41 +05:30
Anoop	b5e7ea7ab8	Merge branch 'develop' into multi_company	2020-04-28 11:38:07 +05:30
Deepesh Garg	142af4b58a	fix: Default column width in Gross profit report	2020-04-28 11:17:45 +05:30
Nabin Hait	504a5f3a3a	fix: reload income_tax_slab_other_charges in patch (#21447) ... * fix: reload income_tax_slab_other_charges in patch * fix: reload lower_deduction_certificate in patch	2020-04-28 11:16:04 +05:30
rohitwaghchaure	236c28fc91	Merge pull request #21453 from anupamvs/campaign-card ... Added Campaign Card in CRM Desk	2020-04-28 03:04:12 +05:30
Anupam K	01d0b373e0	Review changes	2020-04-28 00:21:10 +05:30
anoop	1696a2a4b9	fix: default sms text in settings - corrected field names	2020-04-27 23:44:41 +05:30
anoop	0f541cb7ab	feat: set title for appointment, encounter, procedure and vitals	2020-04-27 23:42:22 +05:30
Anupam K	cc9dbb912e	Adding campaign card in CRM Desk	2020-04-27 22:37:02 +05:30
anoop	ca6f3ec977	fix: set customer name on patient update	2020-04-27 22:27:13 +05:30
anoop	256b77b463	fix: filter service unit by company	2020-04-27 20:00:27 +05:30
anoop	e30cc83591	fix: field order, minor fixes - ... patient - update customer, releated fields patient appointment - send message	2020-04-27 19:36:49 +05:30
Deepesh Garg	57bfd38944	Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message ... fix: E-Way bill error message	2020-04-27 15:04:32 +05:30
Deepesh Garg	fe7e6f5f53	fix: Test	2020-04-27 14:05:45 +05:30
Rucha Mahabal	e0ff9142ac	fix: show date in the message for already marked attendance	2020-04-27 13:29:46 +05:30
Wolfram Schmidt	acfe8f020f	added time stamp to commit ... added time stamp to commit	2020-04-27 08:48:34 +02:00
Rucha Mahabal	f40a431d8c	fix: delivery trip form	2020-04-27 11:29:56 +05:30
Ahmad	f34faa9181	Module Import Fix (#21433)	2020-04-27 10:57:02 +05:30
Rucha Mahabal	131452ca94	fix: Lab Test Invoicing (#21435)	2020-04-27 10:52:38 +05:30
Rucha Mahabal	7bbe3dd8a0	fix: Patch for updating Appointment Reminder method in Scheduled Job Type (#21431)	2020-04-27 10:51:46 +05:30
Deepesh Garg	4eecc65cff	fix: E-way bill fix in Delivery Note	2020-04-27 10:50:59 +05:30
Deepesh Garg	00ea59b447	fix: Utils messsage cleanup	2020-04-27 10:50:40 +05:30
Deepesh Garg	10aff8e118	fix: E-way bill fix in List view	2020-04-27 10:50:17 +05:30
Deepesh Garg	9979ceb96b	fix: E-way bill fix in sales invoice	2020-04-27 10:50:03 +05:30
Deepesh Garg	24b6055d89	Merge pull request #21427 from ruchamahabal/fix-desk-pages ... fix(Desk Page): Number of Open Leads not visible on Shortcut Card	2020-04-27 08:41:14 +05:30
rohitwaghchaure	4d754eadc8	Merge branch 'develop' into quo-status-fix	2020-04-27 00:22:43 +05:30
Rucha Mahabal	e34ec70d44	fix(Desk Page): Number of Open Leads not visible on Shortcut Card	2020-04-26 23:40:37 +05:30
Nabin Hait	2305d00e0b	fix: Procurement tracker report (#21421) ... * fix: procurement report data was not coming * fix: leave allocation minor issue	2020-04-26 23:29:13 +05:30
Himanshu	c9a1aa8eaa	fix: add dashboard to quality inspection template (#21423)	2020-04-26 23:28:33 +05:30
Suraj Shetty	3e3a793567	fix: Set barcode field empty only if it has value (#21425) ... - To avoid unnecessary form dirty trigger	2020-04-26 23:25:40 +05:30
Anurag Mishra	ded418e31d	feat: employee leave balance reports (#20754) ... * feat: Employee leave balance summary report new design * feat: Employee leave balance report new design * fix: leave based on multiple holiday list Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-26 21:04:58 +05:30
Nabin Hait	ba70e7e8bc	Payroll based on attendance (#21258) ... * feat: Payroll based on attendance and leave * test: salary slip based 0n attendance * feat: Payroll based on attendance * fix: Codacy issues Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>	2020-04-26 20:17:48 +05:30
Deepesh Garg	d78cf97250	feat: Allow tax withholding category selection at invoice level (#20870) ... * feat: Allow tax withholding category selection at invoice level * fix: Linitng fixes * feat: TDS calculation using common PAN * fix: Add provision to deduct Lower TDS in purchase invoice * fix: Consider only ref docs company while computing TDS * fix: Default permission fixes * fix: Add validation for dates in fiscal year * fix: Undefined variable	2020-04-26 20:08:52 +05:30
Marica	5d5454ef1f	fix [ux]: Purchase Order Form Cleanup (#20932) ... * chore: Purchase Order Form Cleanup * fix: Get Items from popups cleanup * fix: Shift Set Target Warehouse next to Supply Raw Materials. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-26 20:07:22 +05:30
rohitwaghchaure	733b47c5e6	Merge pull request #21389 from marination/stock-entry-qty ... fix: Issues on qty trigger in Stock Entry Detail	2020-04-26 17:59:45 +05:30
Nabin Hait	58ee6c1e08	feat: Income tax slab (#21399) ... * Feat: Multiple tax as per new taxation rule * patch:for multiple tax slab, fix: payroll and exemption validation * Test: Fixture * feat: income tax slab with other charges and tax exempted deduction components * fix: added missing init file * fix: Patch fixed * fix: Patch fixed * fix: test fixes * fix: validate duplicate exemption declaration * fix: payment entry test case Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>	2020-04-26 17:45:57 +05:30
Saqib Ansari	2fea073539	fix: query logic	2020-04-26 17:30:23 +05:30
marination	de33029393	fix: Remove callback outside if condition	2020-04-26 17:16:21 +05:30
Wolfram Schmidt	64c7eeed24	Update in field type ... Warrenty Period (in Days) changed from "Data" to "Int".	2020-04-26 10:56:08 +02:00
Abhishek Balam	8aa8457a2d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-26 13:07:09 +05:30
Abhishek Balam	e4e23836e7	mandatory depends on for cheque no and date, fix typo	2020-04-26 13:06:55 +05:30
Saqib	7e73473a65	fix: (ux) set jv voucher type depending on mode of payment (#21411)	2020-04-26 09:40:57 +05:30
rohitwaghchaure	8b1c71ea44	fix: work order creation message against material request (#21413)	2020-04-26 09:38:18 +05:30
Abhishek Balam	84187fb8e9	Code cleanup and improvements requested in PR:21404	2020-04-26 05:00:36 +05:30
Abhishek Balam	331bc0c366	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-25 18:25:27 +05:30
Abhishek Balam	539c67966f	rename je template account dt	2020-04-25 18:13:01 +05:30
Abhishek Balam	fb5fbd7e0c	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-25 17:59:00 +05:30
rohitwaghchaure	77403abadd	Merge branch 'develop' into social-media-integration-feat	2020-04-25 17:37:24 +05:30
Nabin Hait	ad16e61bc2	fix: Valid warehouse in woocommerce syncing and other small fixes (#21407) ... * fix: Valid warehouse in woocommerce syncing * fix: dmall fixes in gross & net profit report * fix: company is required for getting party details * fix: None issue while getting raw material rate based on last purchase rate	2020-04-25 14:52:05 +05:30
Ahmad	454b1cf48d	Hook Fix in the scheduler events (#21410)	2020-04-25 14:51:24 +05:30
Deepesh Garg	0b7bef5971	Merge pull request #21408 from deepeshgarg007/loan_disbursement_against ... fix: Loan Disbursement against account	2020-04-25 13:18:49 +05:30
Deepesh Garg	c20de8ac8d	fix: Loan Disbursement against account	2020-04-25 13:15:45 +05:30
Saqib	8952ac1ab4	fix: custom buttons are hidden if order type of SO is customised (#21397)	2020-04-25 09:44:21 +05:30
Abhishek Balam	d64438ff47	feat: Journal Entry Template	2020-04-25 03:13:50 +05:30
Abhishek Balam	291837e63d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-25 02:46:00 +05:30
Abhishek Balam	7bbb77e66f	feat: Journal Entry Template	2020-04-25 02:45:45 +05:30
rohitwaghchaure	55102f455f	Merge pull request #21401 from rohitwaghchaure/fixed-taget-warehouse-mandatory-issue ... fix: make target warehouse field mandatory while saving the work order	2020-04-25 01:19:19 +05:30
Anupam K	524eb6ce9b	freeze screen while posting and login	2020-04-25 00:35:26 +05:30
Diksha Jadhav	7b91617303	feat(accounting): show actual qty for warehouse in sales invoice	2020-04-25 00:02:32 +05:30
Rohit Waghchaure	5460691c8f	fix: make target warehouse field mandatory while saving the work order	2020-04-24 23:55:33 +05:30
Rucha Mahabal	d124581044	Merge pull request #21384 from anupamvs/email-camp-end-date ... fix: set end_date in Email Campaign	2020-04-24 20:04:34 +05:30
Saqib Ansari	8c70e8d4df	fix: remove debugger	2020-04-24 16:41:48 +05:30
Saqib Ansari	40140c63dc	fix: rate gets overwritten when pricing rule is set	2020-04-24 14:51:56 +05:30
Saqib Ansari	22d2970339	fix: query	2020-04-24 13:47:44 +05:30
Saqib	869ea1d9e4	Merge branch 'develop' into quo-status-fix	2020-04-24 12:17:30 +05:30
Anupam K	e01723e360	Review changes	2020-04-23 23:02:08 +05:30
anoop	c02eceb989	style: intendation	2020-04-23 21:15:06 +05:30
Marica	ba3adf2461	Merge branch 'develop' into stock-entry-form-cleanup	2020-04-23 20:58:44 +05:30
marination	e1e98fe116	fix: Issues on qty trigger in Stock Entry Detail	2020-04-23 20:18:52 +05:30
Rucha Mahabal	1700fc8011	Merge branch 'develop' into email-camp-end-date	2020-04-23 19:42:17 +05:30
marination	f7aa6a8357	chore: Stock Entry Form Cleanup	2020-04-23 19:27:50 +05:30
Saqib Ansari	0f2c64cfef	fix: travis	2020-04-23 19:19:09 +05:30
Anurag Mishra	92b933f4ac	feat: Upload Attendance (#20947) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 16:15:18 +05:30
Deepesh Garg	525204bc50	feat: Payment allocation based on payment terms (#20945) ... * feat: Payment allocation based on payment terms * fix: Add desccription for checkbox Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 16:07:36 +05:30
Rucha Mahabal	78d7ed521f	Merge branch 'develop' into email-camp-end-date	2020-04-23 16:00:27 +05:30
Saqib	63084c6292	Merge branch 'develop' into quo-status-fix	2020-04-23 15:30:31 +05:30
Anupam K	0f7bac26e6	setting end date in email campaign	2020-04-23 15:29:12 +05:30
Saqib Ansari	1e4c28e99d	fix: quotation have expired status even if sales order exists	2020-04-23 15:28:47 +05:30
Anupam K	39911b40f0	setting end date in email campaign	2020-04-23 14:14:49 +05:30
Deepesh Garg	67173ce112	Merge pull request #21382 from deepeshgarg007/loan_security_pledge_aginst_application ... fix: Allow creation of loan security pledge from Loan Application for old prices	2020-04-23 13:54:38 +05:30
Deepesh Garg	2daf6dad2e	fix: Allow creation of loan security pledge from Loan Application for old prices	2020-04-23 13:51:29 +05:30
Deepesh Garg	b1e68bd022	fix: Rename bank account type doctypes (#21179) ... * fix: Rename bank account type doctypes Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-23 12:19:30 +05:30
Deepesh Garg	fa8396feb5	fix: Budget against accounting dimensions (#21268) ... * fix: Budget warning against custom accounting dimension * fix: Codacy Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 10:34:57 +05:30
rohitwaghchaure	168babfebc	fix: bom update cost issue (#21372) ... * fix: bom update cost is not working * added test case for bom cost	2020-04-23 09:48:50 +05:30
rohitwaghchaure	6fa6caf46c	fix: patch and validation message to fix target warehouse issue (#21371)	2020-04-23 09:46:29 +05:30
rohitwaghchaure	e8a651bc00	fix: BOM stock report (#21380)	2020-04-23 09:45:09 +05:30
rohitwaghchaure	28deddeb6f	fix: incorrect out value in stock balance due to precision issue (#21379)	2020-04-23 09:44:58 +05:30
Rucha Mahabal	ec7db4f467	fix: modified timestamp conflict	2020-04-23 03:10:11 +05:30
Rucha Mahabal	d7304519e2	fix: conflicts	2020-04-23 00:52:47 +05:30
marination	8a30cb2565	chore: Commonify autofilling warehouses in child tables	2020-04-23 00:18:21 +05:30
Rucha Mahabal	eaa956b994	feat(Healthcare): Rehabilitation Module (#21216) ... * feat: added rehab sub-module doctypes * feat: rehab module * feat: prescribe procedures in Patient Encounter * feat: create Therapy Plan on Encounter submission * feat: manage item for Therapy Type * feat: book appointments, get prescribed therapies for Therapy Sessions * feat: invoice Therapy Sessions * feat: plan completion progress bar and exercise countsindicators * feat: Motor Assessment Scale * feat: add editable card view for exercise steps * fix: add rehab in healthcare desk page * fix: card deletion not working when child table is hidden * feat: automatically fetch therapies according to Body Part * fix: added tests for Therapy Type and Plan * fix: add exercises according to body parts in Therapy Type * fix: label for Exercise Instructions * fix: exercise cards css * feat: add dashboard for Therapy Plan * feat: Patient Assessment Template and Patient Assessment * feat: add title fields in Therapy Plan and Session * fix: remove Motor Assessment Scale * fix: fetch assessment description * feat: create Patient Assessment from Therapy Session * fix: anti pattern code * fix: update desk page * fix: exercise card rendering * fix(test): filter out disabled Items in test_mapper * fix: get stock uom from Stock Settings for Therapy Type Item creation * fix: multiline SQL query * fix: permissions for DocTypes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-22 13:07:12 +05:30
Deepesh Garg	37665e12ca	Merge pull request #21367 from scmmishra/cal-report ... fix: specify column width	2020-04-22 12:03:05 +05:30
Shivam Mishra	55baccd63a	fix: specify column width	2020-04-22 11:50:06 +05:30
Saqib	9c494d3e72	fix: asset maintenance fixes (#21277) ... * fix: asset maintenance fixes * fix: tests	2020-04-22 11:48:19 +05:30
Nabin Hait	471cf95300	Update purchase_invoice_item.json	2020-04-22 11:46:31 +05:30
Chinmay Pai	8fb863da07	chore: remove oldfieldtype from purchase invoice item (#21365) ... fixes issue where framework expects data field type to be validated with options either set to "Email" or "Phone". removing oldfieldtype works for now, should be fixed inside framework Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-04-22 11:23:14 +05:30
Rohit Waghchaure	690855d3a1	fix: unsupported operand type issue in pricing rule	2020-04-22 02:49:48 +05:30
Anupam K	4e2256f2e3	Linkedin, Twitter Integration	2020-04-21 22:07:03 +05:30
Nabin Hait	5f77854448	Revert "fix : Create Pick List Fos Sales Order List (#20915)" (#21352) ... This reverts commit 27c6f69435.	2020-04-21 14:28:08 +05:30
Nabin Hait	a529a5078f	Update purchase_receipt.json	2020-04-21 13:50:26 +05:30
Marica	bda0ddf1cf	fix: Purchase Receipt Form Cleanup (#21232)	2020-04-21 13:15:05 +05:30
Marica	9942acd9d4	fix [ux]: Material Request Form Cleanup and UX (#20810) ... * fix (ux): Material Request Form Cleanup * fix: Get Items from popup UX Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-21 13:13:39 +05:30
Dharmraj-48	27c6f69435	fix : Create Pick List Fos Sales Order List (#20915) ... Co-authored-by: Dharmraj <Dharmraj@bloomstack.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-21 13:10:09 +05:30
Marica	34bbd5b612	fix: Purchase Invoice Form Cleanup (#21230) ... * fix: Purchase Invoice Form Cleanup * fix: Made Supplier field mandatory Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-21 13:00:14 +05:30
Anupam Kumar	a9d59fad94	fix: on item change UOM not updated (#21242) ... * fix: on item change UOM not updated * removing uom from js	2020-04-21 12:57:44 +05:30
Rucha Mahabal	ca1c37c56d	fix(Healthcare): remove hardcoded UOM during Item creation for Templates (#21350)	2020-04-21 12:54:07 +05:30
Marica	9ea1ad4051	fix: Re-order Item Error Email format (#21342) ... * fix: Re-order Item Error Email format * fix: Translated strings	2020-04-21 12:52:29 +05:30
rohitwaghchaure	a92eaff83b	fix: scrap items order not showing correctly in stock entry (#21346)	2020-04-21 11:27:10 +05:30
rohitwaghchaure	3d2ced7926	Merge pull request #21345 from rohitwaghchaure/fixed_free_item_qty_develop ... fix: free item quantity issue	2020-04-21 01:10:33 +05:30
Rohit Waghchaure	d093a377ef	fix: free item quantity issue	2020-04-21 01:09:44 +05:30
Shivam Mishra	6372d0a842	Merge pull request #21187 from scmmishra/razorpay-subscription ... feat: Razorpay subscription for Non profit memberships	2020-04-20 21:01:34 +05:30
Shivam Mishra	745b632ea1	fix: linting fixes	2020-04-20 18:25:51 +05:30
Sahil Khan	f03efdc6b1	fix(patch): reload 'Import Supplier Invoice' doc	2020-04-20 14:18:28 +05:30
Shivam Mishra	83f80517c6	Merge branch 'develop' into razorpay-subscription	2020-04-20 13:54:00 +05:30
Saqib	b61d2411b1	Merge branch 'develop' into rename-bank-reco	2020-04-20 12:21:22 +05:30
Saqib Ansari	9de76de621	fix: patch	2020-04-20 12:19:27 +05:30
Wolfram Schmidt	6d49238159	Update project.json (#21274) ... unnecessary requirement for project creation as this is a field of the Type select which will be pre-filled. When creating a project of list view it will also bring up this field as it has "reqd": 1. A new projekt will have the status set to open in most cases. Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-04-19 20:19:10 +05:30
Shivam Mishra	bd53f3b080	fix: filters as dictionary	2020-04-19 12:47:48 +05:30
Deepesh Garg	3cec5cbb0f	fix: Total amount field ordering in transactions (#21313)	2020-04-18 22:13:48 +05:30
Deepesh Garg	6298bbb1eb	Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print ... fix: account name not showing in the gl print	2020-04-18 20:40:50 +05:30
Rohit Waghchaure	9793500154	fix: account name not showing in the gl print	2020-04-18 19:02:07 +05:30
rohitwaghchaure	866867661e	Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop ... fix: minor issues	2020-04-18 02:08:26 +05:30
Anupam K	790b9ee8d0	Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat	2020-04-18 01:51:47 +05:30
Anupam K	c12a40c923	Linkedin, Twitter Integration	2020-04-18 01:50:18 +05:30
Anupam K	22318b2eb6	Linkedin, Twitter Integration	2020-04-18 01:46:38 +05:30
Anupam K	d683dc250d	Linkedin, Twitter Integration	2020-04-18 00:48:34 +05:30
Mangesh-Khairnar	bd14a64bfb	fix: add label to gl entry	2020-04-17 19:52:47 +05:30
gavin	25932e0613	Merge pull request #21298 from gavindsouza/tally-migration-fixes ... fix: Tally migration	2020-04-17 19:12:55 +05:30
Deepesh Garg	3c6795a52d	Merge pull request #21305 from deepeshgarg007/partial_loan_repayment_fixes ... fix: Loan Repayment code clean up and other fixes	2020-04-17 11:16:38 +05:30
Nabin Hait	7eaa7f2e41	fix: requested qty for customer provided item and rate for sales (#21299) ... * fix: requested qty for customer provided item and rate for sales * fix: requested qty for material transfer * fix: customer provided item can be sales item * fix: requested qty test cases	2020-04-17 10:52:28 +05:30
rohitwaghchaure	e894c35b9a	Merge pull request #21309 from rohitwaghchaure/fixed_job_card_time_issue_develop ... fix: job card timer issue	2020-04-17 00:56:28 +05:30
Rohit Waghchaure	250daa3f94	fix: job card time issue	2020-04-17 00:50:00 +05:30
anoop	fdc075220d	fix: minor, codacy suggestions	2020-04-16 23:05:38 +05:30
Deepesh Garg	bf78ed6947	fix: Loan Repayment code clean up and other fixes	2020-04-16 22:53:47 +05:30
Nabin Hait	03af0299a6	fix: requested qty calculation and some other small fixes (#21296) ... * fix: Made received qty readonly and no-copy * fix: Made release date mandatory * fix: requested qty calculation fix for UOM	2020-04-16 20:11:32 +05:30
Shivam Mishra	3e4ab760db	Merge branch 'develop' into razorpay-subscription	2020-04-16 18:17:42 +05:30
anoop	1c49a12ac2	fix: patient appointment ... auto invoicing: record payment if payment mode and amount available test: fixes	2020-04-16 17:00:47 +05:30
Gavin D'souza	496c6a3baa	style: removed unused imports and updated formatting	2020-04-16 16:51:59 +05:30
Deepesh Garg	d521ba2c00	Merge pull request #21102 from nextchamp-saqib/asset-cat-validation ... fix: no server side validations for accounts in asset category	2020-04-16 16:25:08 +05:30
Saqib	14cdb24290	fix: serial and batch selection from delivery note bug fix (#21291)	2020-04-16 16:21:35 +05:30
Saqib Ansari	33eb35d8b1	fix: incorrect transalation	2020-04-16 16:16:09 +05:30
Gavin D'souza	6abdfc586b	fix: strip data fields of whitespaces	2020-04-16 16:14:29 +05:30
Gavin D'souza	72a94941bf	fix(tally-migration): DocType improvement	2020-04-16 16:12:40 +05:30
Gavin D'souza	2ad7e81560	fix: handle errors in enqueued methods and update status	2020-04-16 16:11:55 +05:30
anoop	b922b292eb	fix: set patient while billing, tests fixed	2020-04-16 13:01:45 +05:30
anoop	93d0c78ca5	feat: multi-company billing ... sales onvoice - filter get items based on company utils - company filters in all get item helper methods utils - refactor appointemnt items	2020-04-16 13:01:43 +05:30
anoop	7ad98c95b9	company field added	2020-04-16 13:01:43 +05:30
anoop	38f0258991	feat: multi company support	2020-04-16 13:01:43 +05:30
anoop	2d2db60035	feat: multi company support	2020-04-16 13:01:43 +05:30
anoop	80ab98bf36	fix: company when creatign procedure, practitioner name added	2020-04-16 13:01:43 +05:30
anoop	9c7d45deae	fix: set company while creating encounter, fields rearranged	2020-04-16 13:01:43 +05:30
anoop	82aeff0a32	fix: vitals added naimg series, minor field rearrangements	2020-04-16 13:01:43 +05:30
anoop	d4f5a6928f	feat: additional customer fileds ... add customer_group, price list, currency etc. rearrange and group fields disable cusotmer edit after save (temp fix)	2020-04-16 13:01:43 +05:30
Shivam Mishra	88c1f28351	Merge branch 'develop' into razorpay-subscription	2020-04-16 12:23:46 +05:30
Deepesh Garg	44c0c6c159	Merge branch 'develop' into asset-cat-validation	2020-04-16 11:23:52 +05:30
Deepesh Garg	17ab1592c7	Merge pull request #21265 from vishdha/chart_account_v13 ... fix: Chart of account importer UX improved	2020-04-16 11:21:05 +05:30
vishdha	5b36d15927	fix: fix Transalation	2020-04-16 11:13:43 +05:30
rohitwaghchaure	65628ac3e2	Merge pull request #21283 from marination/stock-entry-get-items-mr ... fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from	2020-04-16 00:33:03 +05:30
Marica	20ce433652	Merge branch 'develop' into warehouse-fix-dev	2020-04-15 23:48:27 +05:30
Saqib Ansari	f53299e98a	fix: warehouse unset when cannot find item warehouse ... * cannot set delivery date when all items gets deleted and new are added	2020-04-15 22:10:48 +05:30
Saqib Ansari	34640777cd	fix: pos not accessible without default customer	2020-04-15 22:10:43 +05:30
marination	0b98a6296b	fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from	2020-04-15 21:19:04 +05:30
rohitwaghchaure	1c5b12e7d4	Merge pull request #21280 from anupamvs/opportunity-calendar ... Adding Opportunity Calendar View	2020-04-15 19:29:49 +05:30
Anupam K	9ee8110411	Adding Calendar view for Opportunity	2020-04-15 18:37:35 +05:30
rohitwaghchaure	c3f994b15e	Merge pull request #21197 from marination/default-item-manufacturer ... feat: Provision to set Default Item Manufacturer	2020-04-15 16:35:08 +05:30
Anupam K	c4c44a9a2b	Initial JS setup	2020-04-15 12:58:24 +05:30
marination	8890b6044d	fix: Patch fix, Travis fix and cleanup ... - Added UOM column in Report - Removed mandatory on `valid_till` - Added list view indicator for Expired status in Supplier Quotation - Sorted Labels in Chart and syntax cleanup - Made labels Translatable - Fixed patch	2020-04-15 12:31:12 +05:30
marination	1bab1539b1	Merge branch 'develop' of https://github.com/frappe/erpnext into quoted-item-report	2020-04-15 12:16:31 +05:30
sahil28297	dd719ea151	Merge branch 'develop' into patch-fix	2020-04-15 11:58:02 +05:30
Rucha Mahabal	11121f4905	fix: patch for Healthcare Refactoring	2020-04-15 11:53:39 +05:30
Deepesh Garg	9e9d44d139	fix: Loan topup test	2020-04-15 11:20:24 +05:30
marination	8179804405	refactor: Quoted Item Comparison Report ... - Refactored Report View - Added Chart - Added 'valid_till' date in Supplier Quotation - Added patch to set valid_till and daily job to set expiry status	2020-04-14 23:05:11 +05:30
Rohit Waghchaure	d0f6f1808b	fix: minor issues	2020-04-14 17:26:58 +05:30
vishdha	5008be1db5	fix: message bold	2020-04-14 17:17:26 +05:30
vishdha	10a6f4bd05	fix: Chart of account importer UX improved	2020-04-14 17:17:26 +05:30
Rohan Bansal	a1b747c3f3	fix: show stock UOM in POS	2020-04-14 14:28:56 +05:30
Himanshu	b84333f26e	fix: move to hooks (#21205)	2020-04-14 13:02:03 +05:30
rohitwaghchaure	fc31dbef12	fix: on changing qty free item not removed (#21251)	2020-04-14 12:53:54 +05:30
Deepesh Garg	dd78eb3842	Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn ... fix: show positive taxes in credit notes	2020-04-14 12:41:25 +05:30
Shivam Mishra	8e91553d4b	Merge branch 'develop' of https://github.com/frappe/erpnext into razorpay-subscription	2020-04-14 12:00:38 +05:30
Shivam Mishra	4fdb4aa1d0	feat: use int for billing frequency	2020-04-14 12:00:15 +05:30
Shivam Mishra	cb354685d5	fix: linting issues	2020-04-14 12:00:02 +05:30
Marica	8636914e9a	fix: Lead Contact with blank first name via Customer (#21247)	2020-04-14 11:53:09 +05:30
Faris Ansari	64f01bddc8	fix: Set Price List in case of User Permissions (#21237) ... Frontport of #18968	2020-04-14 11:51:48 +05:30
Marica	02c9332695	fix: Project Update Email Error (#21208) ... * fix: Project Update Email Error * Update project.json Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-04-14 11:47:58 +05:30
Vishal Dhayagude	b1c2f4ef22	fix: str object not callable (#21227)	2020-04-14 11:42:52 +05:30
Mangesh-Khairnar	2e3548eb83	fix: consider revereted expired leaves entry (#21257)	2020-04-14 09:34:39 +05:30
Deepesh Garg	78c0841d64	Merge pull request #21249 from Thunderbottom/blanket-order-patch-fix ... chore: force reload doctype before running patch	2020-04-13 18:59:31 +05:30
Rucha Mahabal	79bc819f92	fix: Healthcare Patch	2020-04-13 18:51:04 +05:30
Rushabh Mehta	4c0484b60e	Merge pull request #20811 from ruchamahabal/healthcare_refactor ... refactor: Healthcare Module	2020-04-13 17:16:02 +05:30
Saqib Ansari	10a6a2d77f	fix: show positive taxes in credit notes	2020-04-13 16:40:13 +05:30
Deepesh Garg	435c22e403	Merge pull request #21244 from deepeshgarg007/employee_loan_fixes ... fix: Employee loan fixes in new loan management module	2020-04-13 16:32:42 +05:30
Deepesh Garg	40dcfd148b	fix: Import Error	2020-04-13 16:29:58 +05:30
Chinmay D. Pai	de8554d0dc	chore: force reload doctype before running patch ... fixes Unknown column 'against_blanket_order' in 'field list' Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-04-13 16:03:22 +05:30
Shivam Mishra	d9ce5843e5	chore: resolve conflicts	2020-04-13 13:43:04 +05:30
Shivam Mishra	affa2fba6b	feat: updated non-profit.json	2020-04-13 13:42:01 +05:30
Marica	3ce23858bf	Merge branch 'develop' into batch_message_v13	2020-04-13 13:20:25 +05:30
Deepesh Garg	03166fab56	Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes	2020-04-13 13:20:02 +05:30
Deepesh Garg	baa7521d02	fix: Allow repayment from Salary only for term loans	2020-04-13 13:18:11 +05:30
vishdha	cfaf638cc2	fix: batch message ux improved	2020-04-13 12:31:26 +05:30
Deepesh Garg	af27d61bee	fix: Employee loan test case and other fixes	2020-04-13 12:29:00 +05:30
Saqib	2e45076dcf	Merge branch 'develop' into asset-cat-validation	2020-04-12 13:39:43 +05:30
Deepesh Garg	0865625482	Merge pull request #21177 from nextchamp-saqib/purchase-register-filters ... feat: (minor) purchase register filters	2020-04-11 18:12:00 +05:30
Saqib Ansari	397f894a7c	fix: cannot iterate over dict_keys	2020-04-11 18:10:59 +05:30
Syed Mujeer Hashmi	58a16f1a3b	fix: GSTR 3B Report tax amount calculation ... The tax amount after discount amount should be considered for tax calculation. Fixes #21231 Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-04-11 00:52:10 +05:30
Deepesh Garg	5e274965cc	Merge pull request #21201 from marination/serial-no-status ... fix: Added Status field in Serial No for filter and report builder	2020-04-10 20:48:06 +05:30
Rucha Mahabal	59e6c7730b	Merge branch 'develop' into healthcare_refactor	2020-04-10 20:32:37 +05:30
Deepesh Garg	470679f227	fix: SQL ssyntax error	2020-04-10 20:22:42 +05:30
Deepesh Garg	9b312bfbd0	Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters	2020-04-10 20:19:30 +05:30
Deepesh Garg	e2a5828f5e	Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix ... chore: hide redundant base received amount	2020-04-10 20:17:56 +05:30
Deepesh Garg	669c5c6370	fix: Syntax Error	2020-04-10 20:15:53 +05:30
Deepesh Garg	550771058a	fix: Code styling	2020-04-10 20:14:29 +05:30
Deepesh Garg	f7e216e285	fix: Employee loan fixes	2020-04-10 20:03:11 +05:30
Rucha Mahabal	1ff0cfd4f9	fix: merge conflicts	2020-04-10 18:58:25 +05:30
Shivam Mishra	ebcc46d837	feat: updated desk pages (#21138)	2020-04-10 18:52:05 +05:30
Saqib Ansari	c9d6630f17	fix: formatting	2020-04-10 12:43:54 +05:30
Saqib Ansari	debee1c977	fix: travis	2020-04-10 12:38:44 +05:30
Rucha Mahabal	41520f9fca	Merge branch 'develop' into healthcare_refactor	2020-04-09 19:16:31 +05:30
Rucha Mahabal	120d0e5796	fix: Fee Validity test	2020-04-09 19:16:01 +05:30
Michelle Alva	7f2477b72c	fix: better error message due date ... show better error message payment schedule due date	2020-04-09 17:23:23 +05:30
Rucha Mahabal	d30023abac	fix: failing tests	2020-04-09 16:43:13 +05:30
rohitwaghchaure	cf17809c3f	Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry ... fix: Mapping Customer Provided Material Request to Stock Entry	2020-04-09 13:18:25 +05:30
Deepesh Garg	ef220c1989	Merge branch 'develop' into pay-entry-ux-fix	2020-04-09 12:54:33 +05:30
Marica	3e84ab1349	fix: Error on any new doc from Shipping Rule. (#21206)	2020-04-09 12:01:10 +05:30
vishdha	0b34b90e71	fix: item_name added for message	2020-04-09 11:46:46 +05:30
marination	86e8b2a1c6	fix: Status field in Serial No for filter and report builder	2020-04-08 15:38:28 +05:30
gavin	74dd0e12e7	fix: enable validations for email and phone data fields (#21199)	2020-04-08 12:59:15 +05:30
Mangesh-Khairnar	49816b0c5f	fix(MWS): add new regions to marketplace (#21196) ... * fix(MWS): add marketplace region for uae * fix: rename the fields for mws integrations Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 12:57:14 +05:30
Saqib	562fd0eab0	fix: purchase return are allowed even when assets are not cancelled (#20797) ... * fix: purchase return are allowed even when assets are not cancelled * chore: test case * fix: error message Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 12:11:40 +05:30
rohitwaghchaure	47c8ddb29b	Merge pull request #20962 from marination/pick-list-enhance ... fix: Pick List Enhancements	2020-04-08 12:09:10 +05:30
Saqib	683581edef	fix: cannot find accounting module while rendering breadcrumb (#21190)	2020-04-08 11:49:06 +05:30
Rucha Mahabal	8844e95667	fix: pass ignore_mandatory flags	2020-04-08 10:04:10 +05:30
Nabin Hait	04870ae23a	fix: Replace newlines with spaces before evaluation of condition and formula (#21165)	2020-04-08 09:34:46 +05:30
Suraj Shetty	da6806e6bc	fix: Translation strings with trailing spaces (#21192)	2020-04-08 09:32:41 +05:30
Raffael Meyer	28753268e6	fix(regional): DATEV report: description in header, quote nonnumeric values (#21126) ... * fix description in header, quote nonnumeric values * fix: truncate 'Buchungstext' to 60 chars	2020-04-08 09:26:18 +05:30
Raffael Meyer	385a92d3f2	fix(patch): set_task_status (#21130) ... * fix(patch): set_task_status * remove unnecessary loop, use tabs Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 09:24:34 +05:30
Saqib	f93dc8dd88	fix: [ux] enforce 'get references from' in payment order (#21175)	2020-04-08 09:20:17 +05:30
Nabin Hait	b95a794e51	Merge branch 'develop' into healthcare_refactor	2020-04-08 09:08:21 +05:30
Raffael Meyer	9aae0c27c2	feat(regional): a central place for regional address templates (#19862) ... * feat: a central place for regional address templates * set up address templates during install * why don't the tests run? * fix: remove unused variables, fix cwd * fix: .get() dicts contents * fix: choose the right default * fix: fieldname is template, not html * fix: import unittest * fix: remove unnecessary code * fix: ensure country exists * fix: ensure country exists * feat: test updating an existing template * fix(regional): DuplicateEntryError in test_update_address_template * refactor and set 'is_default' * fix codacy * fix: patch gst_fixes * fix: patch update_address_template_for_india Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 08:56:57 +05:30
marination	3e7a8abf29	feat: Provision to set Default Item Manufacturer ... - Is Default checkbox added in Item Manufacturer - Default Item Manufacturer and Part No fields added to Item Master - Manufacturer Part No field editable in all child tables with validation - Manufacturer and Part No auto fetched via get_item_details in child table	2020-04-07 21:00:57 +05:30
Shivam Mishra	31051679c8	feat: remove unused fields	2020-04-07 18:43:11 +05:30
rohitwaghchaure	36459c052f	Merge branch 'develop' into pick-list-enhance	2020-04-07 18:04:39 +05:30
rohitwaghchaure	0672b6b2e8	Merge pull request #21170 from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop ... fix: get serial nos based on posting date and time	2020-04-07 18:02:49 +05:30
Nabin Hait	c9f08bed2b	fix: set batch qty in batch master and test cases	2020-04-07 17:33:10 +05:30
Rohan Bansal	f92a5f32bd	fix: set batch ID as title instead of item code	2020-04-07 17:33:10 +05:30
Rohan Bansal	d2d73e6cb7	fix: prioritize empty over expired as batch status	2020-04-07 17:33:10 +05:30
Rohan Bansal	ba03853b2a	fix: update Batch schema	2020-04-07 17:33:10 +05:30
Rohan Bansal	ced78cf116	fix(stock): make requested changes	2020-04-07 17:33:10 +05:30
Rohan Bansal	92669eae66	fix(stock): batch list view statuses	2020-04-07 17:33:10 +05:30
Rohan Bansal	4a50c99867	fix(stock): Update batch quantity whenever stock in it is moved	2020-04-07 17:33:10 +05:30
Rohan Bansal	1bd7ea99f4	fix(batch): Only consider valid stock ledger entries	2020-04-07 17:33:10 +05:30
Rohan Bansal	40611080da	fix(patch): Fix edge cases for Batch	2020-04-07 17:33:10 +05:30
Rohan Bansal	56827a372c	fix(patch): Reload Batch doctype before update query	2020-04-07 17:33:10 +05:30
Rohan Bansal	658ed14e40	feat(batch): Add total quantity and dashboard to Batch	2020-04-07 17:33:10 +05:30
Saqib Ansari	e9b63e45b9	chore: hide redundant base received amount	2020-04-07 17:22:11 +05:30
Rucha Mahabal	d72d9814e2	Merge branch 'develop' into healthcare_refactor	2020-04-07 16:52:22 +05:30
Rucha Mahabal	9d0ff961bc	fix: patch and tests	2020-04-07 16:43:22 +05:30
Rucha Mahabal	21f5680914	fix: merge conflicts	2020-04-07 16:42:50 +05:30
Deepesh Garg	6c36cddbd3	Merge pull request #21188 from deepeshgarg007/dimension_filter_fix ... fix: Use separate condition for tree and normal doctype	2020-04-07 15:23:36 +05:30
Deepesh Garg	62e9f83aab	fix: Use separate condition for tree and normal doctype	2020-04-07 15:17:06 +05:30
rohitwaghchaure	d313a239de	Merge pull request #21065 from marination/bin-requested-qty ... fix: Updated Bin Requested Qty logic	2020-04-07 14:50:19 +05:30
Shivam Mishra	65e11a9640	refactor: razorpay subscription for memberships	2020-04-07 14:49:28 +05:30
Rohit Waghchaure	560f822dbf	fix: get serial nos based on posting date and time	2020-04-07 14:42:02 +05:30
rohitwaghchaure	55ea142afd	Merge pull request #21181 from marination/purchase-receipt-scan-barcode ... feat: Scan Barcode in Purchase Receipt	2020-04-07 14:36:56 +05:30
Marica	c732e9967d	fix: Validate Serial/Batch No naming series in Item itself (#21167) ... * fix: Validate Serial/Batch No naming series in Item itself * fix: Consider '#' too	2020-04-07 14:16:14 +05:30
Marica	048de30cb5	Merge branch 'develop' into pick-list-enhance	2020-04-07 14:05:05 +05:30
marination	39f9dd03a7	fix: Use reload_doc in patch	2020-04-07 14:03:50 +05:30
Deepesh Garg	d14598bc51	Merge pull request #21180 from KanchanChauhan/address-from-lead ... fix: (minor) Mandatory field missing to create address from lead	2020-04-07 12:22:54 +05:30
Vishal Dhayagude	24e79b14e1	fix(shopping cart): UX Improvements (#21034) ... * fix: nontype error for resolved and moved place order button at bottom left * fix: removed inline style * fix: Request for quotation move to lower right * fix: move buttons Co-authored-by: Naren <patilnarendra3@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:18:47 +05:30
Deepesh Garg	24a2c9b978	feat: Date range in financial statements (#21020) ... * feat: Date range in financial statements * feat: Add date range filter in consolidated financial statement * fix: Handle API changes in query_report Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:16:25 +05:30
Saqib	30fc621f1e	fix: Create Item tax template only for specific account types (#20931) ... fix: Create Item tax template only for specific account types	2020-04-07 12:12:04 +05:30
Saqib	5bd54f544c	fix(shopping-cart): address is made mandatory to place order (#20923) ... fix(shopping-cart): address is made mandatory to place order	2020-04-07 12:09:59 +05:30
Vishal Dhayagude	8ef0609fc7	fix: Make Sales Invoice paid when it create from shopping cart (#20879) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:07:01 +05:30
rohitwaghchaure	f8e8333d77	Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop ... fix: material request type manufacture shows items with Is Purchase I…	2020-04-07 12:06:18 +05:30
Suraj Shetty	8b55304715	Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations	2020-04-07 11:04:04 +05:30
Deepesh Garg	4461868eff	Merge pull request #21184 from hrwX/update_modified ... fix: update modified for opportunity	2020-04-07 10:15:41 +05:30
Deepesh Garg	f3c44a97f0	Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix ... fix: payment request status fixes	2020-04-07 10:13:08 +05:30
Himanshu Warekar	48307513c1	fix: update modified for opportunity	2020-04-07 09:06:03 +05:30
Kanchan Chauhan	4791e313db	fix: Mandatory field missing to create address from lead	2020-04-06 23:56:23 +05:30
marination	e05013ede3	feat: Scan Barcode in Purchase Receipt	2020-04-06 22:13:13 +05:30
Rucha Mahabal	0f23a304bc	fix: added patch for refactored changes	2020-04-06 19:00:17 +05:30
Saqib Ansari	ca3967d52f	feat: (minor) purchase register filters	2020-04-06 18:25:23 +05:30
Rohit Waghchaure	5317907e15	fix: material request type manufacture shows items with Is Purchase Item enabled	2020-04-06 17:53:16 +05:30
Saqib Ansari	b2a84fe478	chore: rename bank reconciliation to bank clearance	2020-04-06 16:32:33 +05:30
marination	642f19d704	fix: Patch fix	2020-04-06 16:01:50 +05:30
Marica	e58d1b1b9f	Merge branch 'develop' into bin-requested-qty	2020-04-06 15:54:51 +05:30
Shivam Mishra	8d6cded07f	feat: added subscription web hook	2020-04-06 15:01:30 +05:30
Shivam Mishra	d92b7ab258	fix: use false explicitly	2020-04-06 14:44:33 +05:30
Shivam Mishra	4b667160a0	feat: added razorpay details to membership	2020-04-06 14:44:17 +05:30
Saqib	046b69d427	Merge branch 'develop' into item_tax_template_fix	2020-04-06 14:32:45 +05:30
Saqib	0f7ef139dc	Merge branch 'develop' into cart-address-update-v13	2020-04-06 14:23:51 +05:30
Deepesh Garg	433e58d131	feat: Add report summary in financial statements (#20876) ... * feat: Add report summary API for Balance Sheet and PL report * fix: Add summary cards in Cash flow report * feat: Add report summary in consolidated financial statements * fix: Remove accumulated values filter from P&L and cashflow report * fix: set company default currency in profit and loss statement if no data Co-authored-by: Prssanna Desai <prssud@gmail.com>	2020-04-06 14:07:20 +05:30
Deepesh Garg	8853850fd8	Merge branch 'develop' into item_tax_template_fix	2020-04-06 13:13:37 +05:30
Deepesh Garg	c01ec7606d	fix: Currency validation for default company accounts (#21094) ... * fix: Currency validation for default company accounts * fix: Improve message	2020-04-06 12:43:07 +05:30
Saqib Ansari	474222074b	fix: tests	2020-04-06 12:40:41 +05:30
Saqib Ansari	4de2416806	fix: change request status on payment entry cancel	2020-04-06 12:34:38 +05:30
Marica	b37f0bb052	Merge pull request #20864 from deepeshgarg007/po_supplier_skip ... feat: Allow PI creation without PO	2020-04-06 12:15:42 +05:30
Himanshu Warekar	c207c457a5	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-04-06 11:34:27 +05:30
Deepesh Garg	aa775f87b2	fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer (#21142) ... * fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer * fix: Use cint	2020-04-06 10:23:06 +05:30
Deepesh Garg	1958749382	fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype (#21147) ... * fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype * fix: Codacy	2020-04-06 10:21:50 +05:30
rohitwaghchaure	05ac7213b3	fix: allow to make BOM against template item (#21146) ... * fix: allow to make BOM against template item * Update queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-06 10:17:57 +05:30
Nabin Hait	75ef458b34	fix: update attendace from leave application (#21155)	2020-04-06 10:15:38 +05:30
Deepesh Garg	0268c553a3	Merge pull request #21163 from deepeshgarg007/gst_3b_user_perm ... fix: User permissions in GSTR 3B report	2020-04-04 21:48:23 +05:30
Deepesh Garg	6c8efdef09	fix: User permissions in GSTR 3B report	2020-04-04 20:05:17 +05:30
Saqib	63bdf5dc74	fix: [ux] credit to & debit to error message (#21132) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 19:35:55 +05:30
Marica	f55c9c8d8c	Merge branch 'develop' into po_supplier_skip	2020-04-03 18:35:48 +05:30
marination	2a9a5352bb	fix: Test Cases and block expense on outward entry ... - Throw error if rate present against Customer Provided Item in DN and SI - Added test cases for Sales Invoice and Delivery Note - Allow SI and DN with 0 rate in Test	2020-04-03 18:25:21 +05:30
marination	fd04e96bdd	fix: Mapping Customer Provided Material Request to Stock Entry ... - Fixed inability to map Material Request to Stock Entry - Commonified Customer Provided Item validation	2020-04-03 15:46:48 +05:30
Saqib	e2c355f670	Merge branch 'develop' into payment-req-status-fix	2020-04-03 11:29:15 +05:30
Deepesh Garg	fc0bd2a9e4	Merge pull request #21150 from scmmishra/fix-patch-dashboard ... fix (tests): module import error for Dashboard Chart Field	2020-04-03 11:04:51 +05:30
Shivam Mishra	3251e1304c	fix: lms quiz type error (#21152)	2020-04-03 10:08:19 +05:30
Marica	66c4a08703	fix: Update Received Qty in Material Request as per Stock UOM (#21054) ... * fix: Update Received Qty in Material Request as per Stock UOM * fix: Process each PR only once * fix: minor suggested changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 10:07:06 +05:30
Saqib	438e0433a3	fix: cannot set warehouse on deleting all so items and updating them (#21078) ... * fix: cannot set warehouse on deleting all so items and updating them * fix: travis * fix: docname is editable in update items dialog	2020-04-03 10:02:56 +05:30
Deepesh Garg	0f25a40421	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order	2020-04-02 21:30:53 +05:30
Deepesh Garg	d29dd58e89	fix: Validation	2020-04-02 21:29:59 +05:30
Marica	5d14af52a5	Merge branch 'develop' into po_supplier_skip	2020-04-02 21:17:52 +05:30
Deepesh Garg	13dbc4a415	Merge branch 'develop' into fix-patch-dashboard	2020-04-02 20:24:23 +05:30
Shivam Mishra	03a1e31195	Merge branch 'develop' into fix-patch-dashboard	2020-04-02 20:00:11 +05:30
Shivam Mishra	d9a17a9be1	fix (tests): reload doctype	2020-04-02 19:57:11 +05:30
marination	9a39bcd031	fix: Fixed Test Cases for Material Request ... - Reduce quantity on Material Transfer/Issue - No effect on Customer Provided Material Request	2020-04-02 19:36:21 +05:30
Rucha Mahabal	ced978e192	fix: code clean up, performance improvements	2020-04-02 18:45:53 +05:30
Deepesh Garg	872fcb6cae	fix: Travis	2020-04-02 18:11:46 +05:30
marination	686a09620d	fix: Commonified code and added server side validation	2020-04-02 13:51:25 +05:30
rohitwaghchaure	e4fecd725d	Merge pull request #21144 from anupamvs/year-sum-fix ... Sum of years not needed.	2020-04-02 12:01:17 +05:30
Anupam K	b20dbff726	Sum of years not needed.	2020-04-02 11:37:44 +05:30
Deepesh Garg	625acab057	fix: Add duplicate item validation	2020-04-02 11:18:22 +05:30
Anupam K	e48bcb30e7	Sum of years not needed.	2020-04-02 01:04:01 +05:30
Deepesh Garg	94a505d31c	Merge pull request #21135 from marination/stock-ledger-typo ... fix: Typo in stock level validation in Stock Ledger	2020-04-01 11:20:32 +05:30
marination	6f0dc8257c	fix: Typo in stock level validation in Stock Ledger	2020-04-01 11:04:14 +05:30
Marica	7ecacb6360	Merge branch 'develop' into item_code_showing_as_mandatory_issue_develop	2020-04-01 10:47:33 +05:30
Deepesh Garg	5dcd2c118e	Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos ... fix: customer group price list not fetched in pos	2020-04-01 09:42:13 +05:30
Deepesh Garg	8862be769b	Merge pull request #20809 from ronelvcabrera/billing-contact ... feat(Contacts): select billing contact for sales invoice	2020-03-31 20:42:26 +05:30
Nabin Hait	9f6bf71b95	Merge branch 'develop' into healthcare_refactor	2020-03-31 20:31:25 +05:30
Nabin Hait	a0018eed63	Merge branch 'develop' into refactor-addiional-salary	2020-03-31 20:30:52 +05:30
Saqib Ansari	9a7851096c	fix: check if selling price exists then set it	2020-03-31 18:48:35 +05:30
Saqib Ansari	8ed7535e8a	fix: travis	2020-03-31 18:44:02 +05:30
Saqib Ansari	0c8a0c9c3a	fix: no server side validations for accounts in asset category	2020-03-31 18:19:31 +05:30
Poranut Chollavorn	48aa2dd94b	fix(pos): fix pos display item instock	2020-03-31 18:13:55 +05:30
rohitwaghchaure	a19aa0431a	Merge pull request #20826 from saurabh6790/lead-address-fixes ... fix: if mandatory fields are missing do not create address against lead	2020-03-31 17:38:06 +05:30
Deepesh Garg	cf9347d2f5	fix: Undo unneccessary changes	2020-03-31 17:28:43 +05:30
Deepesh Garg	5fd456baa4	Merge branch 'develop' into customer-group-price-list-in-pos	2020-03-31 16:33:41 +05:30
Deepesh Garg	bf884e8b37	Merge pull request #21092 from scmmishra/multiple-option-fix ... fix: use setup from Supplier Quotation Controller	2020-03-31 16:28:47 +05:30
rohitwaghchaure	98a91f489d	Merge pull request #21015 from marination/so-mr-mapping-uom ... fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-31 16:24:37 +05:30
Deepesh Garg	d45e0e0b5b	Merge branch 'develop' into billing-contact	2020-03-31 16:06:11 +05:30
rohitwaghchaure	7845961d46	Merge pull request #21017 from Alchez/dev-remove-same-item-validation ... feat: allow BOM to use same item as raw material (develop)	2020-03-31 16:04:26 +05:30
Nabin Hait	95330c850c	Merge branch 'develop' into healthcare_refactor	2020-03-31 15:59:22 +05:30
Saurabh	84b93414d0	fix: typo	2020-03-31 15:58:00 +05:30
Saurabh	6c8d63f3b9	fix: provision to setup new address from lead if address creation break due to mandatory exception	2020-03-31 15:58:00 +05:30
Saurabh	e567563aa1	fix: if mandatory fields are missing do not create address against lead	2020-03-31 15:58:00 +05:30
rohitwaghchaure	bc415331a2	Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation ... fix: allow target warehouses to be changed for work order stock entries (develop)	2020-03-31 15:44:13 +05:30
Saqib	25846cccbd	fix: warehouse_account_map not getting reset for diff company transac (#20995) ... * fix: warehouse_account_map not getting reset for diff company transaction * fix: potential key errors while fetching warehouse_account_map * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-31 15:31:15 +05:30
Deepesh Garg	bdcc4b47d6	Merge pull request #21061 from anupamvs/customer-doctype-issue ... fix: Adding proper error message	2020-03-31 15:30:46 +05:30
Raffael Meyer	c19330df63	fix: account groups (#21070)	2020-03-31 15:28:45 +05:30
rohitwaghchaure	d274923ae1	fix: "Qty To Manufacture" field as non mandatory in job card (#21081)	2020-03-31 15:28:31 +05:30
rohitwaghchaure	86aff0de1f	fix: serial no scan not adding the serial nos in stock entry (#21083)	2020-03-31 15:26:45 +05:30
Deepesh Garg	242a079bcb	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order	2020-03-31 14:18:30 +05:30
Deepesh Garg	4d9fe69ba5	fix: Test cases	2020-03-31 14:17:53 +05:30
Deepesh Garg	31ea093283	Merge branch 'develop' into customer-doctype-issue	2020-03-31 13:50:40 +05:30
Anupam Kumar	ee0dec8776	fix: email_to, party_type and party are not set in payment request when order made from portal (#21084) ... Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>	2020-03-31 10:51:09 +05:30
Saqib	bba78f0384	fix: auto created asset message (#21108) ... * fix: auto created asset message * Update erpnext/controllers/buying_controller.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-31 10:49:44 +05:30