25317 Commits

Author	SHA1	Message	Date
Shivam Mishra	286ec04197	test(membership): setup test defaults	2020-11-09 14:06:23 +05:30
Shivam Mishra	e0f4dd0643	fix: fieldtype for auto_create_for_web_forms	2020-11-09 14:06:23 +05:30
Shivam Mishra	9d9fa74e6b	refactor(member): drop email column ... * remove email column * update controller methods * add patch to add value from email to email_id	2020-11-09 14:06:23 +05:30
Shivam Mishra	d75ff1a93e	feat: generate invoice on payment authorized	2020-11-09 14:06:23 +05:30
Shivam Mishra	e927224fbc	feat: update membership setting doctype ... * rename enable_auto_invoicing to enable_invoicing * add option to make_payment entry	2020-11-09 14:05:39 +05:30
Suraj Shetty	1183980e0e	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-09 13:14:11 +05:30
Marica	63d1a0436c	Merge branch 'develop' into fix-po-no-fetching	2020-11-09 12:59:10 +05:30
rohitwaghchaure	94bfa6a659	Merge pull request #23843 from frappe/datev_check_fiscal_year ... feat: validate fiscal year	2020-11-09 12:33:15 +05:30
Marica	f72a5a6dca	Merge branch 'develop' into pr-dn-return	2020-11-09 12:19:36 +05:30
Marica	709daf354b	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-09 10:33:32 +05:30
Marica	da2c6444f6	Merge branch 'develop' into bank-link-card-desk	2020-11-09 10:29:51 +05:30
Deepesh Garg	29a8994506	Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch ... fix: Auto Statewise gst tax template	2020-11-08 17:48:57 +05:30
Deepesh Garg	dd94587ef8	fix: Loan write off precision issue	2020-11-07 17:08:30 +05:30
Deepesh Garg	2ad015450e	fix: Remarks fix	2020-11-07 00:14:40 +05:30
Mohammad Hasnain Mohsin Rajan	d54969bd86	Merge branch 'develop' into UAE-VAT-Format	2020-11-06 23:39:34 +05:30
Mohammad Hasnain	c5aad7b6e5	feat(UAE VAT 201): reorder desk page listing	2020-11-06 23:36:50 +05:30
Mohammad Hasnain	4d99d695a3	feat(uae vat 201): update desk page entry	2020-11-06 23:33:19 +05:30
Saqib	e0af8fe8e5	fix: auto fetch sr nos with modifed conversion factor (#23854)	2020-11-06 18:19:36 +05:30
Deepesh Garg	3899079bb9	fix: Loan seurity unpledge msg improvement	2020-11-06 17:39:54 +05:30
Deepesh Garg	3e69756e15	fix: Add better remarks for Loan GL entries	2020-11-06 14:25:09 +05:30
marination	0b4946ba27	fix: Add missing links ... - Added Bank Transaction Statement Entry and Bank Statement Settings	2020-11-06 13:15:46 +05:30
Nabin Hait	06ba92be7a	fix: Added link of bank reconciliation and clearance in accounting desk page	2020-11-06 13:15:38 +05:30
Marica	7e1511f527	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-06 12:28:55 +05:30
Anupam	c3307f7900	fix: replaced formatdate -> format_date	2020-11-06 12:28:38 +05:30
Marica	d845e8a53a	Merge branch 'develop' into pr-dn-return	2020-11-06 12:25:11 +05:30
Marica	9694432270	Merge branch 'develop' into dialog-cleanup	2020-11-06 12:19:41 +05:30
Suraj Shetty	c2d97e9d9c	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-06 10:26:19 +05:30
Raffael Meyer	a62d138748	Merge branch 'develop' into datev_check_fiscal_year	2020-11-05 17:29:42 +01:00
barredterra	f91d82b538	fix: imports	2020-11-05 17:28:39 +01:00
barredterra	815341d454	feat: validate fiscal year	2020-11-05 16:57:23 +01:00
Deepesh Garg	1145b3796c	fix: Remove accrual type from process	2020-11-05 21:21:40 +05:30
Deepesh Garg	a2bff7fbfc	fix: Penalty amount calculation fix	2020-11-05 21:14:29 +05:30
Deepesh Garg	49cc57e76e	fix: Negative amount check for amounts	2020-11-05 21:14:07 +05:30
Anupam Kumar	3a9dc90695	fix: fix: replaced formatdate -> format_date (#23829)	2020-11-05 18:51:56 +05:30
rohitwaghchaure	9a62858da2	Merge pull request #23831 from rohitwaghchaure/incorrect-assign-to-in-asset-maintenance-develop ... fix: incorrect assign to in Maintenance Schedule	2020-11-05 18:43:51 +05:30
Marica	c070f2ed57	Merge branch 'develop' into dialog-cleanup	2020-11-05 18:37:56 +05:30
Marica	08f6c9d5f9	Merge pull request #23820 from marination/so-to-po-dialog-fix ... fix: SO to PO Mapping Issue	2020-11-05 18:29:52 +05:30
pateljannat	5b02d32826	fix: trailling spaces removed	2020-11-05 18:04:14 +05:30
Saqib	bc919e2e7d	fix: cannot expand row in update items dialog (#23839)	2020-11-05 17:38:35 +05:30
Saqib	19df4534f5	fix: asset finance book depreciation posting date fix (#23833)	2020-11-05 16:37:40 +05:30
Deepesh Garg	59ccb64e18	fix: Auto Statewise gst tax template	2020-11-05 16:29:34 +05:30
pateljannat	403822afb3	fix: correcting description field in taxes and charges for accounts that have account number + account name	2020-11-05 16:24:33 +05:30
Afshan	5c93ca7bef	fix: leave ledger patch (#23807) ... Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-11-05 15:45:15 +05:30
Rohit Waghchaure	421348a5f2	fix: not able to select assign to	2020-11-05 15:43:41 +05:30
Marica	6d2bcd2404	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-05 12:25:38 +05:30
Marica	fd2b7d3c1d	Merge branch 'develop' into dialog-cleanup	2020-11-05 12:22:50 +05:30
Marica	7e9b9e7278	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-05 12:19:49 +05:30
Marica	9a4975d3fe	Merge pull request #23823 from marination/delete-quoted-item-old-report ... chore: Delete Quoted Item Comparison Report	2020-11-05 12:19:26 +05:30
rohitwaghchaure	64059db69f	Merge pull request #23814 from Anurag810/stock_ledger_report ... fix: list index out of range on including UOM	2020-11-05 11:49:46 +05:30
Marica	a45f98ba99	Merge branch 'develop' into pr-dn-return	2020-11-05 10:34:23 +05:30
Marica	6ae1b269ea	Merge branch 'develop' into delete-quoted-item-old-report	2020-11-05 09:32:47 +05:30
Marica	6bbdc58d56	Merge branch 'develop' into link-to-mr	2020-11-05 09:31:39 +05:30
Marica	144fef0097	Merge branch 'develop' into item-price-pricing-rule-conflict	2020-11-05 09:28:30 +05:30
Marica	364916fa7b	Merge branch 'develop' into dialog-cleanup	2020-11-05 09:27:57 +05:30
Marica	2f0bd68fde	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-05 09:25:00 +05:30
marination	2b3412ea05	chore: Reposition RFQ fields	2020-11-04 22:07:33 +05:30
Marica	4c81de0810	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-04 21:24:45 +05:30
marination	5de719fc74	chore: Delete Quoted Item Comparison Report	2020-11-04 21:22:22 +05:30
marination	2b8aa91cf2	fix: Make sure row object has doctype so that read only property is applied to rows	2020-11-04 21:00:52 +05:30
Rucha Mahabal	13fb562e9c	fix: sider	2020-11-04 20:25:10 +05:30
igormbq	aa08fb9716	Add location on Asset to use make_demo	2020-11-04 11:40:57 -03:00
Rucha Mahabal	2673c19c1a	fix: therapy plan and session fixes	2020-11-04 20:06:07 +05:30
Afshan	cdc17bb9f3	fix: added code for testing	2020-11-04 19:28:55 +05:30
marination	23b7591c91	fix: SO to PO Mapping Issue ... - removed type: GET , which made the URL longer - Added only relevant fields from Items table to Dialog table to reduce args load - Made separate method to set table data in dialog - Added freeze message	2020-11-04 18:23:00 +05:30
Anurag Mishra	09b8ca0ddb	fix: list index out of range on incilding uom	2020-11-04 15:04:50 +05:30
rohitwaghchaure	0fde102ea5	Merge pull request #23812 from rohitwaghchaure/fixed-sequence-id-column-display ... fix: on save sequence id column override with workstation	2020-11-04 14:25:15 +05:30
rohitwaghchaure	9a0325e2b9	Merge pull request #23801 from rohitwaghchaure/fixed-budget-test-cases ... fix: Budget test cases	2020-11-04 13:27:03 +05:30
Rohit Waghchaure	dd87bcfda0	fix: on save sequence id column override with workstation	2020-11-04 13:26:03 +05:30
Rohit Waghchaure	81b2c8ed60	fix: sequence id override with operation column	2020-11-04 13:10:03 +05:30
Mangesh-Khairnar	2df2b2f351	fix: update integrations desk page (#23767) ... * fix: update integrations desk page * fix: setup dashboard after receiving API callback Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-04 12:48:33 +05:30
Mangesh-Khairnar	1354aecafa	fix: add check for allowing access to european region (#23770)	2020-11-04 12:42:02 +05:30
Frappe PR Bot	f4e410af5f	chore: Update translations (#23787) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-11-04 12:17:40 +05:30
rohitwaghchaure	a53454d3d1	Update test_budget.py	2020-11-04 12:06:21 +05:30
Mohammad Hasnain	bed4e85aec	fix(uae vat 201): date filters were not working	2020-11-04 10:44:22 +05:30
Mohammad Hasnain	510d0d3f20	Merge branch 'UAE-VAT-Format' of https://github.com/hasnain2808/erpnext into UAE-VAT-Format	2020-11-04 10:32:22 +05:30
Mohammad Hasnain	f2c895ddb5	feat(uae vat 201): do not take zero and nil rated items in standard rated expense emiratewise	2020-11-04 10:31:37 +05:30
Mohammad Hasnain Mohsin Rajan	2b2961678c	Merge branch 'develop' into UAE-VAT-Format	2020-11-04 08:43:21 +05:30
marination	7837161a3f	fix: Sider	2020-11-03 22:09:42 +05:30
marination	574477187f	chore: Pricing Rule with Item Price Test	2020-11-03 20:22:48 +05:30
Marica	cf08f0da70	Merge branch 'develop' into item-price-pricing-rule-conflict	2020-11-03 18:29:22 +05:30
pateljannat	846ff323e2	feat: sales order status filter for production plan	2020-11-03 17:35:44 +05:30
Rohit Waghchaure	c8cc4bfc56	fix: Budget test cases	2020-11-03 17:09:09 +05:30
Marica	7b42e8e27c	Merge branch 'develop' into dialog-cleanup	2020-11-03 16:26:06 +05:30
marination	53b1a9a40b	chore: Add Test for missing debit account	2020-11-03 15:56:09 +05:30
Rucha Mahabal	ce8b5fc5ca	Merge branch 'develop' into fix-ipme	2020-11-03 13:56:53 +05:30
Rucha Mahabal	7190e1e4bb	fix: Inpatient Medication Order and Entry fixes	2020-11-03 13:45:12 +05:30
Marica	9a75a60784	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-11-03 12:03:50 +05:30
marination	f21e3fbf04	chore: Tests ... - Added test for mapping secnd return doc - Added test for billing % of partially returned doc - Handled PR with 0 billing amount	2020-11-03 12:01:56 +05:30
Saqib	da878c43fc	fix: cannot save customer email & phone (#23797)	2020-11-03 10:51:09 +05:30
Saqib	c95dff7b7d	fix: cannot add items to cart (#23796) ... * fix: _ is not defined * fix: item image alt gets overflowed due to large text * fix: available item qty in pos search * fix: cash shortcuts overflow	2020-11-03 10:16:58 +05:30
Kevin Chan	a2ba8ea74a	style: Clean up code formatting	2020-11-03 10:57:52 +08:00
Kevin Chan	312561fd77	Merge branch 'develop' into fix/item-price-duplicate-checking	2020-11-03 10:56:23 +08:00
Mohammad Hasnain Mohsin Rajan	6a0b28bde3	Merge branch 'develop' into UAE-VAT-Format	2020-11-02 23:59:13 +05:30
marination	3991b84b2b	chore: Avoid multiline string in Translation & remove print statement	2020-11-02 15:23:41 +05:30
marination	28dd90f3dc	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return	2020-11-02 15:16:31 +05:30
marination	d6596a169c	fix: Billing % Logic and Map Pending Qty only in PR and DN ... - Billing % should consider unreturned amount as total - While mapping to return doc, map unreturned amount - Added field Received Qty in Stock UOM, to tally against Returned Qty in PR - PR billing percentage updation custom function - In patch set received qty in stock uom first, then update returned qty and billing	2020-11-02 15:07:48 +05:30
Mohammad Hasnain	7a034595fe	fix(UAE VAT 201): Remove Chart	2020-11-02 13:12:27 +05:30
Mohammad Hasnain	b0eca23485	Refactor(UAE VAT 201): Fix fomatiing	2020-11-02 12:47:10 +05:30
Deepesh Garg	992bd69fc4	Merge pull request #23785 from deepeshgarg007/place_of_supply ... fix: Place of Supply fix in Sales Invoices	2020-11-02 11:23:25 +05:30
Mohammad Hasnain	c53237f5e0	refactor(UAE VAT 201): solve syntax errors	2020-11-02 11:02:41 +05:30
Mohammad Hasnain Mohsin Rajan	c8d8d0868d	Merge branch 'develop' into UAE-VAT-Format	2020-11-02 10:36:03 +05:30
Mohammad Hasnain Mohsin Rajan	d322181fd7	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:29:38 +05:30
Mohammad Hasnain Mohsin Rajan	7b771d139c	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:29:14 +05:30
Mohammad Hasnain Mohsin Rajan	46265d3fc7	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:28:41 +05:30
Mohammad Hasnain Mohsin Rajan	be7a4c8b0a	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:28:14 +05:30
Mohammad Hasnain Mohsin Rajan	f116fbf84d	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:27:54 +05:30
marination	542ae6ab97	chore: Linter and Sider fixes ... - Translatable strings cannot be multi line or be formatted by '+' - Reduce no of tabs in stock_entry.js	2020-11-02 08:50:48 +05:30
Marica	e0ec58d8fa	Merge branch 'develop' into link-to-mr	2020-11-01 23:48:58 +05:30
Deepesh Garg	eacfd792e6	fix: fieldname	2020-10-30 22:12:24 +05:30
Deepesh Garg	db3fa4e6b2	fix: Place of Supply fix in Sales Invoices	2020-10-30 19:19:48 +05:30
marination	97d38548aa	chore: Purchase Invoice Get Items From cleanup	2020-10-30 17:50:25 +05:30
marination	66b2b544f8	chore: Purchase Receipt, added required by date in PO popup	2020-10-30 17:45:28 +05:30
marination	08e5031be2	chore: Supplier Quotation Get Items From cleanup	2020-10-30 17:36:20 +05:30
marination	e14fdf4a3c	chore: RFQ cleanup and Title case for 'Get Items From' ... - Cleanup up RFQ Get Items From Dialogs - Title cased 'Get items from' to 'Get Items From'	2020-10-30 17:06:00 +05:30
rohitwaghchaure	c451c08824	Merge pull request #23777 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry-develop ... fix: po_detail field has no value for subcontracted stock entry	2020-10-30 16:48:11 +05:30
rohitwaghchaure	ce7f9dffa9	Merge pull request #23781 from rohitwaghchaure/patch-to-update-reason-for-leaving ... fix: patch to update reason for leaving in employee	2020-10-30 16:47:48 +05:30
Shivam Mishra	2d1f8341f9	feat: update onboarding for accounts	2020-10-30 15:55:19 +05:30
Shivam Mishra	18ef17f3ba	feat: add tour for sales taxes template	2020-10-30 15:55:19 +05:30
Rohit Waghchaure	e1781dc0bb	fix: patch to update reason for leaving in employee	2020-10-30 15:34:04 +05:30
Saqib	32442008dc	fix: asset finance book posting date fix (#23778)	2020-10-30 15:30:18 +05:30
Rohit Waghchaure	71913c36a7	fix: po_detail field has no value for subcontracted stock entry	2020-10-30 14:35:16 +05:30
marination	6bf507a54b	chore: (MR)Added delivery date in SO dialog	2020-10-30 13:59:47 +05:30
Marica	b05318aa51	Merge branch 'develop' into prod-plan-status	2020-10-30 12:33:27 +05:30
Mohammad Hasnain Mohsin Rajan	30197d7fba	Merge branch 'develop' into UAE-VAT-Format	2020-10-30 10:29:56 +05:30
rohitwaghchaure	707788da4b	Merge pull request #22711 from rohitwaghchaure/multiple-pricing-rules-are-not-applied ... fix: multiple pricing rules are not working on selling side	2020-10-30 02:42:51 +05:30
Marica	9dc4941072	Merge branch 'develop' into prod-plan-status	2020-10-30 00:53:10 +05:30
François de Ryckel	ca5f5cb367	Update student_attendance.py (#23761) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-10-29 23:04:13 +05:30
Rucha Mahabal	9db26155ad	fix: set SLA variance in seconds for Duration fieldtype (#23765) ... * fix: calculate SLA variance in seconds for Duration fieldtype * fix: sider	2020-10-29 22:39:21 +05:30
rohitwaghchaure	445d23223b	Merge branch 'develop' into multiple-pricing-rules-are-not-applied	2020-10-29 22:25:19 +05:30
Anupam Kumar	e43f8f12d5	Merge branch 'develop' into project-timesheet	2020-10-29 22:03:31 +05:30
Anupam	9002904131	feat: added project link in timesheet form	2020-10-29 21:36:31 +05:30
Deepesh Garg	9c67629e28	fix: Ignore cancelled entries instock balance report (#23757) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-29 19:51:57 +05:30
Nabin Hait	b7285fdcad	Merge branch 'develop' into prod-plan-status	2020-10-29 18:58:32 +05:30
Nabin Hait	2bb110b3d1	Merge branch 'develop' into fix-po-no-fetching	2020-10-29 18:57:33 +05:30
Marica	8f6bd851d3	chore: Show Toast alert feedback on Scanning Barcode (#23760)	2020-10-29 18:55:52 +05:30
Marica	bf54ea9976	chore: (Production Plan) Simplify and fix translation in message popup (#23753)	2020-10-29 18:54:36 +05:30
rohitwaghchaure	d0c2700c85	fix: subscription test case (#23763) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-29 18:52:16 +05:30
prssanna	71e5b60df1	refactor: refactor contextual print setting implementation	2020-10-29 14:19:34 +05:30
Saqib	b193731158	fix: pos profile has no attr 'show_only_available_items' (#23758)	2020-10-29 13:23:50 +05:30
Marica	1b8a1cfed2	Merge branch 'develop' into prod-plan-status	2020-10-29 13:02:19 +05:30
Mohammad Hasnain Mohsin Rajan	55c78b17ba	fix(UAE VAT 201): change desk page record	2020-10-29 12:43:43 +05:30
Kenneth Sequeira	10f2468076	fix: make asset dashboard charts public (#23751)	2020-10-29 12:02:48 +05:30
Syed Mujeer Hashmi	c17cdd7c2e	fix: Fix for LMS Sign Up link (#23743) ... Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-10-29 11:10:06 +05:30
Mohammad Hasnain	eb3084b072	refactor(UAE VAT 201): break functions	2020-10-29 09:52:17 +05:30
Mohammad Hasnain	bf261a6c39	fix(UAE VAT 201): fix helper	2020-10-29 00:07:52 +05:30
Mohammad Hasnain	08846f6b11	refactor(UAE VAT 201): replace cartesian product to inner joins	2020-10-28 23:33:56 +05:30
Mohammad Hasnain	2c00549dfe	refactor(UAE VAT 201): Use frappe api instead sql	2020-10-28 22:54:56 +05:30
Deepesh Garg	ae6a51b83a	Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix ... fix: Do not allow Company as accounting dimension	2020-10-28 22:05:11 +05:30
Mohammad Hasnain Mohsin Rajan	6e9e6d2491	Merge branch 'develop' into UAE-VAT-Format	2020-10-28 21:06:11 +05:30
Rohit Waghchaure	0fa741b267	added test cases	2020-10-28 17:43:36 +05:30
Deepesh Garg	94a630c255	fix: Do not allow Company as accounting dimension	2020-10-28 17:15:14 +05:30
Saqib	a51d9e3259	fix: pos register shows cancelled documents (#23747)	2020-10-28 17:08:47 +05:30
Saqib	7d9dd3c628	fix: item wise tax calculation (#23744)	2020-10-28 17:07:10 +05:30
Rohit Waghchaure	a248dfb9a5	fix: multiple pricing rules are not working on selling side	2020-10-28 16:22:49 +05:30
Faris Ansari	bc6a2b2f9c	wip	2020-10-28 13:54:11 +05:30
Deepesh Garg	c9a6135d6c	fix: Interest accrual after loan topup	2020-10-28 13:38:15 +05:30
Marica	7496ac0fe2	Merge branch 'develop' into pr-dn-return	2020-10-28 11:54:01 +05:30
Rushabh Mehta	1dd54e457d	Merge pull request #23734 from rmehta/quality-form-cleanup ... fix(cleanup): Quality Module, cleanup of forms, dashboards etc.	2020-10-28 11:36:00 +05:30
Mohammad Hasnain	81f2efd9b0	chore(UAE VAT 201): Rename emirate to vat emirate	2020-10-28 10:28:25 +05:30
Marica	4326d21a79	Merge branch 'develop' into purchase-invoice-payment-terms	2020-10-27 18:40:20 +05:30
Rushabh Mehta	12a2e51e20	fix(minor): translation string encoding in quality_procedure.py	2020-10-27 18:38:44 +05:30
Rushabh Mehta	cf1428904a	fix(refactor): refactor tests, client side code	2020-10-27 17:36:30 +05:30
Marica	cf8698fb0b	Merge branch 'develop' into pr-dn-return	2020-10-27 15:34:51 +05:30
marination	67f2c82d90	chore: Test case for Payment Terms in PI from PR	2020-10-27 14:49:43 +05:30
Deepesh Garg	0db4d91c30	Merge pull request #23550 from nextchamp-saqib/add-acc-to-a-group-fix ... chore: validate is_group of child parent account	2020-10-27 13:54:17 +05:30
marination	fa085d7f4b	fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt	2020-10-27 13:18:30 +05:30
Marica	16a1f7e7e3	Merge branch 'develop' into link-to-mr	2020-10-27 11:49:35 +05:30
Afshan	0a6e1b3503	fix: refactor	2020-10-26 21:23:31 +05:30
Afshan	bd987e56bc	fix: showing error for wrong filters. (#23726) ... * fix: showing error for wrong filters. * style: formatting translation	2020-10-26 19:37:33 +05:30
Saqib	fa5fe18b70	fix error message ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-10-26 19:27:02 +05:30
Deepesh Garg	13f4b3fc17	fix: Translation syntax	2020-10-26 19:01:36 +05:30
Deepesh Garg	a630de56e9	fix: Loan disbursement amount validation check	2020-10-26 18:53:56 +05:30
Deepesh Garg	64a4437b48	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-26 18:41:32 +05:30
Afshan	3f971b2371	fix: copying po no when mapping doc	2020-10-26 16:59:57 +05:30
Deepesh Garg	5b4742fd25	fix: Permission fixes for some doctypes	2020-10-26 16:56:05 +05:30
marination	689b77d1ed	fix: Don't show buttons if status is Completed	2020-10-26 16:28:39 +05:30
Rushabh Mehta	ea49e30bfd	fix(cleanup): cleaned up forms	2020-10-26 15:30:52 +05:30
marination	097b32fe67	feat: Close Production Plan	2020-10-26 15:27:37 +05:30
Deepesh Garg	d63fbd79f4	fix: Unaccrued interest from last accrual date instead of disbursement date	2020-10-26 14:20:55 +05:30
rohitwaghchaure	8ba05dc674	Merge branch 'develop' into skip-non-apply-tds-invoices-develop	2020-10-26 14:11:34 +05:30
Rohit Waghchaure	103ecec9d4	fixed translation syntax	2020-10-26 12:20:11 +05:30
Rohit Waghchaure	9caac6976c	fix: incorrect supplied qty error	2020-10-26 12:19:00 +05:30
Rohit Waghchaure	538d62b43d	fix: incorrect consumed qty if raw material with batch	2020-10-26 12:19:00 +05:30
rohitwaghchaure	4c688b71f3	fix: consumed qty logic for subcontracted raw materials (#23314) ... * fix: consumed qty logic for subcontracted raw materials * added test case * fix: sales order workflow test case	2020-10-26 12:19:00 +05:30
rohitwaghchaure	1cfa61628d	fix: incorrect calculation for consumed qty for subcontract item (#23257) ... * fix: incorrect calculation for consumed qty for subcontract item * added test case	2020-10-26 12:19:00 +05:30
Saqib	60212ff9b9	fix: multiple pos issues (#23347) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-26 11:17:04 +05:30
Mohammad Hasnain	5953acab8b	chore(UAE VAT 201): cleanup	2020-10-25 15:43:21 +05:30
Mohammad Hasnain	0ceae0bd66	feat(UAE VAT 201): emirate customizable	2020-10-25 13:06:42 +05:30
Frappe PR Bot	33881fd7e2	chore: Update translations (#23717) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-10-25 12:36:35 +05:30
Mohammad Hasnain	0ac40c75aa	chore(UAE VAT): update tesr dependencies	2020-10-25 01:16:06 +05:30
Nabin Hait	ba1cca6b2d	fix: Show accounts in financial statements upto level 20 (#23718)	2020-10-24 22:00:32 +05:30
rohitwaghchaure	58016b07e0	Merge branch 'develop' into opportunity-status	2020-10-24 19:09:38 +05:30
rohitwaghchaure	8be296b343	Merge pull request #23675 from rohitwaghchaure/feat-added-balance-serial-no-column-develop ... feat: balance serial nos in stock ledger report	2020-10-24 19:04:31 +05:30
Rucha Mahabal	434791ed6e	feat: Therapy Plan Template (#23558) ... * feat: Therapy Plan Template * feat: Handle billing Therapy Plans created via Templates * feat: add dashboard to Therapy Plan Template * fix: codacy issues * fix: sider * fix: validate Therapy Session overlap * feat: Create Sales Invoice from Therapy Plan * fix: sider * chore: added tests for Therapy Plan Template * fix: test * fix: test Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-24 14:20:38 +05:30
Rucha Mahabal	5ecf6b34b0	Merge branch 'develop' into education-module-fixes	2020-10-24 00:27:24 +05:30
Rucha Mahabal	1c4d732873	fix: sider and translation issues	2020-10-24 00:21:05 +05:30
Rucha Mahabal	b3f81ad5b0	fix: allow future attendance marking for leave applications	2020-10-23 21:21:58 +05:30
Rucha Mahabal	4887b69946	feat: Inpatient Medication Order and Entry (#23473) ... * feat: Inpatient Medication Order * feat: Inpatient Medication Entry * feat: update medication orders on medication entry submission * feat: added custom fields for medication references in Stock Entry * feat: make stock entry if update stock is checked in IPMOE * fix: handle cancel event for Inpatient Medication Entry * fix(ux): add link and progress bar to dashboard * refactor(ux): Adding Medication Orders without linking to Patient Encounter * fix: make medication entry child table read only * fix: filter stock items during manual medication order creation * fix: codacy * chore: tests for Inpatient Medication Order * chore: tests for Inpatient Medication Entry * fix: code clean-up * fix: filter for inpatients in IPMO * fix: add datetime validations for IPME filters * fix: do not hardcode stock entry type Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 20:33:30 +05:30
Marica	6f45a86920	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-23 19:56:15 +05:30
Marica	97e065f94f	Merge branch 'develop' into link-to-mr	2020-10-23 19:47:18 +05:30
Marica	3ad9393ff8	fix: SO to PO flow improvement (#23357) ... * fix: SO to PO flow improvement * fix: Dont map shipping_address - shipping_address is a text field in SO and link field in PO - Drop shipping case handles its mapping - normal case doesnt need to map * fix: Hide/Add rows depending on Against Default Supplier * fix: Removed Default Supplier Select field from popup - removed Default Supplier Select field from popup - only loop through suppliers of selected items if via default supplier - only check for items in selected items * fix: Sales Order Drop Shipping Test * fix: (translation)Multi line to single line strings Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:40:55 +05:30
Marica	0bd576aa44	fix: RFQ UX fixes (#23382) ... * chore: RFQ UX fixes * fix: RFQ to SUpplier Quotation Dialog * fix: Remove 'No Quote' functionality - No Quote in Suppliers table is removed - It's use everywhere has been removed too (tests, server side files, DOM event) * chore: More Info section and Project field Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:38:30 +05:30
Deepesh Garg	c4be397954	Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration ... feat: M-pesa integration	2020-10-23 19:35:52 +05:30
Saqib	b4448114cf	feat: opening invoice creation tool with background jobs (#23595) ... * feat: opening invoice creation tool with background jobs * fix: tests * fix: codacy * fix: sider * fix: codacy Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:32:37 +05:30
Marica	758a68da35	fix: Sequence Matcher shouldn't get None input (#23539) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:26:43 +05:30
Deepesh Garg	2b3f8e0c3b	fix: Cancel repayment accrual interest entry on payment cancellation	2020-10-23 19:02:24 +05:30
Rucha Mahabal	b01334d2e1	fix: attendance cannot be marked outside of Academic Year validation	2020-10-23 18:32:33 +05:30
Michelle Alva	b39c17dd55	fix: Typo/Grammatical fixes in Settings (#23612) ... * fix(Stock Settings): Type/Grammatical fixes in Settings * fix: grammatical fixes in manufacturing settings * fix: typo fix in accounting settings * fix: typo fixes in HR settings * fix: typo fixes in buying settings * fix: typo fixes in Selling Settings * Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Update accounts_settings.json Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rushabh Mehta <rmehta@gmail.com> Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-10-23 18:22:26 +05:30
rohitwaghchaure	93bbc52a68	feat: added sequence id in routing for the completion of operations sequentially (#23641) ... * feat: added sequence id in routing for the completion of operations sequentially * fix: translation syntax	2020-10-23 18:18:03 +05:30
Marica	9d94f785e9	fix: Hide Ex-Employees from Employee Tree and minor message UX (#23711) ... * fix: Hide Ex-Employees from Employee Tree and minor message UX * fix: translation syntax	2020-10-23 18:15:55 +05:30
Rucha Mahabal	8b4d33474e	fix: validation for attendance marked on future dates	2020-10-23 16:23:30 +05:30
Rucha Mahabal	6c3efbdb48	fix: filters for course and academic term fields	2020-10-23 16:11:40 +05:30
rohitwaghchaure	4eb87ea8e2	Merge pull request #23695 from rohitwaghchaure/fix-stock-entry-consumption-issue ... fix: incorrect backflush qty in manufacture entry	2020-10-23 15:43:43 +05:30
Mangesh-Khairnar	675f79920e	fix: consider the existing paid payment request for phone payment channel	2020-10-23 15:41:05 +05:30
Rohit Waghchaure	558879fad7	fix: Translation Syntax	2020-10-23 13:42:51 +05:30
Mangesh-Khairnar	e03a02d9c0	fix: show descriptive message for missing fields	2020-10-23 13:38:55 +05:30
marination	efcc489967	fix: Cashier Closing Type Issue	2020-10-23 11:55:03 +05:30
Deepesh Garg	ca6cb6433c	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove	2020-10-22 21:52:16 +05:30
Deepesh Garg	cd2c90451e	fix: Unaccrued interest after disbursal	2020-10-22 21:50:06 +05:30
Nabin Hait	f30c389e4d	Merge branch 'develop' into naming-series-proj	2020-10-22 21:46:13 +05:30
Nabin Hait	db474aea95	Merge branch 'develop' into link-to-mr	2020-10-22 21:45:07 +05:30
Nabin Hait	ed1553ea81	Merge branch 'develop' into mpesa-integration	2020-10-22 21:45:03 +05:30
Nabin Hait	c77ce99ce8	Merge branch 'develop' into UAE-VAT-Format	2020-10-22 21:44:55 +05:30
Nabin Hait	5778595d50	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-22 21:42:54 +05:30
Nabin Hait	9ff4a2ebd8	Merge branch 'develop' into feat-added-balance-serial-no-column-develop	2020-10-22 21:40:29 +05:30
prssanna	13c6e2f320	feat: contextual setting for print uom after quantity	2020-10-22 17:19:00 +05:30
Marica	3b1be2b1de	fix: Add Taxes if missing via Update Items (#23702) ... * fix: Add Taxes if missing via Update Items * chore: PO Test for adding tax row via Update Items * chore: SO Test for adding tax row via Update Items	2020-10-22 17:04:31 +05:30
rohitwaghchaure	e3ad5f0bc3	Merge pull request #23407 from deepeshgarg007/stock_entry_conversion_factor ... fix: Conversion factor fixes in Stock Entry	2020-10-22 16:58:06 +05:30
Saqib	a6ff664386	fix: cannot auto unlink payments for credit/debit notes (#23689)	2020-10-22 16:30:57 +05:30
prssanna	d7b704c90f	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-22 15:39:47 +05:30
prssanna	b57b3c9f6c	feat: hook to fetch additional print settings in print view	2020-10-22 15:37:47 +05:30
rohitwaghchaure	cc5171a324	Merge branch 'develop' into stock_entry_conversion_factor	2020-10-22 15:20:32 +05:30
Saqib	52435ee291	Merge branch 'develop' into UAE-VAT-Format	2020-10-22 14:16:28 +05:30
Suraj Shetty	6a0eb61af3	fix: Set customer only if contact is present (#23704)	2020-10-22 14:05:58 +05:30
Rohit Waghchaure	fa842e8774	fix: incorrect backflush qty in manufacture entry	2020-10-22 13:35:27 +05:30
Michelle Alva	52514a30d7	feat: Add Integrations Settings in desk (#22857) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-10-22 09:52:34 +05:30
Deepesh Garg	2c97244bad	fix: Test Cases	2020-10-22 09:34:27 +05:30
Mangesh-Khairnar	1a6d82a447	fix(payment-request): only consider paid transactions	2020-10-22 01:07:49 +05:30
Deepesh Garg	3f177bffac	fix: Add test for loan top up	2020-10-21 22:15:18 +05:30
Deepesh Garg	8f9bab79a7	fix: Update no copy fields	2020-10-21 19:03:13 +05:30
Deepesh Garg	13cbda110d	fix: Test Case	2020-10-21 16:11:52 +05:30
Mangesh-Khairnar	c8a04fec35	fix(mpesa-settings): add test cases to verify transactions	2020-10-21 14:07:00 +05:30
Shivam Mishra	5e00ed926c	feat: update icons	2020-10-21 12:30:22 +05:30
Shivam Mishra	9d468a8daf	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-21 11:38:31 +05:30
Deepesh Garg	2f65ab5355	fix: Validatiion for loan write off amountt	2020-10-21 10:40:59 +05:30
Saqib	4970386990	Merge branch 'develop' into UAE-VAT-Format	2020-10-20 18:38:44 +05:30
Mohammad Hasnain	8796567b42	chore(UAE VAT 201): add puctuation	2020-10-20 16:35:28 +05:30
Deepesh Garg	ce95bc2ce0	Merge pull request #23691 from nextchamp-saqib/fix-#214 ... fix: '>' not supported between instances of 'str' and 'int'	2020-10-20 14:17:55 +05:30
Mohammad Hasnain	33e9a1ab31	refactor(UAE VAT 201): solve linting issues	2020-10-20 13:04:38 +05:30
Saqib Ansari	903055b7b6	fix: '>' not supported between instances of 'str' and 'int'	2020-10-20 11:59:06 +05:30
Mohammad Hasnain	6a24da4efd	refactor(UAE VAT 201): break functions	2020-10-20 11:53:06 +05:30
Rohit Waghchaure	09572f10f8	fix: overproduction, not allowed to transfer extra materials	2020-10-20 11:01:36 +05:30
Mohammad Hasnain	c08591124c	chore(UAE VAT 21): solve merge conflicts	2020-10-20 10:17:48 +05:30
Rohit Waghchaure	6471912216	fix: not able to do overproduction	2020-10-20 10:02:01 +05:30
Mohammad Hasnain	75ccb62d46	Merge branch 'develop' into UAE-VAT-Format	2020-10-20 09:40:44 +05:30
Mohammad Hasnain	78ec254da4	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-10-20 09:39:01 +05:30
Mohammad Hasnain	234036df32	chore(uae vat 201): solve travis issues	2020-10-20 07:42:10 +05:30
Mohammad Hasnain	853fd03f49	feat(uae vat 201): fix linter issues	2020-10-19 22:35:16 +05:30
Mohammad Hasnain	33cdfdfb7f	feat(UAE VAT 201): Add tests for report	2020-10-19 20:48:43 +05:30
Mohammad Hasnain	c1b8004757	feat(UAE VAT 21): claimable to recoverable	2020-10-19 20:47:56 +05:30
Mangesh-Khairnar	5c29eb08c4	Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration	2020-10-19 18:29:46 +05:30
Mangesh-Khairnar	ebb8ee3dc6	fix(payment gateway account): add patch to set the payment channel as email	2020-10-19 18:27:40 +05:30
Mohammad Hasnain	32eb9a7893	feat(UAE VAT 201): claimable to recoverable	2020-10-19 17:58:50 +05:30
Joseph Marie Alba	8115be58a3	fix: Posting Date bug in load_defaults (#23415) ... this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored. Example: (Assuming posting date has been included in standard filter) ``` frappe.ui.form.on('Journal Entry', { before_load(frm) { var posting_date = $("input[data-fieldname='posting_date']")[0].value posting_date = moment(posting_date)._d frm.set_value('posting_date', posting_date ) } }) ``` Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored. Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-10-19 17:02:04 +05:30
Rucha Mahabal	174019a838	fix: Student Admission and Student Applicant fixes (#23515) ... * fix: student admission list portal styling * fix: added basic validations to Student Admission DocType * fix: show program description and apply button for every program * fix: don't show apply now button if admissions have not started * fix: fetch admission details in student applicant web form Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 17:00:56 +05:30
Deepesh Garg	8859b71956	fix: Check for backdated validation only for transaction company (#23639) ... * fix: Check SLE only for transaction company * fix: Add tests * fix: Move backdated entry validation from transaction base to stock ledger entry * chore: Add tests Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 16:56:45 +05:30
Afshan	e0cb6c3b9d	fix: removed extra space from label "Rate" (#23683)	2020-10-19 16:55:20 +05:30
rohitwaghchaure	3a17147a32	refactor: book loss amount in the COGS instead of stock received but not billed (#23671)	2020-10-19 16:54:11 +05:30
Glen Whitney	f5a8dc0f9c	fix(Bank Reconciliation): update/merge CR/DR journal entry search (#23629) ... * fix(Bank Reconciliation): update/merge CR/DR journal entry search Prior to this commit, the debit journal entry search (for credit-side Bank Transaction entries) and the corresponding credit journal entry search had diverged, with the latter working but the former not working. Thus, the search for journal entries matching a credit Bank Transaction (for the purposes of reconciliation) was never returning any matching journal entries, making reconciliation difficult. To fix this, this commit not only updates the debit journal entry search, but takes advantage of the fact that the two SQL queries for the two sides (debit/credit) differ only by the word "debit" or "credit," to merge the code for the two queries, making the code more DRY and hopefully reducing the chance of similar bugs occurring in the future. * fix: message translation Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 16:49:55 +05:30
Shivam Mishra	2c2e7297ae	feat: update accounts onboarding	2020-10-19 14:44:02 +05:30
Shivam Mishra	8261df29c4	feat: update splash logo	2020-10-19 13:52:35 +05:30
Saqib	896a0cc1f7	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-19 11:55:12 +05:30
rohitwaghchaure	2fbeb7c1dd	refactor: added new filters in the Batch-wise balance history report (#23676) ... * refactor: added new filters in the Batch-wise balance history report * fix: added semicolon Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 11:37:54 +05:30
Frappe PR Bot	083f3fd981	chore: Update translations (#23677) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 11:19:27 +05:30
Rucha Mahabal	96bd65e203	fix: duplicate validation for Course Enrollment (#23659) ... * fix: duplicate validation for Course Enrollment * fix: clean-up failing tests	2020-10-19 10:41:25 +05:30
rohitwaghchaure	5d6686bd8c	Fixed stock ageing report data develop (#23673) ... * fix: stock ageing report * Update stock_ageing.py	2020-10-19 10:39:20 +05:30
rohitwaghchaure	21bf5e9b8e	Fixed incorrect operation time calculation develop (#23674) ... * fix: incorrect operation time calculation for batch size * Update test_work_order.py	2020-10-19 10:38:48 +05:30
Deepesh Garg	8cd8dbe15d	fix: Add write off test	2020-10-18 22:26:09 +05:30
Deepesh Garg	9945ccc0cc	fix: Write Off amount handling in Loan accrual and closure	2020-10-18 22:25:24 +05:30
Rucha Mahabal	c3b1aef9f9	fix(minor): msgprint not defined in POS Invoice (#23680) ... * fix(minor): msgprint not defined in POS Invoice * fix: translation friendly syntax	2020-10-18 19:28:26 +05:30
Deepesh Garg	c0e24735e3	feat: Add loan write off doctype	2020-10-17 22:31:36 +05:30
Faris Ansari	c6f4e84a45	Merge pull request #23640 from abhishekbalam/address_customisation	2020-10-16 18:21:09 +05:30
Marica	569e218aa0	Merge pull request #23666 from marination/payment-reco-mandatory-check ... fix: Payment Reconciliation client side validations	2020-10-16 18:06:16 +05:30
Rohit Waghchaure	e6a29cc33a	fix: performance issue while adding template item in the cart	2020-10-16 17:59:54 +05:30
Rohit Waghchaure	76fafe8842	feat: balance serial nos in stock leder report	2020-10-16 17:58:54 +05:30
Rohit Waghchaure	c70cc0d950	fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled	2020-10-16 17:43:36 +05:30
rohitwaghchaure	e30397bf2e	Merge pull request #23668 from rohitwaghchaure/incorrect-work-order-qty-againt-production-plan-develop ... fix: production plan incorrect work order qty (#23264)	2020-10-16 17:41:25 +05:30
Deepesh Garg	eb3983ec6c	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove	2020-10-16 17:31:38 +05:30
Marica	ca5ad076d5	Merge branch 'develop' into link-to-mr	2020-10-16 16:49:38 +05:30
marination	359778e235	chore: Code cleanup, reduce redundancy	2020-10-16 16:47:23 +05:30
rohitwaghchaure	6646c524e6	Merge pull request #23670 from rohitwaghchaure/enabled-no-copy-for-bill-date-devlop ... refactor: enabled no copy property for Supplier Invoice Date to due date validation	2020-10-16 16:45:56 +05:30
rohitwaghchaure	4eaa74c4f5	Merge pull request #23669 from rohitwaghchaure/not-able-to-make-material-request-from-so-develop ... fix: not able to make material request from SO	2020-10-16 16:43:45 +05:30
Marica	3f7333af7f	Merge branch 'develop' into payment-reco-mandatory-check	2020-10-16 16:03:59 +05:30
marination	b14ffc4349	fix: Missing semicolon	2020-10-16 16:04:56 +05:30
Faris Ansari	be0fcbea68	fix: Dont add Contact link if is company address	2020-10-16 15:55:25 +05:30
Faris Ansari	22bcad9dc7	fix: Cleanup code	2020-10-16 15:28:12 +05:30
Rohit Waghchaure	3cdaa92582	refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation	2020-10-16 15:26:27 +05:30
Rohit Waghchaure	2ce67b0ef9	fix: not able to make material request from SO	2020-10-16 15:21:52 +05:30
rohitwaghchaure	f01856d7a9	fix: production plan incorrect work order qty (#23264) ... * fix: production plan incorrect work order qty * added test case * Update test_production_plan.py	2020-10-16 15:19:23 +05:30
Shivam Mishra	5418818683	feat: add tour for account settings	2020-10-16 14:24:22 +05:30
marination	e9b04dc727	fix: Payment Reconciliation client side validations	2020-10-16 12:36:13 +05:30
Saqib	2f71927af8	fix: fuel expense amount of vehicle log (#23632) ... * fix: fuel expense amount of vehicle log * fix: undefined var employee_id in test * fix: test	2020-10-16 12:32:59 +05:30
Mangesh-Khairnar	c66fce4965	fix: reload current pos doc after updating the information via callback	2020-10-16 12:03:08 +05:30
Mangesh-Khairnar	cab5d22ef5	fix: add a realtime publish to refresh the dashboard content	2020-10-16 11:38:07 +05:30
prssanna	5ee7bca185	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-16 11:32:10 +05:30
prssanna	12d4be7f3f	feat: icons in leaderboard	2020-10-16 11:31:47 +05:30
Saqib Ansari	de505631a6	fix: codacy	2020-10-16 11:30:34 +05:30
Saqib Ansari	1dec68e8e4	fix: transalation syntax	2020-10-16 10:47:29 +05:30
Deepesh Garg	775e689ba9	fix: Add tests	2020-10-15 22:09:05 +05:30
Deepesh Garg	01a7297f69	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor	2020-10-15 17:13:29 +05:30
Rohit Waghchaure	5f465394a7	fix: serial no field is blank in stock reconciliation	2020-10-15 15:56:50 +05:30
rohitwaghchaure	79c1c4e3fb	Merge pull request #23398 from anupamvs/quality-procedure-v13 ... fix: quality procedure parent	2020-10-15 15:52:22 +05:30
Shivam Mishra	cb8457b9ae	feat: add description to Accounts onboarding	2020-10-15 13:53:12 +05:30
Abhishek Balam	349fcfd6a5	fix: set default filters on unchecking box, code cleanup	2020-10-15 12:21:43 +05:30
Wolfram Schmidt	3959ed5bef	Update payment_term.json (#23644) ... added descriptions to fields to clarify input.	2020-10-14 22:48:46 +05:30
Deepesh Garg	ddccec4f5d	Merge pull request #23643 from deepeshgarg007/payment_reco_cancel ... fix: Do not get cancelled vouchers in Payment Reconciliation	2020-10-14 22:09:08 +05:30
Deepesh Garg	37c2ed269e	fix: Do not get cancelled vouchers in Payment Reconciliation	2020-10-14 21:47:43 +05:30
Abhishek Balam	89419c9a30	fix: move get_shipping_address() from frappe to erpnext and fix references	2020-10-14 20:09:05 +05:30
Abhishek Balam	2f528c1c73	fix: gettext import and changed function order in address.py	2020-10-14 19:48:57 +05:30
Abhishek Balam	c0215d257c	Merge branch 'develop' into address_customisation	2020-10-14 19:33:16 +05:30
Abhishek Balam	6e9e7b4c7a	fix: serverside validation overrides	2020-10-14 19:31:37 +05:30
Abhishek Balam	38b26c8f3e	fix: added semicolons	2020-10-14 18:24:51 +05:30
rohitwaghchaure	f8ce64c0ca	Merge pull request #23443 from marination/rfq-email ... feat: Supplier Email Preview in RFQ	2020-10-14 18:16:59 +05:30
Abhishek Balam	346ca568b7	fix: set company link in address when is_your_company_address is set	2020-10-14 18:11:04 +05:30
Mohammad Hasnain	b9dc13294d	chore(UAE VAT 201) solve translations issues	2020-10-14 16:56:26 +05:30
Nabin Hait	a2d6f254c5	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-14 16:34:56 +05:30
Afshan	9e08b21e0b	fix: removing unused imports (#23633)	2020-10-14 15:44:52 +05:30
Saqib	577a7fe01d	fix: stock & account balance difference in fraction (#23635)	2020-10-14 15:44:30 +05:30
Marica	1cdb9b5b39	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-14 14:26:22 +05:30
marination	b5d16a82eb	fix: Dont overrule Item Price via Pricing Rule Rate if 0	2020-10-14 14:05:54 +05:30
Mohammad Hasnain	dfc3993cec	chore(UAE VAT 21): rename report	2020-10-14 12:21:36 +05:30
Anupam	d8a002cd8e	Merge branch 'opportunity-status' of https://github.com/anupamvs/erpnext into opportunity-status	2020-10-14 11:48:42 +05:30
Raffael Meyer	d1863e6f9e	fix: Chart of Accounts (#23530) ... * fix: Chart of Accounts * fix: Chart of Accounts with lower case "of" Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-14 10:29:53 +05:30
Anupam Kumar	31417864cb	fix: project value is missing from procurement-tracker (#23549) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-14 10:29:25 +05:30
Frappe PR Bot	d8ddc321f8	chore: Update translations (#23577) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-14 10:28:21 +05:30
Mohammad Hasnain Mohsin Rajan	abf628c95d	Merge branch 'develop' into UAE-VAT-Format	2020-10-14 00:26:57 +05:30
rohitwaghchaure	cb791330f6	Merge branch 'develop' into quality-procedure-v13	2020-10-13 23:39:45 +05:30
Rucha Mahabal	f625da2b8b	Merge branch 'develop' into enrollment-fixes	2020-10-13 23:24:42 +05:30
rohitwaghchaure	4d93bfebd8	Merge pull request #23622 from AfshanKhan/fix-billing-summary-report-precision ... fix: setting user defined precision instead of 2	2020-10-13 22:46:02 +05:30
Rucha Mahabal	ff0917358c	fix: test	2020-10-13 22:39:05 +05:30
Saqib	639eea142f	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-13 21:42:22 +05:30
Deepesh Garg	8a7886ac60	Merge pull request #23621 from frappe/address_template_luxembourg ... feat: add address template for luxembourg	2020-10-13 21:31:51 +05:30
Deepesh Garg	71a58a8fd0	Merge pull request #23605 from marination/item-link-formatter ... fix: Item Link Formatter Behaviour	2020-10-13 21:26:00 +05:30
Sun Howwrongbum	93da52941e	fix: consider rounded_total in returns (#23609) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-13 21:23:26 +05:30
Deepesh Garg	06268e5f57	Merge pull request #23623 from kennethsequeira/italy-fy ... fix: Fiscal Year and Tax Rates for Italy	2020-10-13 20:29:51 +05:30
Shivam Mishra	55f52e8135	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-13 20:09:22 +05:30
rohitwaghchaure	db0fefd92c	Merge pull request #23614 from aakvatech/patch-3 ... feat: Add company and correct filter in bank reconciliation statement	2020-10-13 19:59:31 +05:30
rohitwaghchaure	2a8a2215d0	Merge pull request #23620 from anupamvs/lead-address ... fix: displaying mandatory address field in Lead form	2020-10-13 19:54:44 +05:30
Kenneth Sequeira	3eec4e61ab	fix: GST rates for Australia	2020-10-13 19:23:48 +05:30
Kenneth Sequeira	1b329aaa7b	fix: json format fixes	2020-10-13 19:10:09 +05:30
Afshan	c359d3528f	fix: setting user precision instead of default	2020-10-13 18:54:54 +05:30
Deepesh Garg	54c898708b	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove	2020-10-13 18:11:45 +05:30
Anupam Kumar	67a7279d1f	Merge branch 'develop' into opportunity-status	2020-10-13 18:11:23 +05:30
Anupam	73d944da21	fix: review changes	2020-10-13 18:11:05 +05:30
Deepesh Garg	66967c6d45	fix: Loan Security unpledge on loan cancel	2020-10-13 18:10:51 +05:30
Anupam	7db38058f3	fix: displayings mandatory address field in Lead form	2020-10-13 17:33:58 +05:30
Rucha Mahabal	fc8ced9958	Merge branch 'develop' into enrollment-fixes	2020-10-13 17:28:39 +05:30
Mangesh-Khairnar	51228b5ee3	fix: make response handling more descriptive	2020-10-13 17:10:16 +05:30
barredterra	9aa3e7a37d	feat: address template for luxembourg	2020-10-13 13:35:33 +02:00
Marica	43d3176d62	Merge branch 'develop' into patch-3	2020-10-13 17:01:18 +05:30
Marica	50b708f615	Merge branch 'develop' into pr-dn-return	2020-10-13 16:57:11 +05:30
Marica	0ed3e947ba	Merge branch 'develop' into rfq-email	2020-10-13 16:55:25 +05:30
Marica	6f819d797b	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-13 16:54:39 +05:30
Marica	9cd79b6859	Merge branch 'develop' into item-link-formatter	2020-10-13 16:54:28 +05:30
Marica	c5e139a542	fix: Travis (#23606) ... * fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places * fix: Item Barcode and Test * fix: Over Receipt on subcontracting test * fix: POS Invoice and Loyalty Program Tests * fix: POS serialized item test and subcontracting exploded items in PO * fix: Subcontracting test considering sourced_by_supplier items * fix: Make only one Additonal Salary List with overwrite set	2020-10-13 16:53:10 +05:30
Anupam	3245eaaeb0	fix: displayings mandatory address field in Lead form	2020-10-13 15:35:10 +05:30
Marica	ae1c65cde7	Merge branch 'develop' into item-link-formatter	2020-10-13 15:05:53 +05:30
Anupam	528a75ae9b	fix: review changes	2020-10-13 11:46:52 +05:30
justmejust	ed779a416c	Update ar.csv (#23490) ... these changes made to the file is critical and important for Arabic user of the this software .the changes made to make appropriate and more correct meaning fro example in the Blanket Orders from Costumers the previous translation meaning امر بطانية) ) which mean you have an order to get ta Blanket which used when you want to sleep. so i decided to make this changes and will continue update this translation file in the future.	2020-10-13 11:46:02 +05:30
aakvatech	617892db20	feat: Add company and correct filter in bank statement reconciliation report filters ... If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created. https://github.com/frappe/erpnext/issues/23613	2020-10-13 08:18:59 +03:00
Deepesh Garg	8c13fded17	fix: Add unaccrued interest in interest amount for loan closure	2020-10-13 09:23:04 +05:30
marination	5b790a0095	fix: Convert dates to datetime.date before comparing in Holiday List	2020-10-13 02:37:55 +05:30
Kenneth Sequeira	968f61d8ba	fix: add multiple VAT rates for Italy	2020-10-13 00:25:46 +05:30
Kenneth Sequeira	56d305b966	fix: update italy fiscal year	2020-10-13 00:07:52 +05:30
Marica	978e16481e	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-12 21:17:22 +05:30
marination	824f48fd23	fix: Item Link Formatter Behaviour	2020-10-12 20:08:03 +05:30
Anupam Kumar	71c02a6e89	Merge branch 'develop' into subscription-invoice-issue	2020-10-12 19:41:31 +05:30
Raffael Meyer	0975b961f9	Merge branch 'develop' into validate_regional_germany	2020-10-12 15:08:58 +02:00
Saqib	3daad224ad	fix: cannot merge pos invoice if validate selling price is checked (#23593) ... * fix: cannot merge pos invoice if validate selling price is checked * fix: validate selling price * fix: test * chore: add test * fix: error message	2020-10-12 18:31:23 +05:30
Marica	9cc05bb83e	Merge branch 'develop' into rfq-email	2020-10-12 18:02:15 +05:30
rohitwaghchaure	4164d08d17	Merge pull request #23323 from marination/supplier-quotn-comparison ... feat: Supplier Quotation Comparison - v3	2020-10-12 17:55:15 +05:30
Marica	41067e204c	Merge branch 'develop' into print-uom-after-quantity-patch	2020-10-12 17:32:29 +05:30
Marica	6d935d4e48	Merge branch 'develop' into company-issue	2020-10-12 17:25:12 +05:30
Marica	14b9c79ddc	Merge branch 'develop' into supplier-quotation-ux	2020-10-12 17:16:28 +05:30
Saqib	b332c5f06f	fix: sales invoice series gets overwritten with pos invoice series (#23479) ... * fix: sales invoice series gets overwritten with pos invoice series * chore: show is consolidated only if sales invoice is pos	2020-10-12 17:10:37 +05:30
Saqib	ebb0a6266a	fix: last purchase rate in item prices report (#23506) ... * fix: last purchase rate in item prices report * fix: last purchase rate in item prices report * fix: last purchase rate in item prices report * chore: fetch last purchase rate from update stock purchase invoices	2020-10-12 17:09:09 +05:30
Saqib	ebbe285872	feat: (report) POS Register (#23313) ... * feat: pos register report * feat: group by fields in pos register * chore: add paid amount column * fix: (minor) remove redundant group by label	2020-10-12 17:02:31 +05:30
rohitwaghchaure	a060f8c00b	Merge pull request #23524 from michellealva/employee_exit ... fix(Employee): Field level change in Exit section	2020-10-12 16:23:54 +05:30
rohitwaghchaure	14e7656a57	Merge pull request #23588 from kevingdc/fix/asset-update-maintenance-status ... fix: Asset status after maintenance or repair	2020-10-12 16:13:29 +05:30
Marica	e9f0268d32	Merge branch 'develop' into item-attribute-validation-on-non-template-item	2020-10-12 15:26:34 +05:30
rohitwaghchaure	a57ad47cb8	Merge pull request #23538 from kennethsequeira/spellcheck ... chore: spell fixes for Condition	2020-10-12 15:25:23 +05:30
Marica	aeba75cd08	Merge branch 'develop' into mr-ux	2020-10-12 15:17:32 +05:30
rohitwaghchaure	4e59abf0bf	Merge pull request #23583 from anupamvs/item-price ... fix: can't save item price after adding child table	2020-10-12 15:15:50 +05:30
Rushabh Mehta	2bef986f14	Merge pull request #23450 from michellealva/jc ... fix: Change Error Message in Work Order	2020-10-12 15:07:21 +05:30
Glen Whitney	6ec3dc5453	fix(asset): cannot create asset if cwip disabled and account not set (#23580) ... * Never add an asset GL entry if CWIP is not enabled * fix: asset purchase with purchase invoice * chore: allow enable cwip accounting only if cwip account is set * fix: cannot create asset if cwip disabled and account not set Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>	2020-10-12 14:56:55 +05:30
Kevin Chan	f6bcd5c2b2	test: Add test case for duplicate checking	2020-10-12 16:57:33 +08:00
Kevin Chan	58389ebd40	style: Collapse whitespace	2020-10-12 15:20:11 +08:00
Deepesh Garg	15d46040ff	fix: Do not consider opening entries for TDS calculation (#23597)	2020-10-12 12:39:08 +05:30
Anupam	efc3e1fa62	fix: Payment Schedule not fetching	2020-10-12 12:15:49 +05:30
marination	03975a692e	fix: Perform Item Attribute Value Validation on Variants Only	2020-10-12 12:03:07 +05:30
Kevin Chan	39bed3a65e	fix: Add null or empty checking to validation ... This commit adds null or empty checking in the **Item Price** DocType's `check_duplicates()`. This was done to fix a bug where some prices are shown to be duplciates even though they aren't because they don't have values in some fields.	2020-10-12 11:42:05 +08:00
Kevin Chan	a322f0d0b3	chore: Fix error message grammar	2020-10-12 11:38:55 +08:00
Kevin Chan	7a86a77322	fix: Asset status after maintenance or repair ... Fix a bug where an **Asset**'s status is not being set to what it was previously after an **Asset Repair** or **Asset Maintenance**.	2020-10-12 11:30:36 +08:00
Deepesh Garg	c9ebef4d30	Merge pull request #23567 from nextchamp-saqib/restrict-future-posting ... chore: do not allow future transactions	2020-10-11 20:55:38 +05:30
Deepesh Garg	a034311b1b	fix: Acrual type	2020-10-11 20:52:02 +05:30
Anupam	2be23309bb	fix: can't add child table in item price	2020-10-11 14:14:50 +05:30
Mohammad Hasnain	ac451b3a54	feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice	2020-10-11 01:40:22 +05:30
Deepesh Garg	d86b7c5537	fix: Remove repayment type	2020-10-11 00:37:34 +05:30
Deepesh Garg	6dccf79250	fix: Add accrual type and penalty field in interest accrual	2020-10-10 23:32:57 +05:30
Deepesh Garg	6d27adccfc	fix: Button to close loan	2020-10-10 23:28:39 +05:30
Deepesh Garg	51c6cf692e	fix: Add method for loan closure	2020-10-10 23:20:36 +05:30
Mohammad Hasnain	fc2ace1a31	Merge branch 'develop' into UAE-VAT-Format	2020-10-10 22:06:06 +05:30
Mohammad Hasnain	72bcb56368	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-10-10 22:04:16 +05:30
Saqib Ansari	3d91d48b77	fix: validate only for stock transactions	2020-10-10 21:56:50 +05:30
rohitwaghchaure	ad9db89514	Merge pull request #23573 from deepeshgarg007/opening_jv ... fix: Opening Journal Entry via Data Import	2020-10-10 13:16:41 +05:30
Deepesh Garg	e9c1098f5f	Merge pull request #23566 from michellealva/sales_team ... fix: Change name of Sales Team table	2020-10-10 12:14:00 +05:30
rohitwaghchaure	1bcd84450c	Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk ... fix: Add lower deduction certificate in desk page	2020-10-10 11:23:26 +05:30
rohitwaghchaure	01e23264a6	Merge pull request #23557 from KanchanChauhan/issue#23475-2 ... feat: Supplier Sourced Items in BOM	2020-10-10 11:17:53 +05:30
rohitwaghchaure	5065f8ac83	Merge pull request #23545 from tundebabzy/develop ... fix: pass self.flags.ignore_permissions to the ignore_permissions	2020-10-10 11:11:57 +05:30
rohitwaghchaure	04ddf24ffe	Merge pull request #23572 from marination/payment-entry-list-view ... fix: Check if list view standard filter exists in Payment Entry	2020-10-10 11:09:31 +05:30
rohitwaghchaure	9333a1dd54	Merge pull request #23570 from nextchamp-saqib/si-dashboard-fix ... fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard	2020-10-10 11:08:37 +05:30
rohitwaghchaure	ea8ea4abb5	Merge pull request #23569 from marination/prod-order-reference-in-item ... fix: Remove Production Order reference from Item Validation	2020-10-10 11:03:26 +05:30
Kanchan Chauhan	654c36ea99	feat: Supplier Sourced Items in BOM	2020-10-09 22:05:03 +05:30
Deepesh Garg	2676f96203	fix: Opening Journal Entry via Data Import	2020-10-09 21:58:38 +05:30
marination	07731c7735	fix: Check if list view standard filter exists in Payment Entry	2020-10-09 21:44:23 +05:30
Saqib	56fea7d243	fix: update items after submission ignores precision (#23491) ... * fix: update items after submission ignores precision * chore: add test	2020-10-09 21:19:25 +05:30
Saqib Ansari	d927c8efba	fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard	2020-10-09 21:00:33 +05:30
marination	bd6d5eb5ac	fix: Remove Production Order reference from Item Validation	2020-10-09 20:57:17 +05:30
michellealva	1bc7fc41a5	fix: Change name of Sales Team table	2020-10-09 16:01:13 +05:30
Saqib Ansari	776d8f72cf	chore: do not allow future transactions	2020-10-09 15:36:11 +05:30
Anupam	22dc42efb9	fix: error log while creating company	2020-10-09 14:58:39 +05:30
Tunde Akinyanmi	f2b12a3b9c	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-10-09 07:20:19 +01:00
Rucha Mahabal	a6dc7833f6	Merge pull request #23537 from michellealva/missing_links ... fix: Add links in Stock desk page	2020-10-09 11:46:14 +05:30
Deepesh Garg	5e6ea36938	fix: Add lower deduction certificate in desk page	2020-10-08 20:32:36 +05:30
marination	4be5b5c891	fix: Handle missing Account and Item in Opening Invoice Creation Tool	2020-10-08 19:51:42 +05:30
Rohit Waghchaure	a86cab0bb2	fix: added patch to make custom field 'Print UOM after Quantity'	2020-10-08 16:41:23 +05:30
Deepesh Garg	c837b5f48c	Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition ... feat(Accounts): Add Condition Field In Pricing Rule	2020-10-08 16:32:21 +05:30
Abhishek Balam	6d1af84fef	Merge branch 'develop' into budget	2020-10-08 16:23:36 +05:30
Deepesh Garg	8242da6310	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor	2020-10-08 16:23:34 +05:30
Saqib Ansari	3f28fb19aa	chore: validate is_group of child parent account before auto creating an account	2020-10-08 14:57:27 +05:30
rohitwaghchaure	242bae4a81	Merge pull request #23548 from michellealva/selling_links ... fix(Selling): Add missing reports on desk	2020-10-08 11:24:46 +05:30
Saqib	22b4c86a38	fix: cannot merge pos invoices with inclusive tax (#23541) ... * fix: cannot merge pos invoices with inclusive tax * fix: item rate calculation	2020-10-08 11:23:21 +05:30
michellealva	38aee6e3cb	fix(Selling): Add missing reports on desk	2020-10-08 10:24:11 +05:30
Tunde Akinyanmi	4010196488	fix: pass self.flags.ignore_permissions to the ignore_permissions ... argument of Address and Contact controller	2020-10-08 02:25:09 +01:00
Kenneth Sequeira	0b84a6399b	fix: remove default nationality as Indian	2020-10-07 23:14:27 +05:30
Kenneth Sequeira	be0ebc5085	spell fixes for Condition	2020-10-07 20:47:12 +05:30
Marica	71db253b86	Merge branch 'develop' into fix_title_customer_name	2020-10-07 20:27:32 +05:30
Abhishek Balam	ebf53a7f25	fix(HR): Appraisal form Enhancements (#23500) ... * fix: remove total score button * Removing conflicts	2020-10-07 19:59:26 +05:30
michellealva	3525ddabc5	fix: Add links in Stock desk page	2020-10-07 19:02:19 +05:30
barredterra	242579b77c	fix: use party name as title	2020-10-07 14:34:21 +02:00
michellealva	a9c2401a2d	fix: Typo in Accounts Setings	2020-10-07 15:13:57 +05:30
Abhishek Balam	937308854a	Merge branch 'develop' into pricing_rule_on_condition	2020-10-07 13:35:53 +05:30
Raffael Meyer	2acfc2a034	Merge branch 'develop' into validate_regional_germany	2020-10-06 16:53:52 +02:00
michellealva	203585f292	fix(Employee): Field level change in Exit section	2020-10-06 16:00:39 +05:30
michellealva	2e425efae8	fix: blank option in the beginning	2020-10-06 15:15:29 +05:30
michellealva	a2aae5644e	fix(Budget): Change options in select field	2020-10-06 15:02:01 +05:30
Mangesh-Khairnar	faa0cce7a7	fix: pass mobile number to generate the stk push	2020-10-06 13:58:54 +05:30
Deepesh Garg	f183dd6d3a	Merge branch 'develop' into tax_fetch_quote	2020-10-06 13:27:28 +05:30
rohitwaghchaure	59ee417d31	Merge pull request #23483 from marination/item-attr ... fix: Handle Blank from/to range in Numeric Item Attribute	2020-10-06 12:00:26 +05:30
Mangesh-Khairnar	862433febb	fix: create custom field for mpesa receipt	2020-10-06 10:59:59 +05:30
Mangesh-Khairnar	8d54d61c28	fix: handle payment completion via payment request	2020-10-05 22:37:31 +05:30
Sun Howwrongbum	72a596971c	fix: also update employee field when renamed (#23482)	2020-10-05 20:48:53 +05:30
Deepesh Garg	f58a5ec6a5	fix: Codition in batch selector query	2020-10-05 13:55:53 +05:30
rohitwaghchaure	96fadb7c9b	Merge pull request #23511 from marination/sales-order-project ... fix: Show Project under Create button in SO	2020-10-05 13:17:48 +05:30
rohitwaghchaure	ad2dd6062e	Merge pull request #23513 from deepeshgarg007/batch_search ... fix: Search batches based on search fields	2020-10-05 13:16:03 +05:30
Shivam Mishra	6a506b63bf	fix: variables path	2020-10-05 12:41:30 +05:30
Deepesh Garg	1fae7749be	fix: Search batches based on search fields	2020-10-05 12:38:54 +05:30
marination	e7af9ff999	fix: Show Project under Create button in SO	2020-10-05 12:24:43 +05:30
Saqib	2016a34e30	fix: naming series - cannot reset current value to zero (#23504)	2020-10-04 18:13:24 +05:30
Deepesh Garg	5bf35e465e	Merge pull request #23220 from marination/account-add-rename ... feat: Validate and Update Child Company Accounts on Rename/Adding Account	2020-10-04 15:19:26 +05:30
Mangesh-Khairnar	1bef6a530c	fix: create payment entry against payment request	2020-10-04 13:01:11 +05:30
Deepesh Garg	f8bf139692	Merge pull request #23498 from aakvatech/patch-3 ... fix: get_outstanding_invoices not ignoring the cancelled transactions	2020-10-03 22:36:24 +05:30
aakvatech	38ccf82604	fix: get_outstanding_invoices not ignoring the cancelled transactions ... Added is_cancelled=0 in 2 places for get_outstanding_invoices	2020-10-03 19:41:38 +03:00
Suraj Shetty	5dc0432cff	chore: Update translations	2020-10-03 08:52:07 +00:00
rohitwaghchaure	3c77a4697b	Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report ... fix: currency symbol in profit and loss report	2020-10-03 10:32:00 +05:30
marination	c213cd96c5	fix: Handle Blank from/to range in Numeric Item Attribute	2020-10-02 12:22:28 +05:30
marination	0bc61b31f7	chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM	2020-10-02 11:54:54 +05:30
Suraj Shetty	70c06512d2	chore: Update translations	2020-10-02 03:57:15 +00:00
marination	b9e2f17f4f	fix: More secure query	2020-10-01 21:31:51 +05:30
marination	f57ba86bce	chore: Add Date and Valid Till to List View	2020-10-01 21:10:00 +05:30
marination	5006345a0a	chore: Fetch RFQs in Get Items from RFQ based on Supplier selected ... - Rfq will appear only if selected supplier is in the RFQ	2020-10-01 20:41:05 +05:30
marination	4993ef19d6	feat: Supplier Quotation UX fixes	2020-10-01 16:35:09 +05:30
marination	29d7528a95	fix: Hide Preview Email button on submitted doc	2020-10-01 14:55:21 +05:30
Abhishek Balam	71c24c8a90	feat: add tests	2020-10-01 14:54:11 +05:30
marination	f90c3602a7	fix: Price should be total amount, modified deskpage	2020-10-01 14:38:17 +05:30
hasnain2808	f8db9582c3	feat(UAE VAT 21): Add currency formatting	2020-10-01 12:59:39 +05:30
hasnain2808	8cc6f2b388	feat(UAE VAT 21): add fixed width to columns	2020-10-01 12:44:39 +05:30
hasnain2808	10a3a338b6	refactor: change uae vat settingplural	2020-09-30 21:51:00 +05:30
Faris Ansari	db8764a520	Merge pull request #23201 from alyf-de/website_theme_scss ... fix: style for website theme	2020-09-30 18:26:58 +05:30
rohitwaghchaure	d65e050f4b	Update profit_and_loss_statement.py	2020-09-30 18:17:21 +05:30
Rohit Waghchaure	b428e4c493	fix: currency symbol in profit and loss report	2020-09-30 17:44:35 +05:30
Shivam Mishra	1323a9a990	feat: set app name for ERPNext in install and patch	2020-09-30 16:33:14 +05:30
Deepesh Garg	287014a9a2	fix: Remove any taxes fetched due to unknown rules	2020-09-30 13:42:10 +05:30
Deepesh Garg	fc71e5b5b7	fix: Remove any taxes fetched due to unknown rules	2020-09-30 13:42:00 +05:30
Deepesh Garg	23313538df	Merge pull request #23465 from abhishekbalam/currency_in_trial_balance ... fix(Accounts): Add Currency filter in Trial Balance report	2020-09-30 13:16:16 +05:30
Marica	8fbd960f66	Merge branch 'develop' into update-items-perm	2020-09-30 12:51:35 +05:30
hasnain2808	3294f86b92	refactor: fix linting	2020-09-30 12:15:07 +05:30
Shivam Mishra	b04b53c613	Merge branch 'develop' into better-logging-for-membership	2020-09-30 12:01:54 +05:30
Shivam Mishra	86171a3fda	fix: translate error log	2020-09-30 12:01:35 +05:30
Shivam Mishra	3ec67077a9	chore: use .format for message ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-30 12:00:46 +05:30
Abhishek Balam	001e7e9df9	fix: remove default value	2020-09-30 10:39:26 +05:30
Abhishek Balam	42d8db59f0	fix: add currency select to Trial Balance	2020-09-30 01:32:42 +05:30
Deepesh Garg	bc44bc64cc	fix: Add test	2020-09-29 18:39:45 +05:30
marination	661bf64bba	fix: Check only Read and Write Permission in Update Items	2020-09-29 18:16:45 +05:30
Deepesh Garg	2b38361ff5	Merge branch 'develop' of https://github.com/frappe/erpnext into tax_fetch_quote	2020-09-29 17:26:48 +05:30
Deepesh Garg	c33fbd7e52	Merge pull request #23416 from anupamvs/quotation-portal ... feat: provision to draft quotation from portal	2020-09-29 17:08:05 +05:30
barredterra	81ad90c1d4	feat: validate sales invoice for germany	2020-09-29 11:54:57 +02:00
Marica	25f4c1636e	Merge branch 'develop' into account-add-rename	2020-09-29 13:18:54 +05:30
Marica	3b610bd07d	Merge branch 'develop' into dialog-filters	2020-09-29 13:16:33 +05:30
michellealva	3aedeb642f	fix: Change Error Message in Work Order	2020-09-29 12:54:55 +05:30
marination	65fc48da25	fix: Email Template and Codacy ... - Email Preview works well with email template - Codacy for docstrings	2020-09-29 12:46:19 +05:30
Marica	e5a60f1cec	Merge branch 'develop' into rfq-email	2020-09-29 11:56:44 +05:30
Marica	818522bd45	Merge branch 'develop' into dialog-filters	2020-09-28 21:18:23 +05:30
marination	629fa57f9d	fix: Remove unneccessary div	2020-09-28 21:17:49 +05:30
marination	a6ea86432e	fix: Skip Update Password in Preview ... - dont show update password button in preview, its for the suppliers mail only - modified docstrings - update supplier row contact only if None	2020-09-28 21:05:11 +05:30
hasnain2808	a5e8e449ee	chore: Merge branch 'develop' into UAE-VAT-Format	2020-09-28 20:43:03 +05:30
marination	f911228871	fix: UX and code cleanup ... - Added a small note in muted text at bottom of Dialog - Dont call 'update_supplier_contact' at the time of preview, its a dummy view anyway - Renamed `update_contact_of_supplier` to `link_supplier_contact` - On sending mail, new users and contacts that were created get updated in RFQ doc - Added docstrings to functions	2020-09-28 20:21:44 +05:30
hasnain2808	23c8966e81	Merge branch 'develop' into UAE-VAT-Format	2020-09-28 20:06:02 +05:30
hasnain2808	2c62d946f5	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-09-28 20:03:27 +05:30
Mangesh-Khairnar	8d12c3841f	fix: process transaction callback	2020-09-28 19:40:42 +05:30
hasnain2808	80068e16e8	Refactor(UAE VAT 21): Replace f-strings by format	2020-09-28 18:58:27 +05:30
Anupam	77cf53201a	feat: open lead status on next contact date	2020-09-28 18:38:41 +05:30
marination	056c86033d	fix: Reuse function to render email preview ... - Reused `supplier_rfq_mail` to render preview - Print hid Salutation and Subject - Completely dynamic greeting	2020-09-28 17:42:22 +05:30
madar2020	ce39323a0a	feat: Allow rich text edit for questions (#23402) ... * rich text * Update question.json As to make sense for rich text * Update quiz_question.json * Update question.json * Update quiz_question.json * Update macros.html fix: cards in second row of homepage section overlapps the row before. * Revert "Update macros.html" This reverts commit b649b507e5d546b5b4a78fbf68053493a71c7af2. Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-09-28 17:36:25 +05:30
marination	bd36f2b94d	feat: Supplier Email Preview in RFQ	2020-09-28 15:59:03 +05:30
hasnain2808	587bb05a37	feat(UAE VAT 21): Add desk page for UAE VAT 21	2020-09-28 14:52:29 +05:30
hasnain2808	0860c74c82	feat(UAE VAT 21): Add permissions for doctypes	2020-09-28 14:38:45 +05:30
hasnain2808	2d30148940	feat(UAE VAT 21): Add vat settings	2020-09-28 14:38:14 +05:30
Raffael Meyer	21266fe4a4	Merge branch 'develop' into website_theme_scss	2020-09-28 10:15:55 +02:00
rohitwaghchaure	7b2f141d0d	Merge pull request #23441 from anupamvs/lead-contact-detail ... fix: flushing contact details, generates assignment rule issues	2020-09-28 13:30:09 +05:30
hasnain2808	2a601e59bf	fix(UAE VAT 21): remove extra legend	2020-09-28 13:26:43 +05:30
hasnain2808	bed1add349	docs(UAE VAT 21): add docstrings	2020-09-28 13:26:05 +05:30
hasnain2808	815b7584dd	refactor(UAE VAT 21): seperate get_chart, get_data	2020-09-28 13:24:40 +05:30
Anupam	519a00ce44	fix: flushing contact details, generating assignment rule issues	2020-09-28 13:10:06 +05:30
hasnain2808	79aca28453	refactor(UAE VAT 21): rename UAE VAT - UAE VAT 21	2020-09-28 12:27:41 +05:30
Anupam Kumar	5b3af82e75	Update item_add_to_cart.html	2020-09-28 10:59:43 +05:30
Mangesh-Khairnar	98658603dd	Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration	2020-09-28 02:10:53 +05:30
Sagar Vora	382676d875	Merge branch 'develop' into mr-stock-uom-v13	2020-09-27 20:09:00 +05:30
Mangesh-Khairnar	a26c6b4c2d	fix: fetch account balance info	2020-09-25 23:56:39 +05:30
hasnain2808	127fbfcb93	feat(UAE VAT 21): Added Print Format	2020-09-25 20:42:54 +05:30
Anupam Kumar	6e0c1eeb68	Merge branch 'develop' into quotation-portal	2020-09-25 20:04:43 +05:30
prssanna	fec4ea5643	fix: set stock uom in tem while creating material request from stock entry	2020-09-25 18:01:12 +05:30
hasnain2808	321b5f54ae	feat(UAE VAT 21): Add Roles for UAE VAT 21 Report	2020-09-25 14:24:57 +05:30
hasnain2808	72cad2a8ab	feat(UAE VAT 21): Add zero rated and vat exempt	2020-09-25 13:13:38 +05:30
rohitwaghchaure	7512565184	fix: Patient Appointment not able to save (#23434) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-09-25 12:45:47 +05:30
Shivam Mishra	9a4d603403	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-09-25 11:44:37 +05:30
hasnain2808	5225215d31	feat(UAE VAT 21): Add rows for inputs and tourists	2020-09-24 18:41:43 +05:30
marination	be4dbad823	style: (minor) Reduce loc	2020-09-24 16:43:25 +05:30
Anupam	dd2f547c3b	fix: Ui fixes	2020-09-24 16:37:08 +05:30
Anupam	5a72022289	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-portal	2020-09-24 16:18:47 +05:30
Anupam	78ee75d744	fix: review changes	2020-09-24 16:17:02 +05:30
marination	a119688e32	fix: (RFQ/SQ) Link to Material Requests in Tools section	2020-09-24 15:57:43 +05:30
Saqib	2fa2a40b3f	chore: make asset movement transaction date match with purchase date & time (#23423)	2020-09-24 15:07:29 +05:30
Rucha Mahabal	9ed208364d	Merge branch 'develop' into enrollment-fixes	2020-09-24 14:31:23 +05:30
Anupam	a4df105813	fix: UI fixes	2020-09-24 13:21:54 +05:30
hasnain2808	3ef11b1d64	feat(UAE VAT 21): Add region fields for UAE VAT 21	2020-09-24 13:21:23 +05:30
marination	4f395cce54	chore: Add Filter Group to dialogs	2020-09-24 12:43:41 +05:30
marination	8370d9b997	fix: Check Company in Payment Entry before selecting values	2020-09-24 11:51:03 +05:30
Anupam	09775bbdaa	feat: showing UOM even item price is hidden	2020-09-24 11:19:32 +05:30
Shivam Mishra	0bd8719035	Merge branch 'develop' into better-logging-for-membership	2020-09-24 10:32:41 +05:30
Shivam Mishra	cee891aa92	refactor: better logging for membership	2020-09-24 10:31:36 +05:30
Anupam	c077fac2a6	feat: provision to draft quotation from portal	2020-09-23 22:02:31 +05:30
Marica	d5e6eb75cf	Merge branch 'develop' into supplier-quotn-comparison	2020-09-23 21:06:18 +05:30
Deepesh Garg	cfc5e29127	fix: Post cancellation accounting entry on posting date instaed of current (#23361)	2020-09-23 17:19:11 +05:30
Prssanna Desai	fd42af5b91	fix: ignore permission while creating supplier scorecard period in supplier scorecard (#23406)	2020-09-23 17:14:37 +05:30
Rucha Mahabal	46d4180381	refactor: Issue form cleaned up and renamed Minutes to First Response field (#23066) ... * refactor: re-order fields in Issue DocType * refactor: rename Mins to First Response to First Response Time * refactor: First Response Time Reports for Issue and Opportunity * fix: added patch for renamed fields and setting durations * chore: update CRM and Support Desk Pages for Response Time reports * fix: first response time for opportunity report * fix: patch Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-09-23 16:53:16 +05:30
Mangesh-Khairnar	4eb215badb	fix: bind callback callback for realtime event	2020-09-23 15:55:21 +05:30
Marica	f804eacfb5	Merge branch 'develop' into fix-report-gp	2020-09-23 15:36:23 +05:30
Michelle Alva	879a8ef26b	fix: Change button label in Item (#23410)	2020-09-23 15:36:07 +05:30
Raffael Meyer	8b78bf19bd	Merge branch 'develop' into website_theme_scss	2020-09-23 11:38:59 +02:00
Afshan	8be51e22c4	fix: escape apostrophe in cost centre and project if exist	2020-09-23 14:52:36 +05:30
marination	fd155408e5	fix: Check if account exists in parent company on rename ... - Check if child company is dependent on parent company - Check if account-to-be-renamed exists in parent, if yes, block - Revised Test basd on the same	2020-09-23 14:42:10 +05:30
Saqib	1831893b77	fix: failed workflow condition error message in update items (#23393)	2020-09-23 13:01:49 +05:30
Marica	dd10c54baa	Merge branch 'develop' into supplier-quotn-comparison	2020-09-23 12:58:35 +05:30
Deepesh Garg	2bf4245334	fix: Conversion factor fixes in Stock Entry	2020-09-23 12:50:06 +05:30
gavin	639542c81d	Merge pull request #22867 from marination/youtube-analytics ... feat: Youtube interactions via Video	2020-09-22 18:02:31 +05:30
marination	6087fcaa9b	chore: Added video settings to List View Menu	2020-09-22 17:48:04 +05:30
rohitwaghchaure	27bccd7f81	Merge pull request #23397 from deepeshgarg007/search_field_batch_query ... feat: Show searchfields in batch query	2020-09-22 16:59:24 +05:30
Marica	ef2b5e8284	Merge branch 'develop' into pr-dn-return	2020-09-22 15:39:25 +05:30
gavin	d935b2753f	Merge branch 'develop' into youtube-analytics	2020-09-22 15:36:00 +05:30
Anupam	c39b65a5f5	fix: quality procedure parent	2020-09-22 14:23:54 +05:30
Deepesh Garg	a0d192eae4	feat: Show searchfields in batch query	2020-09-22 13:54:07 +05:30
Mangesh-Khairnar	97ab96c8bf	fix: handle api changes from callbacks	2020-09-22 12:58:32 +05:30
Shivam Mishra	2b53b98c1d	fix: reload dashboard (#23380)	2020-09-22 12:18:12 +05:30
rohitwaghchaure	9e6d377eea	Merge pull request #23370 from prssanna/account-user-permission ... fix: apply user permissions in tax accounts query	2020-09-22 10:34:35 +05:30
rohitwaghchaure	7230b0f9a0	Merge pull request #23360 from anupamvs/batch-wise ... fix: Batch-Wise Balance History filter validation	2020-09-22 10:32:51 +05:30
Marica	cbac025a5f	Merge branch 'develop' into supplier-quotn-comparison	2020-09-21 22:08:38 +05:30
Mangesh-Khairnar	e3c6128638	fix(plaid): do not send null list in account ids (#23376)	2020-09-21 18:50:22 +05:30
Saurabh	30dbfc31e2	Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance ... Fix(Maintenance): Breadcrumbs for Maintenance Visit and Schedule	2020-09-21 17:03:46 +05:30
Saurabh	324cbe89f8	Merge pull request #23359 from abhishekbalam/activation ... fix(activation): Added New DocTypes in get_level()	2020-09-21 15:38:45 +05:30
prssanna	de7a2bc4be	fix: apply user permissions in tax accounts query	2020-09-21 13:57:04 +05:30
Rohan	e42f08085b	fix: use Plaid's new API (develop) (#23318) ... Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>	2020-09-21 13:14:07 +05:30
Abhishek Balam	97f61d233e	fix: breadcrumbs for maintenance visit and schedule under support	2020-09-21 13:00:43 +05:30
Deepesh Garg	44c692ed40	Merge pull request #23278 from barry86m/patch-3 ... fix: sql error on saving sales invoice without a sales order	2020-09-20 20:40:16 +05:30
Deepesh Garg	c152b92ef4	Update erpnext/controllers/selling_controller.py ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-20 20:04:10 +05:30
Deepesh Garg	5c8dd6a0ed	Merge pull request #23355 from Anurag810/accounts_recievable ... fix: Cost Center filter in accounts receivable and payable report	2020-09-20 19:36:30 +05:30
Saqib	f2ea3877c8	fix: depreciation start date ux fixes (#23339)	2020-09-20 19:31:18 +05:30
Saqib	4b25eb4db4	fix: mode of payment not fetched if no account is set (#23334) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-19 19:33:21 +05:30
Deepesh Garg	6bcfffda1d	Merge branch 'develop' into barredterra-patch-1	2020-09-19 18:33:14 +05:30
Deepesh Garg	c646a56d68	fix: Update modified timestamp	2020-09-19 18:28:20 +05:30
Deepesh Garg	e3ee63f677	Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter ... fix: warehouse address filtered based on warehouse	2020-09-19 18:17:08 +05:30
Deepesh Garg	095161ff60	Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error ... fix: set_taxes() missing 1 required positional argument: 'company'	2020-09-19 18:07:08 +05:30
Deepesh Garg	0aff6d83af	Update erpnext/public/js/utils/party.js ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-19 18:05:58 +05:30
marination	b782d2a99d	fix: Added back accidentally deleted field	2020-09-19 01:04:28 +05:30
marination	90d9d80ef9	fix: More MR UX fixes	2020-09-19 00:43:53 +05:30
Mangesh-Khairnar	a3ac4bf681	fix: create payment request via pos	2020-09-18 19:47:33 +05:30
Saqib	7126e179c3	fix: button click event not working in POS custom fields (#23358)	2020-09-22 16:35:11 +05:30
Abhishek Balam	4e6733293f	fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) ... * fix: reset owner values in doctype to Administrator * fix: updated modified value * fix: also fixed modified by * fix: change modified_by to Administrator	2020-09-18 18:27:24 +05:30
Anupam	bf166736b0	fix: Batch-Wise Balance History filter validation	2020-09-18 17:15:49 +05:30
Abhishek Balam	123eaea1a6	fix: added new doctypes in get_level	2020-09-18 16:35:59 +05:30
Michelle Alva	cc6ca97dc5	fix: Item-wise Sales History Report Error (#23349) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-09-18 15:50:29 +05:30
Saqib	c29ee691d4	fix: button click event not working in POS custom fields (#23358)	2020-09-18 15:27:17 +05:30
Marica	2cfaf71d59	Merge branch 'develop' into supplier-quotn-comparison	2020-09-18 15:22:59 +05:30
Anurag Mishra	170ecdc76e	fix: No handlefor Cost centers in Accounts Receivable	2020-09-18 13:26:46 +05:30
SDLyu	68672af8ab	Fix missing tax autoload when frm.doc.taxes is []	2020-09-18 13:58:23 +08:00
Deepesh Garg	6f3d93e5a0	fix: Taxes not getting fetched from Opportunity to Quotation	2020-09-18 11:23:35 +05:30
Afshan	d5710b4d6f	style: removed extra spaces	2020-09-17 13:01:47 +05:30
Afshan	e813684433	fix: warehouse address filtered based on warehouse	2020-09-17 12:57:26 +05:30
Deepesh Garg	2aea184f6f	Merge pull request #23309 from anupamvs/sales-analytics ... feat: added project in Sales Analytics report	2020-09-17 12:37:14 +05:30
Rucha Mahabal	c78ca36ee5	fix(Non Profit): Hide Address and Contact section for unsaved docs	2020-09-16 23:47:33 +05:30
Anupam Kumar	11649efc41	Merge branch 'develop' into sales-analytics	2020-09-16 21:45:57 +05:30
Deepesh Garg	5c04b2eea4	Merge pull request #23235 from Anurag810/custom_remark ... feat: added option to add custom remarks in payment entry	2020-09-16 13:38:04 +05:30
Deepesh Garg	15f698251b	Merge pull request #23079 from marination/item-tax-update-items ... fix: Item Tax Updating via `Update Items` in SO/PO	2020-09-15 20:47:20 +05:30
Deepesh Garg	db52cfe05a	Merge pull request #22849 from alyf-de/datev_refactor ... refactor: move datev-specific stuff to utils	2020-09-15 19:50:00 +05:30
Rucha Mahabal	8193582645	fix: codacy issue	2020-09-15 18:53:38 +05:30
Marica	9ce5c77a21	Merge branch 'develop' into supplier-quotn-comparison	2020-09-15 18:50:34 +05:30
Rucha Mahabal	253936c8df	fix: create Course Enrollment only for courses added in Program Enrollment	2020-09-15 18:16:42 +05:30
Rucha Mahabal	42d7acf522	fix: academic term and year date validations	2020-09-15 17:52:47 +05:30
Marica	f63b6719e3	Merge branch 'develop' into item-tax-update-items	2020-09-15 17:45:05 +05:30
marination	f995f517c9	fix: Test	2020-09-15 17:06:27 +05:30
Rucha Mahabal	f5eb45bf23	fix: validate academic term while checking for enrollment duplication	2020-09-15 17:01:00 +05:30
Rucha Mahabal	68a07eda72	fix: program enrollment date not considered during course enrollment	2020-09-15 16:55:35 +05:30
Deepesh Garg	2f50cb3e58	fix: Supplier trigger onload	2020-09-15 15:00:32 +05:30
Rohit Waghchaure	4f3b7da9ba	fix: set_taxes() missing 1 required positional argument: 'company'	2020-09-15 14:47:36 +05:30
Mangesh-Khairnar	27f81e06ea	fix: create custom pos fields	2020-09-15 14:38:06 +05:30
Anupam Kumar	699e853009	Merge branch 'develop' into sales-analytics	2020-09-15 13:24:02 +05:30
Anurag Mishra	9397b7f58b	fix: requested changes	2020-09-15 12:36:01 +05:30
Anupam	bae2d5d485	fix: review changes	2020-09-15 12:12:31 +05:30
marination	665c27af58	fix: Merge conflict missing line	2020-09-15 12:04:38 +05:30
Marica	baedc627ee	Merge branch 'develop' into item-tax-update-items	2020-09-15 11:30:22 +05:30
marination	4bb8d0c193	chore: Test for PO	2020-09-15 11:18:02 +05:30
Saqib	61314248bb	feat: uom in update items for SO & PO (#22869) ... * feat: uom in update items for SO & PO * fix: supplied items doesn't updates on uom change * chore: add uom and conv factor change test * fix: test * fix: purchase order updates are not tracked * fix: fetch conversion factor on uom change * fix: codacy Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-15 11:14:31 +05:30
Marica	65c2c4f85f	Merge branch 'develop' into item-tax-update-items	2020-09-15 09:49:06 +05:30
Deepesh Garg	36bc0577a2	fix: Item GL entries for purchase invoice (#23027)	2020-09-15 09:44:46 +05:30
marination	b7cd84196d	fix: Revert tax calculation changes	2020-09-15 09:42:51 +05:30
Anupam Kumar	8cb356bf30	Merge branch 'develop' into sales-analytics	2020-09-14 11:21:58 -07:00
Rucha Mahabal	fcb6ba6ec7	fix: get_transaction_entries function arguments in Bank Statement Transaction Entry (#23051)	2020-09-14 21:12:36 +05:30
Marica	a544e10778	Merge branch 'develop' into supplier-quotn-comparison	2020-09-14 20:17:59 +05:30
Saqib	6db92fbb6a	feat: validate workflow before so/po update items (#23024) ... * feat: validate workflow before so/po update items * fix: incorrect workflow validation on so/po update items Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-14 19:54:17 +05:30
Deepesh Garg	93d7c2f1da	Merge pull request #23283 from ruchamahabal/fix-student-email-id ... fix: Set student email id mandatory only if skip user creation is disabled	2020-09-14 19:34:10 +05:30
Mangesh-Khairnar	757fa5d010	fix(shopping-cart-settings): filter payment gateway accounts	2020-09-14 17:44:51 +05:30
marination	59239172a1	feat: Supplier Quotation Comparison - v3	2020-09-14 17:34:21 +05:30
Mangesh-Khairnar	40d3add63c	feat(payment-gateway-account): add additional payment channel	2020-09-14 15:14:36 +05:30
Rucha Mahabal	026cf2d3cc	Merge branch 'develop' into refactor-lab-module	2020-09-14 14:45:19 +05:30
Marica	c4a8c9eb26	Merge branch 'develop' into pr-dn-get-items	2020-09-14 11:09:32 +05:30
marination	9205101ecf	fix: Make Reference fields mandatory in Quality Inspection	2020-09-12 16:17:13 +05:30
marination	0a688005be	fix: Make sure Supplier/Customer is selected before fetching Items.	2020-09-12 15:39:27 +05:30
barredterra	16f1435d63	fix: codacy	2020-09-11 18:57:58 +02:00
barredterra	41978ac882	Merge branch 'develop' into datev_refactor	2020-09-11 17:54:50 +02:00
barredterra	8e41fdfee4	Merge branch 'develop' into website_theme_scss	2020-09-11 16:05:49 +02:00
barredterra	60bfbbc5af	fix: use path istead of hook	2020-09-11 16:05:10 +02:00
marination	02c550c07d	fix: Redundant imports	2020-09-11 16:22:54 +05:30
Marica	1807437fe0	Merge branch 'develop' into youtube-analytics	2020-09-11 16:18:23 +05:30
Marica	4153a9f8de	Merge branch 'develop' into pr-dn-return	2020-09-11 16:10:48 +05:30
marination	9533318832	chore: Tests for Rename and Add child Account	2020-09-11 16:09:27 +05:30
Anupam K	ed08e593c3	feat: added project in Sales Analytics report	2020-09-11 14:03:31 +05:30
Saqib	cd89994b33	fix: multiple pos issues (#23297) ... * fix: returns can be made against unconsolidated invoices * fix: indentation * fix: mode of payment not fetching for pos returns * patch: default pos profile print format * fix: tests * chore: clean up retail desk page	2020-09-10 19:28:46 +05:30
hasnain2808	f44524dd3e	feat: Added a Chart to compare Vat and sales between emirates	2020-09-10 18:35:04 +05:30
marination	37b99d202d	fix: Separate function to get bulk and single youtube stats	2020-09-10 18:27:20 +05:30
hasnain2808	323791d123	refactor: added docstrings	2020-09-10 17:53:29 +05:30
Rucha Mahabal	a29436dc91	fix: codacy	2020-09-10 17:45:17 +05:30
hasnain2808	031d77be2e	feat: add reverse charge to uae vat report	2020-09-10 17:40:01 +05:30
Rucha Mahabal	c0f9d1b65a	test: Lab Module	2020-09-10 17:33:52 +05:30
Suraj Shetty	67095d239f	fix: Custom dashboard sections	2020-09-10 17:15:52 +05:30
Mangesh-Khairnar	2dabd2182f	feat: add mpesa integration	2020-09-10 17:05:43 +05:30
marination	799d663398	fix: Make set_youtube_statistics reusable and job logic fix ... - Make sure job runs only once every hour - set_youtube_statistics should be usable in and outside class	2020-09-10 16:42:20 +05:30
Shivam Mishra	2b405b9bb3	feat: add icon to healthcare desk page	2020-09-10 15:37:54 +05:30
Gavin D'souza	71ac399369	fix: Commonified function and updated scheduler events ... Co-authored-by: marination <maricadsouza221197@gmail.com>	2020-09-10 13:58:48 +05:30
hasnain2808	91f1e26672	feat: Add rated supplies rows in UAE VAT report	2020-09-10 13:55:14 +05:30
Gavin D'souza	0a0e258d8b	feat: Add Desk Page for Utilities for Video group	2020-09-10 13:12:35 +05:30
Rucha Mahabal	42bff3289d	Merge branch 'develop' into refactor-lab-module	2020-09-10 12:36:29 +05:30
Rucha Mahabal	2388199347	Merge branch 'develop' into fix-student-email-id	2020-09-10 12:16:16 +05:30
Rucha Mahabal	1915a60834	fix: education settings check	2020-09-10 12:13:58 +05:30
Marica	6520655d59	Merge branch 'develop' into youtube-analytics	2020-09-10 10:16:02 +05:30
marination	53cd60c217	fix: Patch reload doctype	2020-09-09 20:57:10 +05:30
hasnain2808	7b7a8e1309	feat: RCM for UAE VAT	2020-09-09 20:54:30 +05:30
marination	83a03689a1	fix: Use independent item for DN Test	2020-09-09 20:51:01 +05:30
marination	dc5f2aa8b8	chore: Patch to set returned qty in PR and DN	2020-09-09 17:56:20 +05:30
marination	efb211af6d	chore: Fix Received/Delivered Items to Billed Logic	2020-09-09 16:24:11 +05:30
Marica	52e87d1a4f	Merge branch 'develop' into pr-dn-return	2020-09-09 11:56:26 +05:30
Saqib	ec6a97fb6a	fix: cannot delete pos page if linked with desk page (#22993) ... * fix: cannot delete pos page if linked with desk page * fix: replace pos page links with point-of-sale page Co-authored-by: gavin <gavin18d@gmail.com>	2020-09-09 10:54:14 +05:30
Deepesh Garg	dc84633860	Merge pull request #23301 from deepeshgarg007/closed_loan_amount ... fix: Amount for closed loans	2020-09-08 21:32:54 +05:30
Deepesh Garg	846e6d4803	fix: Add test	2020-09-08 21:32:06 +05:30
Deepesh Garg	f247686ace	fix: Amount for closed states	2020-09-08 21:26:06 +05:30
marination	8484d1cd95	fix: Patch and test codacy	2020-09-08 20:58:33 +05:30
marination	315bf3051c	chore: Tests for Delivery Note	2020-09-08 19:27:36 +05:30
Saqib	8f43cf2c9a	fix: asset movement date for backdated asset entry (#23298)	2020-09-08 17:44:47 +05:30
rohitwaghchaure	93dccd2eaa	Merge pull request #23132 from anupamvs/item-group-filter-portal ... fix: [Portal] added filter show in website	2020-09-08 17:03:54 +05:30
rohitwaghchaure	1d555f35a7	Merge pull request #23282 from deepeshgarg007/tds_bug ... fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt	2020-09-08 16:59:29 +05:30
marination	e35fd5e305	chore: Tests for Purchase Receipt	2020-09-08 16:24:10 +05:30
Anupam Kumar	09e2cb5f87	Merge branch 'develop' into item-group-filter-portal	2020-09-08 14:54:31 +05:30
Deepesh Garg	f7731b0715	fix: TDS applicable on creating PI from get items button	2020-09-08 13:41:04 +05:30
Afshan	12ab8ebc95	fix: removed ignore permission flag	2020-09-08 12:55:42 +05:30
Marica	c8eca9d5f3	Merge branch 'develop' into handle-irs	2020-09-08 12:03:45 +05:30
Rucha Mahabal	f7619df8b2	fix: Lock row in subquery while setting delivered qty (#23100)	2020-09-08 11:57:45 +05:30
Afshan	9691422fb7	feat: added report for mismatch in serial nos and stock quantity in warehouse (#22669) ... * feat: added report for mismatch in serial nos and stock quantity in warehouse * style: removed print statement * fix: rename of reports and refactor of code * fix: handled null condition for actual qty and added report link in stock desk page * style: breaking code in multiple lines	2020-09-08 11:57:15 +05:30
Marica	0411026ad6	Merge branch 'develop' into pr-dn-return	2020-09-08 10:48:44 +05:30
rohitwaghchaure	31fd90136d	Merge pull request #23243 from Anurag810/overlap_for_additional_salary ... feat: Overlap validation additional salary	2020-09-08 10:18:41 +05:30
rohitwaghchaure	7d7fa79efa	Update additional_salary.py	2020-09-08 10:18:18 +05:30
rohitwaghchaure	900d0e3ae2	Merge pull request #23245 from Anurag810/attendance_calendar_map ... fix: Attendance calendar map fix	2020-09-08 10:14:37 +05:30
rohitwaghchaure	842cb6d1d6	Update shift_assignment.py	2020-09-08 10:14:04 +05:30
Anupam Kumar	7131024bf9	Merge branch 'develop' into item-group-filter-portal	2020-09-08 10:04:51 +05:30
rohitwaghchaure	0cb805308f	Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order ... fix: capture advance payments in payment order	2020-09-08 09:59:47 +05:30
barry86m	5b381ac5b7	fix: consolidated financial statement sums values into wrong parent ... fix proposed by Andriesvn in bug report closes #22180	2020-09-08 00:27:57 +01:00
Deepesh Garg	b828e2fcf4	Merge pull request #23287 from deepeshgarg007/lsu_api_fix ... fix: Only submitted Loan security pledges should be approved	2020-09-07 23:23:55 +05:30
Deepesh Garg	03b0ad4f98	fix: Only submitted Loan security pledges should be approved	2020-09-07 23:22:21 +05:30
Anupam Kumar	22bd03e63c	Merge branch 'develop' into item-group-filter-portal	2020-09-07 20:20:42 +05:30
Rucha Mahabal	4673bed67e	fix: codacy issues	2020-09-07 20:12:29 +05:30
Rucha Mahabal	06f89a1b94	fix: Set student email id mandatory only if skip user creation is disabled	2020-09-07 19:46:53 +05:30
marination	f18dd05c00	fix: Missing import and typo	2020-09-07 18:59:57 +05:30
Marica	54ab426c1c	Merge branch 'develop' into youtube-analytics	2020-09-07 18:54:11 +05:30
marination	06ee0ea00b	feat: Added Scheduler Job to auto update statistics ... - Added frequency in Video Settings - Cron job to check half hourly job - Hourly job to run job based on frequency - Patch to set youtube id in video for ease in computing	2020-09-07 18:49:06 +05:30
Deepesh Garg	74ab1084b3	fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt	2020-09-07 17:55:10 +05:30
Deepesh Garg	af1c4ba443	Merge pull request #23279 from deepeshgarg007/loan_closure_interest ... fix: Pending loan interest accrual on loan closure	2020-09-07 15:01:33 +05:30
Deepesh Garg	afefa878b0	fix: Pending loan interest accrual on loan closure	2020-09-07 14:57:44 +05:30
Deepesh Garg	da6074a84c	fix: Pending loan interest accrual on loan closure	2020-09-07 14:55:04 +05:30
marination	9ce38de439	chore: Key Validation and restructure ... - Added API Key validation in Video Settings - Moved Statistics section above description in Video - Moved id retrieving from URL to py side - Removed js side calls, added section toggling in js - Restructured Code	2020-09-07 13:27:17 +05:30
hasnain2808	2744765757	feat(UAE VAT Format): add fields for emirates in address and sales invoice	2020-09-07 12:31:19 +05:30
Mangesh-Khairnar	06130ee56b	fix: leave ledger patch (#23182)	2020-09-07 11:53:50 +05:30
Anupam Kumar	209f7c76c9	feat: added transaction_type in leave ledger enter (#23258)	2020-09-07 11:50:24 +05:30
barry86m	fa98e81f0b	fix: sql error on saving sales invoice without a sales order	2020-09-07 01:36:15 +01:00
Anupam Kumar	ffd30beeca	Merge branch 'develop' into item-group-filter-portal	2020-09-06 21:48:16 +05:30
Anupam Kumar	924618e1e3	Merge branch 'develop' into opportunity-status	2020-09-06 21:24:32 +05:30
rohitwaghchaure	937b63433d	Merge pull request #23270 from kasgel/patch-1 ... fix(utils): pass stock_qty to get_pricing_rule_for_item	2020-09-06 20:46:15 +05:30
Deepesh Garg	5158d0fbba	fix: Repayment Method not visible correctly	2020-09-05 21:16:57 +05:30
kasgel	a59f8640d1	fix: pass stock_qty to get_pricing_rule_for_item ... get_pricing_rule_for_item uses the "stock_qty" and "qty" arguments to filter pricing rules. Not passing stock_qty prevents for example the shopping cart from filtering pricing rules appropriately based on Quantity.	2020-09-05 12:15:49 +02:00
Deepesh Garg	1b4ed454d2	fix: Add reference no and descripiton field in Loan Security Pledge and Unpledge	2020-09-04 22:42:41 +05:30
Deepesh Garg	e4c38e5fe5	fix: Remove print statement	2020-09-04 22:30:13 +05:30
Deepesh Garg	4d636fde3a	fix: API changes in loan security unpledge utility	2020-09-04 22:23:30 +05:30
Mangesh-Khairnar	7456ffca0f	fix: teardown created payment order	2020-09-04 19:59:01 +05:30
Mangesh-Khairnar	a76bf4d7af	fix: remove unused imports	2020-09-04 19:08:08 +05:30
Mangesh-Khairnar	d9e4883392	test: check payment order creation against payment entry	2020-09-04 18:55:14 +05:30
rohitwaghchaure	515d8b9e50	Merge pull request #23259 from anupamvs/se-quntity ... fix: SE quantity data type issue	2020-09-04 16:07:13 +05:30
rohitwaghchaure	c9a5afaa1c	Merge pull request #23263 from Semiranis/uom_after_qty ... feat: Option to print UOM after quantity	2020-09-04 16:06:46 +05:30
Shivam Mishra	4a238a2093	feat: don't allow guests	2020-09-04 15:18:16 +05:30
Anupam K	faebef21b7	fix: SE quantity data type issue	2020-09-04 15:09:16 +05:30
Mangesh-Khairnar	e1889d0c1b	fix(payment entry): update payment order status	2020-09-04 14:45:19 +05:30
Mangesh-Khairnar	8d8af94182	fix: capture advance payments in payment order	2020-09-04 12:17:56 +05:30
Frappe ERPnext	2e8e06c350	Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty	2020-09-03 18:08:02 +02:00
Frappe ERPnext	9355641c49	refactor: logic moved to standard template ... Previously print_settings.py controller decided which template to use. Now standard template decides what to print according to settings.	2020-09-03 17:31:21 +02:00
Frappe ERPnext	a5d5e70bf4	Revert "feat: Option to print UOM after quantity" ... This reverts commit a787882a8f.	2020-09-03 17:30:25 +02:00
Marica	8d6b2d016f	Merge branch 'develop' into leaderboard-supplier	2020-09-03 20:08:37 +05:30
marination	2a56000460	fix: Supplier Leaderboard fix	2020-09-03 19:45:04 +05:30
Deepesh Garg	b306fa355d	Merge pull request #23248 from deepeshgarg007/pda_account_filter ... fix: Account filter in Process Deferred Accounting doctype	2020-09-03 19:22:56 +05:30
Deepesh Garg	9b681770d0	fix: Account filter in Process Deferred Accounting doctype	2020-09-03 18:09:02 +05:30
Anurag Mishra	e5b7cb0c15	fix: data was not properly maped	2020-09-03 16:59:21 +05:30
gavin	f20b6360de	Merge branch 'develop' into overlap_for_additional_salary	2020-09-03 15:27:58 +05:30
gavin	c09b92d673	Merge branch 'develop' into naming-series-proj	2020-09-03 15:23:06 +05:30
Anurag Mishra	7952f89596	feat: Overlap validation additional salary	2020-09-03 15:21:35 +05:30
Rohit Waghchaure	68b0108301	fix: incorrect qty after transaction in stock ledger entry	2020-09-03 15:10:07 +05:30
rohitwaghchaure	d00bc3f422	Merge branch 'develop' into item-group-filter-portal	2020-09-03 15:04:04 +05:30
rohitwaghchaure	4b59043266	Merge pull request #23241 from Anurag810/hiding_regional_reports ... feat: removed roles for some regional report and added via setup	2020-09-03 15:01:07 +05:30
rohitwaghchaure	6ffe809c66	Merge pull request #23233 from ruchamahabal/fix-rfq-conv-factor ... fix: set conversion factor while creating RFQ from Opportunity	2020-09-03 14:45:01 +05:30
Anurag Mishra	54cd194b41	feat: removed roles for some reginal report and added via setup	2020-09-03 13:52:40 +05:30
Rucha Mahabal	979ad180fa	fix: update rfq item in postprocess	2020-09-03 11:03:22 +05:30
michellealva	0857e6d669	fix: Add "Bank Clearance" and "Bank Reconciliation" in desk	2020-09-03 10:37:43 +05:30
Michelle Alva	d8c38249e0	fix: Change naming series ... Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-09-03 09:04:21 +05:30
Frappe ERPnext	f28bef868d	feat: Checkbox for activation of printing UOM after quantity ... Checkbox will be added to Frappe after installation of ERPNext. (Print Settings docType is part of frappe app, not erpnext app)	2020-09-02 21:42:52 +02:00
Frappe ERPnext	be3b8a1c96	Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty	2020-09-02 21:31:31 +02:00
Anupam Kumar	c3984691b3	fix: Sales funnel data is inconsistent (#23110) ... * fix: Sales funnel data is inconsistent * fix: data inconsistency * fix: Converted Count Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-02 20:01:14 +05:30
Anurag Mishra	41f421d400	feat: added option to add custom remarks in payment entry	2020-09-02 13:47:18 +05:30
Rucha Mahabal	a1b5d57076	test: make rfq from opportunity	2020-09-02 13:14:01 +05:30
rohitwaghchaure	3312956890	Merge pull request #23019 from prssanna/gross-profit-total ... feat: enable total row in Gross Profit Report	2020-09-02 12:18:41 +05:30
rohitwaghchaure	1ab6c3fe94	Merge pull request #23059 from marination/credit-limit-email ... fix: Credit Limit Email not working	2020-09-02 12:14:51 +05:30
marination	099d6718c9	fix: Dont Copy or Print Naming Series	2020-09-02 11:54:55 +05:30
Rucha Mahabal	d2881ba4dd	fix: set conversion factor while creating RFQ from Opportunity	2020-09-02 11:52:59 +05:30
marination	f51cf9f23e	fix: Crop Cycle Test	2020-09-02 11:43:36 +05:30
rohitwaghchaure	efd1ac5840	Merge pull request #23050 from anupamvs/stock-entry-type ... fix: deleting unused Stock Entry Type	2020-09-02 11:43:29 +05:30
rohitwaghchaure	f898c807b8	Merge pull request #23227 from rohitwaghchaure/multiple-job-card-fixes ... Fix: job card issues	2020-09-02 11:41:37 +05:30
Rohit Waghchaure	86a190652e	fix: incorrect job card timer issue	2020-09-02 11:04:56 +05:30
rohitwaghchaure	6a51f3929b	Merge pull request #23054 from marination/general-ledger-filters ... fix: General Ledger filter validation	2020-09-01 17:53:32 +05:30
Deepesh Garg	36b7bb0282	Merge pull request #23229 from deepeshgarg007/gst_template_update ... fix: Update tax template on supplier address change	2020-09-01 16:27:44 +05:30
Marica	329292b9c3	Merge branch 'develop' into credit-limit-email	2020-09-01 16:18:12 +05:30
Deepesh Garg	cebf803455	fix: Update tax template on supplier address change	2020-09-01 16:15:28 +05:30
rohitwaghchaure	a3dd156a8a	Merge pull request #22796 from anupamvs/variance-report-fix ... fix: Target variance report signs	2020-09-01 15:12:21 +05:30
rohitwaghchaure	9bbb9dad8b	Merge pull request #23217 from anupamvs/product-contact-us-v13 ... fix: contact us button issue	2020-09-01 15:10:37 +05:30
Afshan	eb4b2aa142	fix: get_items from product bundle for purchase order (#22821) ... * fix: get_items from product bundle for purchase order * fix: Don't overwrite doctype while setting attributes in child row Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-01 15:01:32 +05:30
Suraj Shetty	9cc87f8b9a	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-09-01 13:55:49 +05:30
Suraj Shetty	df00c5c846	fix: Update erpnext logo	2020-09-01 13:55:34 +05:30
Shivam Mishra	d19947fccd	Merge pull request #23148 from scmmishra/feat-exotel-customer-link	2020-09-01 13:47:31 +05:30
Shivam Mishra	e91a5437bd	Merge pull request #23038 from scmmishra/iff-invoicing	2020-09-01 13:35:32 +05:30
Shivam Mishra	1b5de62454	Merge pull request #23121 from Mangesh-Khairnar/add-integrations-desk-page ... feat: add integrations desk page	2020-09-01 13:34:52 +05:30
Marica	a222081316	Merge branch 'develop' into naming-series-proj	2020-09-01 12:35:11 +05:30
Anupam Kumar	232cb37ebf	Merge branch 'develop' into variance-report-fix	2020-09-01 09:31:22 +05:30
Anupam Kumar	477e41197e	Merge branch 'develop' into item-group-filter-portal	2020-09-01 09:09:19 +05:30
Deepesh Garg	37cb44e109	Merge pull request #23127 from marination/quoted-item-report-v2 ... feat: Quoted Item Comparison Report Enhancements v2	2020-08-31 21:28:56 +05:30
Deepesh Garg	26eab47851	Merge pull request #23221 from deepeshgarg007/pending_principal ... fix: Pending amount after loan closure request	2020-08-31 21:25:53 +05:30
Deepesh Garg	14718e2bde	fix: Add unit test for pending principal amount	2020-08-31 21:21:05 +05:30
Afshan	1dc9a9b669	fix: reverse journal entry for multi-currency (#23165) ... * fix: reverse journal entry for multi-currency * fix: test case for reverse journal entry	2020-08-31 20:35:05 +05:30
marination	bc6c4e864d	fix: Status in Report and filter query	2020-08-31 20:32:17 +05:30
Deepesh Garg	25042a22eb	fix: Pending amount after loan closure request	2020-08-31 19:17:29 +05:30
marination	8938d1040d	fix: Rename/Update Child company Accounts as well	2020-08-31 18:18:10 +05:30
Deepesh Garg	bdc933b3d3	Merge pull request #22985 from deepeshgarg007/accounting_period_cancellation ... fix: Cancellation of accounting transactions within closed accounting period	2020-08-31 17:16:55 +05:30
Deepesh Garg	d79b511e3f	Merge pull request #22950 from deepeshgarg007/billing_address_fetch ... fix: Add default billing address for purchase documents	2020-08-31 17:16:31 +05:30
Deepesh Garg	5523142ced	Merge pull request #23078 from deepeshgarg007/hsn_wise_json ... feat: JSON download for HSN wise outward summary	2020-08-31 17:16:03 +05:30
Anupam Kumar	8089b00df2	Merge branch 'develop' into item-group-filter-portal	2020-08-31 16:42:47 +05:30
marination	fdcda85f87	fix: Validate Missing Accounts in Child Companies ... - If parent account exists in Parent and now child, throw error	2020-08-31 16:10:52 +05:30
Deepesh Garg	56ddf41873	Merge pull request #23211 from michellealva/tax-cat ... feat: Allow Rename for Tax Category	2020-08-31 15:56:43 +05:30
Anupam K	f9f26d2fa4	fix: contact us button issue	2020-08-31 14:34:42 +05:30
Rohit Waghchaure	d0aafece32	fix: incorrect completed qty against operation in work order if workstation is different in job card	2020-08-31 13:41:17 +05:30
Rohit Waghchaure	a5963e1b2c	fix: user created manual job card not linking job card operations with work order operations	2020-08-31 13:40:55 +05:30
Rohit Waghchaure	e7ab53a711	fix: completed qty not updated in work order	2020-08-31 13:40:01 +05:30
Shivam Mishra	d70e711aea	fix: events not deleted on cancelling maintenance schedule (#22954) ... * feat: add participant to event_participant child table * feat: add tests * chore: update function name Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-31 13:14:32 +05:30
Deepesh Garg	d1b88af5b6	Merge pull request #23213 from deepeshgarg007/loan_disbursement_utility ... feat: Utility function to get possible loan disbursal amount	2020-08-31 12:53:08 +05:30
Marica	ee56d0e0a9	Merge branch 'develop' into quoted-item-report-v2	2020-08-31 12:45:05 +05:30
Shivam Mishra	1c96befbaf	Merge branch 'develop' into feat-exotel-customer-link	2020-08-31 11:47:06 +05:30
Shivam Mishra	b4e0d300f7	Merge branch 'develop' into iff-invoicing	2020-08-31 11:46:41 +05:30
Marica	d2d350ce14	Merge branch 'develop' into credit-limit-email	2020-08-31 11:45:15 +05:30
Deepesh Garg	e8b121c2c2	fix: Add status in field list	2020-08-31 11:31:48 +05:30
Deepesh Garg	ce29757bff	fix: Import flt	2020-08-31 11:26:51 +05:30
Rucha Mahabal	5c6ed4dbcd	Merge branch 'develop' into refactor-lab-module	2020-08-31 09:50:30 +05:30
Deepesh Garg	a03ebf007c	Merge pull request #23212 from marination/customer-from-quotation ... fix: Better error feedback on creating SO from Quotation	2020-08-30 23:24:02 +05:30
Deepesh Garg	a4259208e7	feat: Utility function to get possible loan disbursal amount	2020-08-30 23:09:23 +05:30
michellealva	f46c1c5164	fix: Change property of field	2020-08-30 21:37:45 +05:30
marination	e268d294b3	fix: Better error feedback on creating SO from Quotation	2020-08-30 21:01:34 +05:30
michellealva	c71e37c988	feat: Allow Rename for Tax Category	2020-08-30 19:42:24 +05:30
michellealva	288ced24db	feat: Add Naming Series for Project DocType	2020-08-30 19:33:27 +05:30
Syed Mujeer Hashmi	b23840bf7b	fix: Filter out cancelled entries in customer ledger summary ... Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-08-29 23:09:18 +05:30
rohitwaghchaure	2badd93d8f	Merge pull request #23193 from bhavesh95863/patch-10 ... fix: can't multiply sequence by non-int of type 'float	2020-08-28 20:01:05 +05:30
rohitwaghchaure	7c61779a94	Merge pull request #23195 from marination/purchase-over-receipt-subcontracted ... fix: Raise Error on over receipt/consumption for sub-contracted PR	2020-08-28 19:59:51 +05:30
Raffael Meyer	a7ea0ffcf9	Merge branch 'develop' into barredterra-patch-1	2020-08-28 15:44:21 +02:00
barredterra	a162248f32	fix: use hook for website theme scss	2020-08-28 15:16:39 +02:00
Frappe ERPnext	a787882a8f	feat: Option to print UOM after quantity ... Standard for ERPNext prints was UOM before quantity. Now user has a choice.	2020-08-28 13:28:52 +02:00
prssanna	fa400820bb	fix: move leaderboard style to frappe	2020-08-28 15:02:04 +05:30
marination	731bae170e	fix: Test for Over Receipt via PRs on a PO	2020-08-28 14:09:02 +05:30
Afshan	d659774190	fix:tests	2020-08-28 13:40:48 +05:30
Afshan	7586c3408e	fix: test case	2020-08-28 12:56:37 +05:30
Deepesh Garg	ecc282930a	Merge branch 'develop' into navbar_links	2020-08-28 12:48:46 +05:30
marination	e9274283bd	fix: Raise Error on over receipt/consumption for sub-contrcated PR	2020-08-28 12:21:10 +05:30
Deepesh Garg	6887382937	fix: Ignore cpmpany and bank account doctype while deleting company transactions (#22953)	2020-08-28 11:52:00 +05:30
bhavesh95863	3e9f493f15	fix: change parseFloat to flt	2020-08-28 11:15:02 +05:30
Rucha Mahabal	bae2a77d08	Merge branch 'develop' into barredterra-patch-1	2020-08-28 10:43:02 +05:30
Rucha Mahabal	8cdc3b5d91	Merge branch 'develop' into patch-9	2020-08-28 10:41:02 +05:30
rohitwaghchaure	78a32f79df	Merge pull request #23168 from ruchamahabal/fix-appointment-overlap ... fix: don't overwrite patient appointment duration if already specified	2020-08-28 10:39:25 +05:30
rohitwaghchaure	3018d38940	Merge pull request #23170 from anupamvs/product-contact-us-v13 ... feat: Added phone field in product Inquiry	2020-08-28 10:38:44 +05:30
rohitwaghchaure	c31ae27227	Merge pull request #23176 from marination/pricing-rule-missing-fix ... fix: Pricing Rule encoding missing line	2020-08-28 10:37:38 +05:30
rohitwaghchaure	939b95ad3c	Merge pull request #23190 from ruchamahabal/fix-bom-update ... fix: BOM Update Tool failing due to Too Many Writes error	2020-08-28 10:35:59 +05:30
bhavesh95863	33f984c7af	fix: can't multiply sequence by non-int of type 'float	2020-08-27 21:49:21 +05:30
Suraj Shetty	f39bb116cc	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-27 19:27:49 +05:30
prssanna	a324e9bd12	fix: remove text-muted and small class fromtree items	2020-08-27 19:26:14 +05:30
Suraj Shetty	a49af09705	fix: Primary button icon	2020-08-27 18:57:43 +05:30
Suraj Shetty	b6ebcd7559	refactor: Replace darkgray indicator with gray indicator	2020-08-27 18:57:18 +05:30
Rucha Mahabal	c8eea556d1	fix: BOM Update Tool failing due to Too Many Writes error	2020-08-27 18:54:25 +05:30
prssanna	744169833c	fix: replace indicator color darkgrey with darkgray	2020-08-27 17:06:10 +05:30
michellealva	ead2f6abf0	fix: Chage fiedtype of Customer's PO in Sales Invoice	2020-08-27 13:57:15 +05:30
Rucha Mahabal	1bd83e69ee	feat: added Installation Note and Warranty Claim links to Customer dashboard (#23183)	2020-08-27 13:06:52 +05:30
Marica	e7fabb10e1	Merge branch 'develop' into general-ledger-filters	2020-08-27 11:59:01 +05:30
Afshan	b719620d0c	fix: handleling condition if default company doesn't exist	2020-08-26 20:55:16 +05:30
Afshan	7600960d2b	fix: returned empty list if non US based company	2020-08-26 18:40:11 +05:30
bhavesh95863	bb5d886930	fix: account & cost center filter by company	2020-08-26 18:23:21 +05:30
marination	733fd5f03c	fix: get_applied_pricing_rule in taxes_and_totals	2020-08-26 18:23:12 +05:30
Marica	d741ac6871	Merge branch 'develop' into quoted-item-report-v2	2020-08-26 17:33:13 +05:30
Rucha Mahabal	cf2db41876	Merge branch 'develop' into fix-appointment-overlap	2020-08-26 16:33:27 +05:30
Anupam K	c7830f7107	feat: Added phone field in product Inquiry	2020-08-26 15:28:22 +05:30
Rucha Mahabal	9766adbf4e	fix: don't overwrite appointment duration if already specified	2020-08-26 14:53:23 +05:30
Rushabh Mehta	73f648473f	fix(minor): update_start_end_date_for_old_shift_assignment.py	2020-08-26 14:51:37 +05:30
Rushabh Mehta	a163d8bc84	fix(minor): rename_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	544d18327c	fix(patch): quotation_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	38fad58834	fix(patch)	2020-08-26 14:51:37 +05:30
rohitwaghchaure	fe0ecc2ff7	Merge pull request #23144 from anupamvs/product-image ... fix: Homepage Featured Product image fetch issue	2020-08-26 13:05:50 +05:30
rohitwaghchaure	5f4b5f3f46	Merge pull request #23151 from ruchamahabal/fix-conversion-factor ... fix: conversion factor for BOM exploded item rate	2020-08-26 13:01:13 +05:30
bhavesh95863	d888a59bd1	fix: set company filter in condition	2020-08-26 12:44:20 +05:30
Abhishek Balam	dc9af639a7	fix: move condition field	2020-08-26 12:26:15 +05:30
Abhishek Balam	7d0bb25aca	fix: dont show message on condition syntax error	2020-08-26 12:22:31 +05:30
Deepesh Garg	f4b939754c	fix: Codacy fixes	2020-08-26 12:10:12 +05:30
Deepesh Garg	29f187f4f3	Merge branch 'develop' into hsn_wise_json	2020-08-26 12:05:59 +05:30
Shivam Mishra	e1e5e3c915	Merge branch 'develop' into iff-invoicing	2020-08-26 11:30:01 +05:30
Michelle Alva	7a927cefbd	fix: Social Media Status hidden in Mobie View (#23158)	2020-08-26 10:32:26 +05:30
Deepesh Garg	b4a992e6a3	Merge pull request #23156 from ruchamahabal/add-maintenance-visit-link ... feat: add Maintenance Visit link in Customer and Sales Order dashboards	2020-08-25 21:04:00 +05:30
Anupam Kumar	91461a0016	fix: heading is hidden in the mobile view (#23145)	2020-08-25 21:01:17 +05:30
Michelle Alva	258b256dc6	fix: Add Delivery Note link in Sales Invoice Dashboard (#23161)	2020-08-25 20:37:39 +05:30
Rucha Mahabal	12f7aeb147	feat: add Maintenance Visit link in Sales Order dashboard	2020-08-25 19:03:35 +05:30
Rucha Mahabal	5bf0a51ed4	feat: add Maintenance Visit link in Customer dashboard	2020-08-25 18:22:06 +05:30
Rucha Mahabal	d43d1408cf	fix: conversion factor for BOM exploded item rate	2020-08-25 17:13:05 +05:30
Shivam Mishra	de4ac0c905	chore: remove stray tabs	2020-08-25 17:10:05 +05:30
Shivam Mishra	2030b66fc6	feat: add customer link to call log	2020-08-25 17:09:53 +05:30
Anupam K	42092cc377	fix: Homepage Featured Product image fetch issue	2020-08-25 15:29:18 +05:30
Rushabh Mehta	ee921052c0	fix(minor): test dependencies	2020-08-25 14:35:49 +05:30
Rushabh Mehta	b5b8f9e72d	fix(minor): import	2020-08-25 14:14:23 +05:30
Rushabh Mehta	8ad0fa48bf	fix(minor): circular imports?	2020-08-25 12:24:31 +05:30
Rushabh Mehta	ff5d19609f	fix(hot): Pricing Rule encoding fixed	2020-08-25 11:59:57 +05:30
Anupam K	28f4417fc5	fix: added filter show in website for filtering product	2020-08-25 08:59:37 +05:30
Deepesh Garg	07ee7a5bd6	Merge branch 'develop' into dims_in_gl_report	2020-08-24 20:23:19 +05:30
Marica	3e966d6889	Merge branch 'develop' into crm-reports	2020-08-24 19:42:18 +05:30
Shivam Mishra	7556517a4f	feat: validate if removed item attributes exist in variants (#22911) ... * feat: validate if removed item attributes exist in variants * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: smaller loop Co-authored-by: marination <maricadsouza221197@gmail.com> * feat: don't run validation for new entries Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: use tuple as is Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: error description Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: remove unused variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-24 19:37:09 +05:30
marination	8f452b8663	fix: Codacy and indicator message	2020-08-24 18:57:07 +05:30
marination	f49665077c	feat: Quoted Item Comparison Report Enhancements v2	2020-08-24 18:26:48 +05:30
Anupam K	64e84643fb	lost opportunity	2020-08-24 18:01:28 +05:30
rohitwaghchaure	cf4268e21a	Merge pull request #23116 from nabinhait/subcontracted-pr-gle ... fix: GLE for subcontracted PR is fg item rate is zero	2020-08-24 16:07:32 +05:30
Shivam Mishra	5d6b07558d	Merge branch 'develop' into iff-invoicing	2020-08-24 07:56:01 +00:00
rohitwaghchaure	554e2c2eb7	Merge pull request #23120 from deepeshgarg007/sle_cancel ... fix: Reverse SLE not created for fraction qty or qty less than 1	2020-08-24 13:25:12 +05:30
rohitwaghchaure	7d8d26bbea	Merge pull request #23106 from ruchamahabal/add-pos-page ... fix: POS page link not visible on Desk	2020-08-24 12:22:18 +05:30
Mangesh-Khairnar	e292fd6c58	feat: add integrations desk page	2020-08-24 00:45:13 +05:30
Deepesh Garg	8331a38ace	fix: Test Case for qty less than 1	2020-08-23 21:23:26 +05:30
Deepesh Garg	cb0bc2dcaf	fix: Negative SLE not created for fraction qty or qty less than 1	2020-08-23 20:43:50 +05:30
Suraj Shetty	99dfb9556d	refactor: Simplify code	2020-08-23 16:56:46 +05:30
Suraj Shetty	314551ceb2	refactor: Use right css clas name	2020-08-23 16:36:56 +05:30
Suraj Shetty	a43e760703	fix: Item dashboard style	2020-08-23 16:36:28 +05:30
Suraj Shetty	ecc7eedd10	fix: Update erpnext logo	2020-08-23 16:35:39 +05:30
Suraj Shetty	6f9f40992c	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-23 16:33:50 +05:30
Nabin Hait	337ee0a4bf	test: Test case for GLE in subcontracted PR if FG item rate is zero	2020-08-22 20:02:27 +05:30
Nabin Hait	df175cc8fc	fix: GLE for subcontracted PR is fg item rate is zero	2020-08-22 19:17:18 +05:30
Nabin Hait	111183d080	fix: Installation failed due to global variable (#23114)	2020-08-22 12:31:06 +05:30
Deepesh Garg	1b760cb278	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-21 12:36:21 +05:30
Saurabh	66ff5e5e77	Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1 ... fix: check setup complete flag instead setup page	2020-08-21 11:55:38 +05:30
Nabin Hait	1ba62c9732	fix:Validate Job offer against vacancies (#23109)	2020-08-20 19:39:10 +05:30
Deepesh Garg	cf3e482052	Merge pull request #23105 from deepeshgarg007/rcm_submit_v13 ... fix: Unable to submit reverse charge invoice	2020-08-20 19:35:25 +05:30
Marica	c23797e350	fix: Create Opportunity without Default Company from Email (#23097) ... * fix: Create Opoortunity without Default Company from Email * fix: Add Prompt to Select Company * Update communication.js Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-20 19:12:12 +05:30
Rucha Mahabal	4061186429	fix: POS page link not visible on Desk	2020-08-20 18:01:20 +05:30
Deepesh Garg	afd2dd3570	fix: Unable to submit reverse charge invoice	2020-08-20 16:52:52 +05:30
rohitwaghchaure	019d4debb2	fix: incorrect stock value in return case (#23102)	2020-08-20 15:53:58 +05:30
Raffael Meyer	f0b9f660cd	Merge branch 'develop' into datev_refactor	2020-08-20 12:05:50 +02:00
Shivam Mishra	25ba271562	Merge branch 'develop' into fix-margin-for-filter	2020-08-20 08:59:04 +00:00
Shivam Mishra	d5971d3c59	Merge branch 'develop' into iff-invoicing	2020-08-20 08:16:22 +00:00
rohitwaghchaure	5f2463933a	Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty ... feat(queries): sort warehouses based on item quantity in descending manner	2020-08-20 09:36:16 +05:30
Raffael Meyer	585f1f67b7	Merge branch 'develop' into navbar_links	2020-08-19 18:55:44 +02:00
Raffael Meyer	2c26144a6b	Update erpnext/patches/v13_0/add_standard_navbar_items.py	2020-08-19 18:55:06 +02:00
Deepesh Garg	cbedb3de3a	Merge pull request #23089 from deepeshgarg007/rcm_deduction_v13 ... fix: Do not update total for RCM invoices if net taxes are zero	2020-08-19 20:19:06 +05:30
Deepesh Garg	8aed48fe31	fix: Do not update total for RCM invvoices if net taxes are zero	2020-08-19 18:59:27 +05:30
Rucha Mahabal	eed2a6340c	Merge branch 'develop' into fix-pos-print	2020-08-19 18:57:47 +05:30
marination	22d3729427	fix: Codacy	2020-08-19 15:42:40 +05:30
Deepesh Garg	aaeb3980bc	feat: JSON download for HSN wise outward summary	2020-08-19 15:13:30 +05:30
marination	698d983eef	fix: Item Tax Updation via Update Items in SO/PO	2020-08-19 14:59:46 +05:30
Diksha Jadhav	182ee5e7c1	feat(queries): sort warehouses based on item quantity	2020-08-19 14:04:34 +05:30
Deepesh Garg	1fb1c08872	Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13 ... fix: Tax amounts in HSN Wise Outward summary	2020-08-19 11:43:14 +05:30
Deepesh Garg	b240cfe401	fix: Remove print statements	2020-08-19 11:41:43 +05:30
Deepesh Garg	64ebbf0907	fix: Tax amounts in HSN Wise Outward summary	2020-08-19 11:41:33 +05:30
Rucha Mahabal	434bab8003	fix: Print Language for Customer not set for Print Receipt in POS	2020-08-19 01:00:59 +05:30
Deepesh Garg	1c14606c06	fix: Total calculations for multicurrency RCM invoices (#23072)	2020-08-18 19:32:52 +05:30
Deepesh Garg	9d60e48538	Merge pull request #23067 from rohitwaghchaure/profit-and-loss-report-not-working ... fix: profit and loss report not working	2020-08-18 17:03:10 +05:30
Rohit Waghchaure	310ade7282	profit and loss report not working	2020-08-18 16:07:24 +05:30
Marica	847343af86	Merge branch 'develop' into general-ledger-filters	2020-08-18 13:40:45 +05:30
Marica	12c68d0450	Merge branch 'develop' into credit-limit-email	2020-08-18 13:39:03 +05:30
Marica	2d767debf1	Merge branch 'develop' into shift_management	2020-08-18 13:27:15 +05:30
Michelle Alva	849b712770	fix: Change spelling of "Successful" (#23063) ... Before: Import Successfull After: Import Successful	2020-08-18 12:06:46 +05:30
Shivam Mishra	115ad3e99a	Merge branch 'develop' into iff-invoicing	2020-08-18 05:51:41 +00:00
Rucha Mahabal	035907a24f	fix: remove Request for Quotation link from Fiscal Year dashboard (#23040)	2020-08-18 10:57:10 +05:30
Glen Whitney	b2604d1f77	fix(General Ledger): include Accounting Dimension columns in report ... Prior to this commit, custom Accounting Dimensions are not (by default) shown or even considered in generating a General Ledger report. Moreover, as they are not considered, they are not used to distinguish GL Entry lines in the same voucher with the same Account when the "Group By" value is "Group by Voucher (Consolidated)". This situation leads to lines with different values for the accounting dimension to be ganged together in the General Ledger view of a Journal entry, making the entry difficult for an accountant to read. This commit alleviates the problem by adding a checkbox to control whether Accounting Dimension columns are considered in the General Ledger report. When they are considered, they are displayed and also included in the key that distinguishes lines in the "Group by Voucher (Consolidated)" mode. Resolves #23033.	2020-08-17 20:43:56 +00:00
Deepesh Garg	1067f7ed3e	fix: Price rule filtering in case of no doc	2020-08-17 23:47:58 +05:30
Deepesh Garg	38cabbd4b8	Merge pull request #23007 from prssanna/expense-claim-list-currency ... fix: add company in list fields to fetch for Expense Claim	2020-08-17 23:07:51 +05:30
Deepesh Garg	aef5c4cb64	Merge pull request #23044 from frappe/sales-analytics ... fix: Remove dependency of Sales Order in Sales Analytics	2020-08-17 23:00:49 +05:30
Shivam Mishra	eb832f6861	Merge branch 'develop' into iff-invoicing	2020-08-17 12:53:43 +00:00
Marica	4c1ea3e0e3	Merge branch 'develop' into credit-limit-email	2020-08-17 18:10:29 +05:30
Marica	0a926ee20d	Merge branch 'develop' into general-ledger-filters	2020-08-17 18:10:05 +05:30
Marica	11a167f8bb	Merge branch 'develop' into shift_management	2020-08-17 16:39:27 +05:30
marination	205df14a48	fix: Credit Limit Email not working	2020-08-17 16:23:44 +05:30
Anurag Mishra	df7b428331	fix: UI/UX Salary details and salary slip form cleanup (#22536) ... * fix: UI/UX Salary details * feat: salary slip form cleaup * fix(test): set working days zero if salary slip is based on timesheet * fix(revert): set working days zero if salary slip is based on timesheet * fix: salary slip form cleanup Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 14:09:54 +05:30
Marica	39c97bfbe9	Merge branch 'develop' into shift_management	2020-08-17 13:46:51 +05:30
Anurag Mishra	13be09e883	Update update_start_end_date_for_old_shift_assignment.py	2020-08-17 13:43:33 +05:30
Afshan	084de5f0b2	fix: handled condition if staffing isn't created (#22992) ... * fix: handled condition if staffing isn't created * style: reformated code for redability * Update erpnext/hr/doctype/job_offer/job_offer.py Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-17 13:14:09 +05:30
marination	eb241c6c42	fix: General Ledger filter validation	2020-08-17 12:57:56 +05:30
Anupam K	d7b69e57ae	fix: deleting unused Stock Entry Type	2020-08-17 11:20:56 +05:30
Afshan	5b45961b9d	fix: the JSON object must be str, bytes or bytearray, not "list" (#23047) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 10:51:53 +05:30
Deepesh Garg	e1e847a3f7	feat: Enhancement in Loan Topups	2020-08-16 20:57:39 +05:30
Deepesh Garg	a2249e013d	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes	2020-08-15 18:28:04 +05:30
michellealva	e69b2e0da1	fix: Remove dependency of Sales Order in Sales Analytics	2020-08-15 10:16:26 +05:30
Deepesh Garg	d9accededa	fix: filter pricing rules based on condition	2020-08-14 22:36:01 +05:30
Shivam Mishra	fe57ed629e	Merge branch 'develop' into iff-invoicing	2020-08-14 14:31:31 +00:00
Shivam Mishra	736aee886e	Merge branch 'develop' into support-search	2020-08-14 13:36:59 +00:00
Rucha Mahabal	5fb0e7184e	fix: list index out of range error while setting POS payment mode (#23018)	2020-08-14 17:11:39 +05:30
Suraj Shetty	cab5918244	Merge branch 'develop' into HR-fix	2020-08-14 16:12:28 +05:30
Shivam Mishra	3daa9de998	feat: add email option to field email_id	2020-08-14 13:46:58 +05:30
Shivam Mishra	6b68eaad1e	feat: use email template for membership acknowledgement	2020-08-14 13:46:58 +05:30
Shivam Mishra	b4d3666e69	feat: show send acknowledgement button if enabled in settings	2020-08-14 13:46:58 +05:30
Shivam Mishra	e4c58c37c8	feat: allow member creation via API	2020-08-14 13:46:58 +05:30
Shivam Mishra	98bcedd09c	feat: create member if not already exists	2020-08-14 13:46:58 +05:30
Shivam Mishra	d7139bbd43	fix: type error	2020-08-14 13:46:58 +05:30
Shivam Mishra	87ddec069e	refactor: try block across the function	2020-08-14 13:46:58 +05:30
Shivam Mishra	6fbe9b5404	fix: remove payload	2020-08-14 13:46:58 +05:30
Shivam Mishra	733bde31c9	fix: doctype name in patch	2020-08-14 13:46:58 +05:30
Shivam Mishra	3a67a78ece	feat: add custom buttons for invoice and email	2020-08-14 13:46:58 +05:30
Shivam Mishra	8e0314e7f6	feat: separate invoice generation and email	2020-08-14 13:46:58 +05:30
Shivam Mishra	c8d9e7f77b	feat: add message field	2020-08-14 13:46:58 +05:30
Shivam Mishra	1678eb9b50	feat: drop payload column	2020-08-14 13:46:58 +05:30
Shivam Mishra	62e344188a	feat: update settings and link filters	2020-08-14 13:46:32 +05:30
Shivam Mishra	15340e0c7f	feat: send invoice via email	2020-08-14 13:46:32 +05:30
Shivam Mishra	811ac909f9	feat: add auto invoice creation fields and controllers	2020-08-14 13:46:32 +05:30
Shivam Mishra	96dc67c35e	feat: add copy button and docs link	2020-08-14 13:46:32 +05:30
Shivam Mishra	3a1868dae8	feat: add item field	2020-08-14 13:46:32 +05:30
Shivam Mishra	a16b24d50a	feat: add enable or disable invoicing and print format field	2020-08-14 13:46:32 +05:30
Anurag Mishra	759632c025	fix: requested Changes	2020-08-14 12:26:04 +05:30
Anurag Mishra	6f1579da1f	Merge branch 'develop' into shift_management	2020-08-14 12:11:41 +05:30
Deepesh Garg	8ca57eb5dd	Merge pull request #23022 from marination/loan-amount ... fix: Validate or Set Loan Amount first	2020-08-13 19:53:09 +05:30
Afshan	d7d92c520e	fix: removed code relating to standard working hours (#23009)	2020-08-13 19:40:09 +05:30
Deepesh Garg	1151f888ba	fix: Set pledge amount before setting loan amount	2020-08-13 18:52:23 +05:30
bhavesh95863	a647bef682	fix: warehouse mandatory even update stock uncheck (#23023)	2020-08-13 17:41:55 +05:30
Anupam K	b3bd780d46	fix: codasy dix	2020-08-13 17:07:15 +05:30
Anurag Mishra	f096ba4998	patch: Old Shift Assignment	2020-08-13 14:18:48 +05:30
Anurag Mishra	c2710e05ce	fix: showing on_going shift on calendar	2020-08-13 14:17:47 +05:30
Anurag Mishra	74f0a1ab7c	fix: changes Requested	2020-08-13 14:17:47 +05:30