27129 Commits

Author	SHA1	Message	Date
Ankush Menat	7b4a38c71e	chore: remove print from account controller (#25807) ... This is polluting test output and it's not useful for debugging without context.	2021-05-23 18:49:26 +05:30
Ankush Menat	c229ac9322	refactor: add guard clause for readability ... Both functions only execute based on a condition. In such cases condition should immediately exit the function, this is called "guard clause" and helps in readability (less indent, and easy to "exit" when reading the code.	2021-05-23 16:31:29 +05:30
Ankush Menat	4b484d741d	refactor: use is_new() instead of __islocal ... Interface over implementation.	2021-05-23 16:31:29 +05:30
Ankush Menat	931c886f92	fix: not checking all fields ... `break` will break out of the loop without checking remaining fields.	2021-05-23 16:31:29 +05:30
Ankush Menat	83e6e2e68a	refactor: add guard clause for readability	2021-05-23 16:31:29 +05:30
Ankush Menat	0b4858d8e5	refactor: eliminate unnecessary loop, container casts	2021-05-23 16:31:29 +05:30
Ankush Menat	ad58a8164a	refactor: code cleanup ... minor fixes for improving code quality	2021-05-23 16:31:29 +05:30
Ankush Menat	4a2dbd4885	refactor: cleanup get_timeline_data, remove py2	2021-05-23 16:31:28 +05:30
Ankush Menat	330353a5ce	refactor: use frappe.throw instread of recreating ... _msgprint was basically duplicating behvaiour of frappe.throw	2021-05-23 16:31:16 +05:30
Marica	eaf0465c44	Merge pull request #25797 from marination/item-variants-report ... fix: Item Variant Details Report	2021-05-22 19:05:54 +05:30
marination	b0019bcf5b	fix: Item Variant Details Report ... Co-authored-by: gavindsouza <gavin18d@gmail.com> - Handling of variants with special characters - Set data in appropriately named columns - Code cleanup	2021-05-21 21:42:11 +05:30
rohitwaghchaure	ab34f5b485	Merge pull request #25742 from ankush/disable_submit_btn ... fix: duplicate stock entry on multiple click	2021-05-21 18:13:01 +05:30
rohitwaghchaure	579a1b7028	Merge pull request #25779 from ankush/parallel_stock_transactions ... fix: wrong quantity after transaction for parallel stock transactions	2021-05-21 18:11:34 +05:30
Saqib	0b5e340b6e	fix(pos): return case for item with available qty equal to one (#25760)	2021-05-21 16:32:56 +05:30
Saqib	e930456be2	fix(e-invoicing): 'NoneType' object is not iterable (#25781)	2021-05-21 16:31:12 +05:30
Alan	1097dc89c5	fix: show allow zero valuation only when auto checked (#25778)	2021-05-21 14:04:03 +05:30
Ankush Menat	4dcac4ae81	refactor(minor): Use identity instead of equality ... Ignore false positive.	2021-05-21 13:49:58 +05:30
Ankush Menat	9979cf5fcc	fix: wrong quantity after transaction for parallel stock transactions ... When two transactions are inserted parallelly then previous SLE could be incorrect for some of them. Locking SLE table would prevent reading from it till transaction is complete.	2021-05-21 12:31:06 +05:30
rohitwaghchaure	651e934415	Merge pull request #25683 from noahjacob/supplier_item_group_link ... feat: linking supplier with an item group for filtering items	2021-05-21 12:07:53 +05:30
Rohit Waghchaure	795909fdcd	fix: warehouse not found in stock entry	2021-05-21 11:31:01 +05:30
Anuja P	605ea044f3	fix: update process SOA format	2021-05-21 11:24:33 +05:30
rohitwaghchaure	84730aa4a5	Merge pull request #25754 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running-13 ... fix: the status of repost item valuation showing In Progress since long time	2021-05-21 09:50:18 +05:30
Rucha Mahabal	722cfdb7e5	Merge pull request #25701 from anupamvs/timesheet-refactor ... refactor: timesheet	2021-05-20 23:43:19 +05:30
Rucha Mahabal	a7d0dbb085	fix: calculate total billing amount on fetching timesheets ... - show timesheet billing amounts in doc currency	2021-05-20 23:02:11 +05:30
Rucha Mahabal	8a407f1ec3	fix: sider issues	2021-05-20 22:23:44 +05:30
Rucha Mahabal	be247ec3de	fix: error message placeholders and sider issues	2021-05-20 22:17:20 +05:30
Rucha Mahabal	0d8b9a9d0a	fix(patch): billable field not renamed	2021-05-20 19:53:30 +05:30
noahjacob	f0e6a16910	test: updated test for generated schedule dates	2021-05-20 19:29:12 +05:30
Deepesh Garg	181c5d240b	Merge pull request #25767 from deepeshgarg007/gst-ptach-fix-1 ... fix: Do not throw error on migrate	2021-05-20 18:40:48 +05:30
Mohammad Hasnain Mohsin Rajan	21e662f678	fix: apply permission while selecting projects (#25765)	2021-05-20 17:20:05 +05:30
Deepesh Garg	4427390ab3	fix: Do not throw error in migrate	2021-05-20 17:19:24 +05:30
noahjacob	0169cd845a	fix: sider	2021-05-20 15:40:07 +05:30
Anupam	1270febfff	fix: sider issues	2021-05-20 14:15:58 +05:30
Anupam	aa516e5d17	fix: review changes	2021-05-20 14:12:18 +05:30
Anupam	aeb88385bb	patch: timesheet changes	2021-05-20 14:11:36 +05:30
noahjacob	08598238d7	refactor: suggested changes	2021-05-20 13:23:10 +05:30
Deepesh Garg	8bc90ffcf5	Merge pull request #25755 from nextchamp-saqib/improve-missing-cost-center-msg ... fix: missing cost center message on creating gl entries	2021-05-20 11:20:43 +05:30
Saqib Ansari	b9ad385232	fix: remove uncessary query	2021-05-19 19:13:06 +05:30
Saqib Ansari	7fb385a89f	fix: cannot bypass e-invoicing for non gst item invoices	2021-05-19 18:47:06 +05:30
Saqib	4bd641367b	fix: address template with upper filter throws jinja error (#25756)	2021-05-19 16:38:53 +05:30
noahjacob	516c789127	refactor: variable names and suggested changes	2021-05-19 16:01:39 +05:30
Anupam	4e73c8a79f	restructuring timesheet fields	2021-05-19 14:58:12 +05:30
noahjacob	bf7f0530e6	fix: added error handling if entry already exists	2021-05-19 13:53:22 +05:30
noahjacob	8e34c49ac9	refactor: using get_all instead of get_list	2021-05-19 13:51:36 +05:30
noahjacob	3768216dca	refactor: updated permissions and mandatory fields	2021-05-19 13:50:35 +05:30
Saqib Ansari	f79ef5d8cf	fix: missing cost center message on creating gl entries	2021-05-19 13:04:44 +05:30
Rohit Waghchaure	5456873641	fix: run scheduler for reposting if there is no scheduler is running for the reposting	2021-05-19 12:30:28 +05:30
Anupam	9bd779401d	added multi-currency fields	2021-05-18 22:41:28 +05:30
anushka19	90f7ec840c	fix: Accumulated depreciation (#25748) ... * fix: Accumulated depreciation * fix: Sider issues	2021-05-18 22:21:42 +05:30
Saqib	8d7d4b0ba7	fix: expected amount in pos closing payments table (#25737)	2021-05-18 18:39:35 +05:30
Syed Mujeer Hashmi	426b04003c	fix: Project filter for Kanban Board ... Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2021-05-18 17:02:21 +05:30
Marica	814fd19424	Merge pull request #25732 from noahjacob/ux_landed_cost_voucher ... refactor: updated applicable charges form in landed cost voucher	2021-05-18 16:39:31 +05:30
Ankush Menat	ecbb8cbc84	revert: "fix: duplicate stock entry (#25486)" ... Not required anymore, submit button is disabled.	2021-05-18 16:35:55 +05:30
Ankush Menat	042b8524cc	fix: disable submit button to avoid multiple calls	2021-05-18 16:35:49 +05:30
Marica	5da34bddd6	Merge pull request #25731 from ankush/escaping_company_name ... fix: escape company name	2021-05-18 16:35:19 +05:30
Devin Slauenwhite	bdba064fa6	fix: duplicate stock entry (#25486) ... Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-05-18 16:12:53 +05:30
noahjacob	0ab0fcdd51	feat: added supplier item group link in supplier dashboard	2021-05-18 15:21:24 +05:30
noahjacob	ca2fb47d44	feat: updates item_code filters if item_group is linked to supplier	2021-05-18 15:01:05 +05:30
Ankush Menat	b6783b158f	chore: translation fixes	2021-05-17 17:06:41 +05:30
Ankush Menat	f3b3d81e0b	fix: escape company name in deferred_revenue	2021-05-17 17:06:41 +05:30
noahjacob	41ac8be6f2	refactor: base_amount field moved below amount field and renamed	2021-05-17 13:58:27 +05:30
Anupam	42d2f663fa	fix: sider fixes	2021-05-17 11:08:26 +05:30
Deepesh Garg	87baa646e7	Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports ... feat: Dimension-wise Accounts Balance Report	2021-05-16 18:04:01 +05:30
Anupam	35137ba9e0	removing currency filter and added rate conversion while fetching timesheets in SI	2021-05-16 14:17:56 +05:30
Anupam	cab998c293	adding patch	2021-05-15 20:40:20 +05:30
Anupam	fd4743cc31	refactor: timesheet	2021-05-15 20:01:17 +05:30
Alan	55c2fec683	feat: add pending qty section to batch/serial selector dialog (#25519) ... * feat: add pending qty section to batch/serial selector dialog * fix: call attach in setup and refresh, fix conditional * refactor: camel to snake casing	2021-05-14 12:36:41 +05:30
rohitwaghchaure	2aa401826e	fix: validation message of quality inspection in purchase receipt (#25666)	2021-05-14 12:34:50 +05:30
Alan	98fc4195b3	fix: send emails on rfq submit (#25695) ... * fix: send emails on rfq submit * fix: check if email is present for supplier	2021-05-14 12:22:28 +05:30
Alan	eca86290bc	fix: show uom for item in selector dialog (#25697)	2021-05-14 12:21:38 +05:30
Deepesh Garg	be3cde9313	chore: Code clean up for purchase receipt GL (#25379) ... * chore: Code clean up for purchase receipt GL * fix: add params for debit and credit in account curreny * chore: Asset GL entry code cleanup * fix: Syntax error * fix: Update variable names * fix: function naming * fix: Add undefined variables * fix: Supplier warehouse fetching * fix: Linting issues	2021-05-14 12:20:38 +05:30
Deepesh Garg	55fe85d850	feat(India): Multiple GST enhancement and fixes (#25249) ... * fix: RCM tax calculation * feat(India): ITC Reversal via Journal Entry * fix: Reverse Charge booking logic and validation * fix: Addd patch for availed ITC fields * fix: Hooks method to update availed ITC field * fix: Cleanup and fixes in GSTR3B report * fix: Update params in GSTR-1 report * fix: Debit note using Sales Invoice * fix: Setup and patch * fix: GSTR 3B report cleanup and updates * fix: Add method to get invoices liable to reverse charge * fix: Add taxable value in Purchase Invoice Item * fix: Inward supplies liable to reverse charge * fix: Linting issues * fix: GSTR3B report test	2021-05-14 12:17:41 +05:30
rohitwaghchaure	ba940bb9e1	Merge pull request #25702 from rohitwaghchaure/change-today-to-now-for-reposting ... fix: change today to now to get data for reposting	2021-05-13 17:44:38 +05:30
rohitwaghchaure	fc44478810	Update repost_item_valuation.py	2021-05-13 17:42:33 +05:30
Rohit Waghchaure	af1376c1df	chore: change today to now to get data for reposting	2021-05-13 17:39:49 +05:30
Mohammad Hasnain Mohsin Rajan	e85770fe3f	fix: bank statement import via google sheet (#25676) ... * fix: google sheet bank statement import * fix: quotes Co-authored-by: Ankush Menat <ankushmenat@gmail.com> * chore: add translation Co-authored-by: Ankush Menat <ankushmenat@gmail.com> * chore: grammar Co-authored-by: Ankush Menat <ankushmenat@gmail.com> * fix: remove comment Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-05-13 17:33:18 +05:30
rohitwaghchaure	d42dd5d868	Merge pull request #25694 from rohitwaghchaure/fixed-warehouse-tree-time-out-error-13hotfix ... fix: timeout error while loading warehouse tree	2021-05-13 17:21:16 +05:30
Rohit Waghchaure	27f50d5852	fix: timeout error while loading warehouse tree	2021-05-13 15:54:35 +05:30
Deepesh Garg	95e05fbdac	fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet	2021-05-13 14:59:28 +05:30
Anurag Mishra	0c482fde5f	feat: Leave Policy Assignment Refactor (#24327) ... * feat: Leave Policy Assignment Refactor * fix: Changes Requested * fix: sider * fix: changes requested * test: fixed * test: fixed wrong set query * fix: remove commented code * fix(style): extra space Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-05-13 13:20:14 +05:30
rohitwaghchaure	0612300631	Merge pull request #25688 from rohitwaghchaure/fixed-woocommerce-order-sync-issue ... fix: Woocommerce order sync issue	2021-05-12 23:07:46 +05:30
Rohit Waghchaure	c3c54fe058	fix: Woocommerce order sync issue	2021-05-12 19:42:04 +05:30
rohitwaghchaure	3c79ee3a2b	Merge pull request #25672 from rohitwaghchaure/fixed-don-not-mao-set-warehouse ... fix: don't map set warehouse from delivery note to purchase receipt	2021-05-12 17:47:28 +05:30
Afshan	dc205e805f	fix: Dialog variable assignment after definition in POS (#25681)	2021-05-12 17:42:06 +05:30
rohitwaghchaure	4fbabb4132	Merge pull request #25679 from rohitwaghchaure/fixed-new-fields-not-added ... fix: updated modified time in purchase invoice to pull new fields	2021-05-12 16:40:23 +05:30
Rohit Waghchaure	9f017a351b	fix: updated modified time to pull new fields	2021-05-12 16:35:19 +05:30
Mohammad Hasnain Mohsin Rajan	e7a2fdd81a	fix: change links in workspace (#25674)	2021-05-12 13:02:32 +05:30
Rohit Waghchaure	d984be0ccd	fix: don't map set warehouse from delivery note to purchase receipt	2021-05-12 12:32:14 +05:30
rohitwaghchaure	958c96ee3f	Merge pull request #25660 from deepeshgarg007/promotional_item_cost_center ... fix: Breaking cost center validation	2021-05-11 18:08:17 +05:30
Deepesh Garg	a665f14620	fix: Error on adding bank account to plaid (#25658)	2021-05-11 17:33:59 +05:30
Deepesh Garg	a60c3081cf	fix: Breaking cost center validation	2021-05-11 16:38:33 +05:30
Deepesh Garg	d2520680bc	fix: Error on applying TDS without party (#25632) ... * fix: Error on applying TDS without party * fix: Add placeholder value	2021-05-10 21:17:06 +05:30
Deepesh Garg	83f98f6992	Merge pull request #25653 from deepeshgarg007/tax_labels ... fix: Client script breaking while settings tax labels	2021-05-10 18:24:02 +05:30
Deepesh Garg	9f0823a164	fix: Linting issues	2021-05-10 16:07:41 +05:30
Saqib	55d47a2baa	fix(pos): UI fixes related to overflowing payment section (#25652) ... * fix: additional fields overflowing in payment section * fix: pos profile filter in pos opening dialog * fix: item quantity pill	2021-05-10 15:59:37 +05:30
Deepesh Garg	13dfb9734c	fix: Lable for transaction child tables	2021-05-10 15:38:32 +05:30
Deepesh Garg	1a48eb49cf	fix: Client script breaking while settings tax labels	2021-05-10 14:37:10 +05:30
Ganga Manoj	f2eb8dd1d5	feat: Transaction Deletion Record (#25354) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-05-10 14:02:58 +05:30
Ankush Menat	6e179c3092	fix: sync shopify customer addresses (#25481)	2021-05-10 13:24:26 +05:30
Saqib	9226cd3932	feat(india): reduced rate of depreciation as per IT Act (#25648) ... * feat(india): reduced rate of depreciation as per IT Act * refactor: check date difference instead of month difference * feat: add test for regional feature	2021-05-10 12:36:56 +05:30
noahjacob	50f52dfbcb	refactor: variable names and refactored cancel function into submit function	2021-05-09 20:04:06 +05:30
noahjacob	7715441842	feat: added supplier item group doctype	2021-05-09 20:02:23 +05:30
Ganga Manoj	aa9e172091	feat: Add Create Expense Claim button in Delivery Trip (#25526) ... * feat(Delivery Trip): Add employee_code field * feat(Expense Claim): Add Delivery Trip Number field * feat(Delivery Trip): Add Create Expense Claim button * feat(Delivery Trip): Make Create Expense Claim button show up after save * fix(Delivery Trip): Fix Sider issues * fix(Delivery Trip): Display button after submit * fix(Delivery Trip & Expense Claim): Rename new fields * fix(Delivery Trip): Add button in refresh * fix(Delivery Trip): Remove redundant line * fix(Expense Claim): Display delivery_trip only if non-empty * fix(Delivery Trip): Add test for Create Expense Claim * fix(Delivery Trip): Fix Sider Issue * fix(Delivery Trip): Only display Create Expense Claim if the driver is an employee * fix(Delivery Trip): Fix test * fix(Delivery Trip): Fix make_expense_claim() * fix: sider Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-05-08 17:15:33 +05:30
rohitwaghchaure	64bd4f27b8	Merge pull request #25611 from rohitwaghchaure/validation-to-check-duplicate-serial-nos ... fix: added validation in stock entry to check duplicate serial nos	2021-05-07 23:30:27 +05:30
rohitwaghchaure	42fe07bd19	Merge pull request #25551 from rohitwaghchaure/fixed-total-stock-summary-report ... fix: total stock summary report not working	2021-05-07 23:30:06 +05:30
rohitwaghchaure	1726ce547c	Merge pull request #25471 from rohitwaghchaure/allow-to-receipt-same-serial-no ... fix: allow to receive same serial numbers multiple times	2021-05-07 23:27:50 +05:30
Alan	c6dc9eaf2e	feat!: add pick batch button (#25413) ... * feat!: add pick batch button BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no. * refactor: use setup_serial_or_batch_no instead of setup_serial_no * refactor: use setup_serial_or_batch_no instead of setup_serial_no * refactor: use setup_serial_or_batch_no instead of setup_serial_no * style: add sider review changes * refactor: make consice, extract function * refactor: camel to snake casing	2021-05-07 20:30:04 +05:30
Ankush Menat	90e671905a	chore: replace assertEquals with alias assertEqual (#25613) ... * chore: replace assertEquals with alias assertEqual assertEquals has been deprecated. ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases * chore: sider fixes	2021-05-07 20:28:51 +05:30
Ankush Menat	e28165ea87	fix: force https for shopify webhook registration (#25630)	2021-05-07 20:27:51 +05:30
Anupam Kumar	da7fefe29d	fix: timesheet filter date exclusive issue (#25626)	2021-05-07 20:26:50 +05:30
Saqib	27cf19a19f	feat(pos): show POS reserved stock in stock projected qty report (#25593) ... * feat(pos): consider POS reserved stock in stock projected qty report * chore: remove unwanted string formats	2021-05-07 13:37:42 +05:30
Ganga Manoj	5618ce3852	fix(Material Request): Add 'Partially Received' to Status drop-down list (#24857) ... Co-authored-by: Ganga Manoj <ganga_manoj@Gangas-MacBook-Air.local> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-05-07 13:35:09 +05:30
Rucha Mahabal	062d30146f	fix: Include search fields in Project Link field query (#25505) ... * fix: Include search fields in Project Link field query * fix: add project_name to Project search fields	2021-05-07 13:31:14 +05:30
Umair Sayed	7f79d463f6	fix: Stock and Accounts Settings form refactor (#25534) ... * stock and accounts settings page * fix: Stock and accounts settings page cleanup Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air.local>	2021-05-07 12:28:57 +05:30
Shariq Ansari	735fbdc350	fix: Updating Standard Notification's channel field (#25564)	2021-05-07 12:26:32 +05:30
Deepesh Garg	00e00e4e90	fix: Report summary showing inflated values when values are accumulated in Group Company (#25577) ... * fix: Report summary showing inflated values when values are accumullated in Group Company * fix: Remove extra space * fix: Translate strings * fix: Remove unintended changes	2021-05-07 12:16:44 +05:30
Shadrak Gurupnor	f648d2d7c4	fix: added tax_types list (#25587)	2021-05-07 12:15:19 +05:30
Ankush Menat	996f7e53a1	fix: update shopify api version (#25600)	2021-05-07 12:14:14 +05:30
Anuja Pawar	f132ed4335	fix: update item level cost center from POS (#25609)	2021-05-07 12:11:09 +05:30
Alan	0e0de6baa1	fix: prevent spurious defaults for items when making prec from dnote (#25559) ... * fix: prevent spurious defaults for items when making prec from dnote * refactor: make concise, use dict comp	2021-05-07 11:40:02 +05:30
Noah Jacob	4ecae62194	fix: added is_stock_item filter (#25530)	2021-05-06 19:42:01 +05:30
Nabin Hait	134eaa5786	perf: Performance enhancement on setup wizard (#25605) ... * perf: Performance enhancement on setup wizard * fix: create departments without updating nsm	2021-05-06 19:13:54 +05:30
Rohit Waghchaure	695becdd05	fix: added validation in stock entry to check duplicate serial nos	2021-05-06 18:03:32 +05:30
rohitwaghchaure	dc6233b703	Merge pull request #25541 from rohitwaghchaure/fixed-incorrect-serial-no-set ... fix: serial no changed after saving stock reconciliation	2021-05-06 17:44:36 +05:30
Saqib	900a8fb21a	feat(pos): ability to retry on pos closing failure (#25595) ... * feat(pos): ability to retry on pos closing failure * fix: sider issues * fix: sider issues * fix: mark all queued closing entry as failed * feat: add headline message	2021-05-06 17:02:47 +05:30
Sagar Vora	f43a86d90f	perf: significant reduction in time taken to save a delivery note (#25475)	2021-05-06 16:40:06 +05:30
Saqib	d502f76319	feat(e-invoicing): e-way bill validity field (#25555)	2021-05-06 16:10:55 +05:30
Deepesh Garg	8a1f86db16	Merge pull request #25582 from deepeshgarg007/this_variable ... fix: function call to update payment schedule labels	2021-05-06 15:50:47 +05:30
Deepesh Garg	9dd0a26e92	Merge pull request #25598 from deepeshgarg007/payment_reco_invoice_fix ... fix: Invoices not getting fetched during payment reconciliation	2021-05-06 15:49:19 +05:30
rohitwaghchaure	7ed531611b	Merge pull request #25588 from 18alantom/fix-check-schedule-date ... fix: check for None in item.schedule_date before setting	2021-05-06 14:04:14 +05:30
Rohit Waghchaure	bb3e5d00f4	fix: allow to receive same serial numbers multiple times	2021-05-06 12:38:35 +05:30
Deepesh Garg	85b675a554	fix: Invoices not fetch during payment reconciliation	2021-05-05 20:57:31 +05:30
Deepesh Garg	ffea9d4126	fix: Check if payment schedule exists	2021-05-05 12:28:40 +05:30
18alantom	136eb30081	fix: use get_serial_nos for splitting	2021-05-05 12:26:29 +05:30
Deepesh Garg	1bb7bb74ad	fix: Check if payment schedule exits before updating label	2021-05-05 12:19:57 +05:30
18alantom	2a20a03c28	fix: check for None in item.schedule_date before setting	2021-05-05 11:59:15 +05:30
rohitwaghchaure	8be414873b	Merge pull request #25575 from rohitwaghchaure/fixed-stock-balance-report-and-batchwise-report ... fix: stock balance and batch-wise balance history report showing different closing stock	2021-05-05 10:04:23 +05:30
Deepesh Garg	04923d6a65	fix: function call to update payment schedule labels	2021-05-04 21:01:12 +05:30
Asharam Seervi	18ad15ed16	fix: designation insufficient permission on lead doctype. (#25331)	2021-05-04 19:28:07 +05:30
Afshan	eebc6e9277	refactor: Show item's full name on hover over item in POS (#25554) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-05-04 17:05:12 +05:30
Rushabh Mehta	5fc4f1e37d	Merge pull request #25238 from alyf-de/datev_fixes ... feat: Improve DATEV export	2021-05-04 15:38:57 +05:30
Rohit Waghchaure	ba8dc1ffbd	fix: stock balance and batchwise balance history report showing different closing stock	2021-05-04 15:03:10 +05:30
Saqib	384f4b5b7e	fix: can't open general ledger from consolidated financial report (#25542)	2021-05-04 12:33:49 +05:30
Saqib	076020643d	fix: empty payment term column in accounts receivable report (#25556)	2021-05-04 12:26:49 +05:30
18alantom	308905b1be	fix: semgrep, refactor default mutable dict	2021-05-04 11:46:13 +05:30
18alantom	e36f303042	fix: use percent string templates for db.sql calls	2021-05-04 11:46:13 +05:30
barredterra	24e2cc9107	Merge branch 'develop' into datev_fixes	2021-05-03 18:19:28 +02:00
Suraj Shetty	ca37380d2e	Merge branch 'develop' of github.com:frappe/erpnext into develop	2021-05-03 19:44:22 +05:30
Rucha Mahabal	f1bdfac7a8	fix: Employee Separation (#25503) ... * fix: Employee Separation - add ignore_mandatory flag for project creation - form clean-up * fix: Employee Separation test	2021-05-03 18:37:00 +05:30
rohitwaghchaure	1f4df80565	Merge pull request #25531 from noahjacob/fix_mr_filter ... fix: updated item filters for material request	2021-05-03 18:36:25 +05:30
rohitwaghchaure	88734eea14	Merge pull request #25557 from rohitwaghchaure/increased-timeout-of-stoc-reco ... fix: stock reconciliation getting time out error during submission	2021-05-03 18:25:33 +05:30
Rohit Waghchaure	8f34ca4ac6	fix: stock reconciliation getting time out error during submission	2021-05-03 15:32:13 +05:30
Saqib	cdc99cdd49	fix(pos): incorrect expense account set in pos invoice (#25543)	2021-05-03 11:54:55 +05:30
rohitwaghchaure	9cc7c294e7	Update stock_reconciliation.py	2021-05-03 10:25:53 +05:30
Deepesh Garg	84ec295b43	Merge pull request #25546 from deepeshgarg007/loan_schedule_fixes ... fix: Minor fixes in loan	2021-05-02 22:35:34 +05:30
Rohit Waghchaure	6a5a380c07	fix: total stock summary report not working	2021-05-02 18:02:28 +05:30
Rohit Waghchaure	35d4829383	fix: serial no changed after saving stock reconciliation	2021-05-02 17:57:28 +05:30
rohitwaghchaure	5f177aaeaa	Merge pull request #25545 from rohitwaghchaure/fixed-depost-withdrwal-values-has-not-updated ... fix: rename field has not updated value of deposit and withdrawal fields	2021-05-02 17:54:22 +05:30
Deepesh Garg	c571141c1f	fix: Test cases	2021-05-02 15:31:04 +05:30
Deepesh Garg	824f089569	fix: Auto write off on loan closure	2021-05-01 22:07:13 +05:30
Deepesh Garg	1efafb3ce8	fix: Do not roundoff balance amount	2021-05-01 21:52:43 +05:30
Rohit Waghchaure	2fb573781d	fix: rename field has not updated value of deposit and withdrawal fields	2021-05-01 17:56:40 +05:30
Nabin Hait	0c7448fc41	fix: Fixed merge conflict	2021-05-01 14:54:22 +05:30
Nabin Hait	a2fcca85a5	fix: Fixed merge conflict	2021-05-01 14:53:13 +05:30
Nabin Hait	d8cd5a95cb	bumped to version 13.2.0	2021-05-01 15:12:44 +05:50
Nabin Hait	3c788f0325	chore: Add release note for v13.2.0	2021-05-01 14:42:30 +05:30
rohitwaghchaure	2e38f1514f	fix: stock ledger entry created against draft stock entry (#25539)	2021-05-01 13:53:46 +05:30
rohitwaghchaure	00ea336b52	fix: stock ledger entry created against draft stock entry (#25540)	2021-05-01 13:53:39 +05:30
Afshan	1fd1e2bb60	fix: fieldname when updating docfield property (#25517)	2021-04-30 18:41:26 +05:30
Afshan	5a4615fd4e	fix: allow to cancel loan with cancelled replayment entry (#25508)	2021-04-30 18:40:43 +05:30
Nabin Hait	a19c6a9278	fix: Fetch total stock at company in PO (#25533)	2021-04-30 18:38:49 +05:30
Nabin Hait	da0ba15cbf	fix: Fetch total stock at company in PO (#25532)	2021-04-30 18:38:41 +05:30
Raffael Meyer	07a081d8ac	Merge branch 'develop' into datev_fixes	2021-04-30 12:25:40 +02:00
noahjacob	a90c81626f	fix: updated item filters for material request	2021-04-30 15:49:36 +05:30
Deepesh Garg	88d40e8dc4	fix: Remove extra space	2021-04-30 15:33:33 +05:30
Deepesh Garg	1deef5229e	fix: Linting and translation issues	2021-04-30 15:20:55 +05:30
Deepesh Garg	bd5ee7d725	fix: Use party account currency	2021-04-30 15:20:45 +05:30
Deepesh Garg	9cbca06f4e	fix: Updated filters for process statement of accounts	2021-04-30 15:20:31 +05:30
Deepesh Garg	303f6d2d36	Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into psoa_fixes_v13_pre_release	2021-04-30 15:17:07 +05:30
Deepesh Garg	178938b2f0	fix: Ageing errors in PSOA	2021-04-30 15:14:24 +05:30
Deepesh Garg	c4231c72a6	Merge pull request #25524 from aerele/develop ... fix: List invoices in Payment Reconciliation Payment	2021-04-30 14:15:33 +05:30
noahjacob	c0352010d3	test: creating schedule and visit	2021-04-30 14:09:30 +05:30
Anuja P	435e93bda9	fix: allocated amount change wrt paid amount change	2021-04-30 13:52:48 +05:30
Deepesh Garg	8aa57953ee	Merge pull request #25490 from deepeshgarg007/psoa_fixes_v2 ... fix: Ageing errors in PSOA	2021-04-30 13:07:00 +05:30
Deepesh Garg	cd9fa61659	Merge pull request #25521 from ernestoruiz89/patch-4 ... fix: Make strings translatable	2021-04-30 12:58:26 +05:30
Deepesh Garg	26920b439a	Merge pull request #25394 from meike289/feature/check-field-subscription-invoice ... feat: new check field in subscriptions for (not) submitting invoices	2021-04-30 12:32:45 +05:30
noahjacob	7ad66caf7f	refactor: migrated calculation and validation logic in js to py	2021-04-30 11:43:38 +05:30
Deepesh Garg	0dc411951e	Merge pull request #25438 from nextchamp-saqib/round-off-diff-allowance ... fix: ignore fraction difference while making round off gl entry	2021-04-30 11:11:21 +05:30
Vignesh S	7783a56c08	fix: List invoices in Payment Reconciliation Payment ... Invoices are not listed in the Payment Reconciliation Payment table due to a typo in the code	2021-04-29 22:39:42 +05:30
Ernesto Ruiz	76e1e68cf4	fix: Make strings translatable ... Make strings translatable	2021-04-29 08:24:56 -06:00
Saqib Ansari	3e83542360	fix: sider issues	2021-04-29 18:12:47 +05:30
Saqib	2bde1baa38	fix: remove print statement	2021-04-29 18:12:42 +05:30
Saqib Ansari	6dd1c5cf92	refactor: remove extra fields	2021-04-29 18:12:36 +05:30
Saqib Ansari	3a5ecb7587	fix: test	2021-04-29 18:12:32 +05:30
Saqib Ansari	973afeac3c	feat: set dynamic labels for payment schedule fields	2021-04-29 18:12:27 +05:30
Saqib Ansari	a91eebf6aa	feat: base payment amount in payment schedule	2021-04-29 18:12:23 +05:30
Saqib Ansari	e70d9c925c	fix: payment amount showing in foreign currency	2021-04-29 18:12:17 +05:30
Anuja Pawar	07fb98b91d	Merge branch 'develop' into fix_PE_allocated_amt	2021-04-29 17:17:21 +05:30
Anuja P	dd1e7624bf	fix: changing paid amount should change allocated amount	2021-04-29 17:00:59 +05:30
Deepesh Garg	7bf25b4cef	Merge pull request #25292 from nextchamp-saqib/payment-term-amount-display-currency-fix ... fix: payment amount showing in foreign currency	2021-04-29 16:33:01 +05:30
Saqib Ansari	6fb417590f	fix: sider issues	2021-04-29 14:05:20 +05:30
noahjacob	90c667205a	test: added on_cancel test	2021-04-29 13:06:04 +05:30
noahjacob	93c22ebbb9	refactor: created separate function to update work_order on cancel	2021-04-29 12:57:41 +05:30
Deepesh Garg	3386d4948e	Merge pull request #25507 from AfshanKhan/fix-cancel-loan ... fix: allow to cancel loan with cancelled repayment entry	2021-04-29 12:31:52 +05:30
Saqib	83e3820575	fix: remove print statement	2021-04-29 12:21:56 +05:30
Noah Jacob	dc086dd52f	fix: item stock levels displaying inconsistently (#25506) ... * fix: fixed stock levels dashboard not displaying after any interactions * fix: minor translation fix	2021-04-29 11:03:27 +05:30
Afshan	ab052599c0	fix: allow to cancel loan with cancelled replayment entry	2021-04-28 20:21:04 +05:30
noahjacob	56f697052c	test: added test case for combining items	2021-04-28 20:12:33 +05:30
noahjacob	b7ca913904	fix: Added Item Reference field to link tables and update work_order_qty	2021-04-28 19:27:20 +05:30
Raffael Meyer	d75b4c37a3	Merge branch 'develop' into feature/check-field-subscription-invoice	2021-04-28 12:38:49 +02:00
Raffael Meyer	a949480acf	fix: add translation to make semgrep pass	2021-04-28 12:38:23 +02:00
Saqib Ansari	44b07e4ef5	refactor: remove extra fields	2021-04-28 15:11:57 +05:30
Saqib Ansari	da5b55c4f5	fix: test	2021-04-28 14:55:33 +05:30
Saqib Ansari	3f7ec95af8	Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix	2021-04-28 14:45:27 +05:30
Saqib Ansari	aa4f750d8c	fix: test	2021-04-28 14:42:49 +05:30
Saqib Ansari	3f53b87379	Merge branch 'develop' of https://github.com/frappe/erpnext into round-off-diff-allowance	2021-04-28 14:34:51 +05:30
noahjacob	82905166d9	fix: Fixed updating sales order work qty after cancelling work order	2021-04-28 10:14:36 +05:30
Nabin Hait	b7fea12cdf	Merge branch 'version-13' into develop	2021-04-27 20:08:01 +05:30
Nabin Hait	3e5c6424ed	bumped to version 13.1.1	2021-04-27 20:28:01 +05:50
Rucha Mahabal	a86a51f020	fix(HR): Permission error while adding weekly holidays (#25450)	2021-04-27 20:01:49 +05:30
Saqib	7b3dd3585b	fix: unexpected keyword argument 'merge_logs' (#25489) ... * fix: unexpected keyword arguement 'merge_logs' * fix: reference error * fix: test	2021-04-27 20:01:08 +05:30
Saqib	ad4365eb0e	fix: unexpected keyword argument 'merge_logs' (#25489) ... * fix: unexpected keyword arguement 'merge_logs' * fix: reference error * fix: test	2021-04-27 20:00:21 +05:30
Deepesh Garg	8a1e5e189c	fix: Ageing errors in PSOA	2021-04-27 16:57:34 +05:30
barredterra	5b9d3f15a2	docs: replace whitespace indent in docstring with tabs	2021-04-27 12:34:10 +02:00
Raffael Meyer	b2be91e731	Merge branch 'develop' into datev_fixes	2021-04-27 12:21:14 +02:00
rohitwaghchaure	b9078a0c86	Merge pull request #25126 from rohitwaghchaure/purchase-invoice-to-purchase-receipt-develop ... feat: purchase receipt creation from purchase invoice	2021-04-27 09:56:28 +05:30
Deepesh Garg	ebc6c51abe	Merge pull request #25384 from deepeshgarg007/psoa_fixes ... fix: Updated filters for process statement of accounts	2021-04-26 22:58:42 +05:30
Afshan	df06e49e0c	feat: enable custom field search on POS (#25421) ... * feat: multi lingual item search in POS * fix: limit the options for selection and broken down funtion for geting condition	2021-04-26 22:48:13 +05:30
Anurag Mishra	7f1b2de74d	feat: Employee Referral (#24997) ... * feat: Employee referal design and status sync * feat: create job Applicant and linked Document * feat: Added list view indicator * chore: formatted file * feat: Addedd Employee Referral form Dashboard * feat: pay compensation via additional salary * test: Employee Rreferral * Update erpnext/hr/doctype/employee_advance/employee_advance.js Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> * fix: changes requested * fix: changes requested * fix: sider * fix: translation * fix: test * feat: added to Dashboard * fix: changes * chore: clean-up Employee Referral form - fix labels - fix full name field - fix failing test - set title for Employee Referral form - set fields in List View and Standard Filter * feat: option to add a resume link - copy resume and resume link from Employee Referral to Job Applicant * fix: multiple fixes - confirm before rejecting employee referral - set primary actions for custom buttons - Validations for additional salary against employee referrals with status as accepted only - fix list view indicators - code formatting style * feat: Add field to track Referral Bonus Payment Status - fix visibility of additional salary button Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-26 22:23:48 +05:30
Saqib	b643776c53	feat(e-invoicing): auto calculate distance for e-way bill generations (#25480)	2021-04-26 17:12:20 +05:30
Rucha Mahabal	1608658700	Merge pull request #25209 from NagariaHussain/employee-util-report ... feat: Employee Hours Utilization Report	2021-04-26 17:04:35 +05:30
Saqib	34ce4edf29	fix: cannot scan spacebar character in pos (#25479)	2021-04-26 16:38:57 +05:30
Rucha Mahabal	d5ca9474ce	fix: add employee name in report data	2021-04-26 16:10:06 +05:30
Rucha Mahabal	926a9aed58	Merge branch 'develop' into employee-util-report	2021-04-26 16:03:39 +05:30
Rucha Mahabal	7a84d76489	fix: tests	2021-04-26 16:03:10 +05:30
noahjacob	1e912db3bb	feat: Added check box to combine items	2021-04-26 16:01:17 +05:30
Ankush Menat	9178d95cca	fix: can not create item variants (#25433) ... * fix: item_code assigned to function returning None * fix: ignore has_variants and attributes in variant * fix: patch to remove has_variants and attributes * chore: fix whitespace in translation	2021-04-26 15:37:17 +05:30
Jannat Patel	616f1d3624	fix: issue in project custom status (#25452)	2021-04-26 15:35:49 +05:30
Sagar Vora	71342320ce	fix(Italy): multiple fixes in import supplier invoice (#25466) ... * fix(Italy): remove incorrect method, use defined variable * fix: show attach section after save; use db_set	2021-04-26 15:32:28 +05:30
Deepesh Garg	4c8d15b487	fix: Incorrect GL Entry validation (#25474) ... * fix: Incorrect GL Entry validation * fix: Add validation for party accounts * fix: Scrub labels * fix: Translation	2021-04-26 15:24:34 +05:30
Deepesh Garg	ab7664e595	Merge pull request #25444 from deepeshgarg007/gstr_backward_compatiability ... fix: Backward compatibility for GSTR-1 report	2021-04-26 15:09:55 +05:30
Deepesh Garg	0b9aa58b81	Merge branch 'develop' of https://github.com/frappe/erpnext into psoa_fixes	2021-04-26 14:51:20 +05:30
Deepesh Garg	968ec110f3	fix: Linting and translation issues	2021-04-26 14:51:00 +05:30
Rucha Mahabal	4716ebea5a	feat: Add % Utilization (Billed Only) ... - Added billed utilization metric in report summary	2021-04-26 11:40:26 +05:30
Anuja Pawar	fee9a56d4e	Merge branch 'develop' into fix_allocated_amt_in_PE	2021-04-26 11:36:10 +05:30
Anuja P	802518b8ac	Merge branch 'fix_allocated_amt_in_PE' of https://github.com/Anuja-pawar/erpnext into fix_allocated_amt_in_PE	2021-04-26 11:34:33 +05:30
Anuja P	f74d8d2e16	fix: suggested changes	2021-04-26 11:31:51 +05:30
Rucha Mahabal	2a1a472371	chore: clean-up ... - set default date filters for last month instead of year - added abbreviations for columns to use them in the metrics labels	2021-04-26 11:18:32 +05:30
Shadrak Gurupnor	b9d4719285	fix: circular loop in project task (#25454) ... * fix: circular loop in project task	2021-04-26 11:14:07 +05:30
Rucha Mahabal	0decc2b66a	fix: validate Standard Working Hours ... - use standard working hours in metrics calculation	2021-04-26 11:00:54 +05:30
Rucha Mahabal	b7a7e1b11a	Merge branch 'develop' into employee-util-report	2021-04-26 10:25:42 +05:30
Rucha Mahabal	e939da982e	Merge branch 'develop' into profitability-report	2021-04-26 09:17:12 +05:30
Rucha Mahabal	2a25c7505e	fix: report column widths	2021-04-25 20:29:14 +05:30
Walstan Baptista	4a805b5622	chore: frappe.whitelist for doc methods (#25465)	2021-04-24 14:23:08 +05:30
Anuja Pawar	dc215ec08d	Merge branch 'develop' into fix_allocated_amt_in_PE	2021-04-23 22:06:15 +05:30
Rucha Mahabal	e63f3b2f36	fix: standard working hours message and link for HR Settings	2021-04-23 20:33:42 +05:30
Rucha Mahabal	184317d5bd	fix(HR): Permission error while adding weekly holidays (#25450)	2021-04-23 20:03:50 +05:30
Anuja P	dc599e0164	fix: to update Allocated amount after Paid Amount is changed	2021-04-23 19:24:53 +05:30
Saqib Ansari	c5c9f9a941	feat: set dynamic labels for payment schedule fields	2021-04-23 15:34:58 +05:30
Saqib Ansari	d552fe6778	feat: base payment amount in payment schedule	2021-04-23 14:46:52 +05:30
Suraj Shetty	52ea6b126b	Revert "fix: email digest user not found" ... This reverts commit 188657d05a.	2021-04-23 14:14:47 +05:30
Saqib Ansari	242242c43f	Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix	2021-04-23 13:54:13 +05:30
meike289	8787ebf83d	Apply suggestions from code review ... Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-04-23 08:06:29 +02:00
Anoop	c21ce42559	fix(patch): lab module patch fix (#25447) ... * fix(patch): lab module patch fix * fix: param Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-22 22:44:44 +05:30
Deepesh Garg	eed60bf035	fix: Backward compatibility for GSTR-1 report	2021-04-22 17:11:22 +05:30
pateljannat	84ef7419da	fix: sider	2021-04-22 16:31:16 +05:30
Saqib	3d4acf9e5c	fix: permission error after submitting exchange rate revaluation (#25432)	2021-04-22 16:16:03 +05:30
Rucha Mahabal	e3b8057eb4	fix: Laboratory Module patch (#25431)	2021-04-22 16:11:17 +05:30
pateljannat	2004fec8eb	fix: removed multicurrency	2021-04-22 14:52:36 +05:30
Saqib	19b73968d7	fix(pos): validations & minor ui issues (#25351) ... * fix: pos print format * fix: stock validation on pos invoice creation	2021-04-22 13:38:20 +05:30
Saqib Ansari	b0e160ff78	fix: ignore fraction difference while making round off gl entry	2021-04-22 13:23:50 +05:30
pateljannat	ba6ad7f5be	fix: escape for format and msg for working hours if not set	2021-04-22 11:19:44 +05:30
Mohammad Hasnain Mohsin Rajan	7f932cfb30	fix: display reconcile tool when closing balance 0 (#25417) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-04-22 04:53:09 +05:30
Alan	157b388209	fix: change subcontracted item display (#25425)	2021-04-21 21:00:22 +05:30
Ernesto Ruiz	090177494d	fix: Make strings translatable ... Make strings translatable	2021-04-21 09:04:06 -06:00
Deepesh Garg	e5e20c50a9	Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop	2021-04-21 19:09:41 +05:30
pateljannat	485464d1f4	fix: added back a hook	2021-04-21 18:04:58 +05:30
Afshan	6d3305c446	fix: added total column	2021-04-21 15:34:58 +05:30
Afshan	48b2fc9b12	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-21 15:21:02 +05:30
Nabin Hait	29d4ac13ac	Merge branch 'version-13' into develop	2021-04-21 12:34:49 +05:30
Nabin Hait	c3b7c1b998	bumped to version 13.1.0	2021-04-21 12:54:49 +05:50
pateljannat	a92560d79f	Merge branch 'profitability-report' of https://github.com/pateljannat/erpnext into profitability-report	2021-04-21 12:32:31 +05:30
pateljannat	039a5a829d	fix: dynamic values for tests	2021-04-21 12:32:25 +05:30
noahjacob	fa9629c1e1	fix: Updated forms and fixed an error.	2021-04-21 11:29:40 +05:30
Nabin Hait	cb92ead061	fix: Added Change Log	2021-04-21 11:22:35 +05:30
Jannat Patel	d106db60ad	Merge branch 'develop' into profitability-report	2021-04-21 09:10:49 +05:30
Ernesto Ruiz	66250351d2	fix: Add transtlation function to strings ... Add transtlation function to strings	2021-04-20 14:35:14 -06:00
Raffael Meyer	48cd4de0d2	Merge branch 'develop' into feature/check-field-subscription-invoice	2021-04-20 16:15:01 +02:00
Deepesh Garg	6d88cf9ede	Merge branch 'develop' into loan_manager_amend	2021-04-20 19:08:31 +05:30
pateljannat	cbdcfb4873	fix: multicurrency	2021-04-20 17:53:41 +05:30
Syed Mujeer Hashmi	704ec132b7	feat:Inpatient Occupancy Table Editable for Healthcare Admin (#24989) ... Make Admitted datetime and Discharge Datetime editable along with Inaptient Occupancy Service Unit, Check_In and Check_out time. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-20 16:39:46 +05:30
noahjacob	57f487a16b	fix: Updated serial_no filters in maintenance visit.	2021-04-20 13:51:34 +05:30
Marica	0278646fd8	fix: Cashier query in POS Opening/Closing Entry (#25399)	2021-04-20 12:53:33 +05:30
Marica	125c3d64a9	fix: Cashier query in POS Opening/Closing Entry (#25398)	2021-04-20 12:53:22 +05:30
Afshan	de69a1186c	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-20 11:43:28 +05:30
Marica	b91fcbd70e	fix: Ignore Customer Group Perm on AlL Products page (#25396)	2021-04-19 22:21:07 +05:30
Marica	846200d069	fix: Ignore Customer Group Perm on AlL Products page (#25397)	2021-04-19 22:20:01 +05:30
Rucha Mahabal	c221682373	fix: Bulk Salary Structure Assignment (#25389)	2021-04-19 21:11:27 +05:30
Rucha Mahabal	923fb008c7	fix: remove non-standard module cards from Home Workspace (#25391)	2021-04-19 21:09:47 +05:30
Raffael Meyer	4a1159408a	Merge branch 'develop' into feature/check-field-subscription-invoice	2021-04-19 16:40:35 +02:00
Meike Nedwidek	ebbcc90d89	✨ add check field for subscription invoices if they should be submitted automatically	2021-04-19 15:28:37 +02:00
noahjacob	5d7d338d2a	feat: Schedule status is now updated on submitting a visit.	2021-04-19 18:39:34 +05:30
Deepesh Garg	047044f975	fix: Add amend perm for loan and system manager for loan doctypes	2021-04-19 18:27:37 +05:30
Deepesh Garg	135b852cf0	fix: Use party account currency	2021-04-19 17:27:26 +05:30
pateljannat	73896ce94c	fix: conflicts	2021-04-19 16:50:39 +05:30
pateljannat	3b54b1e975	fix: report name and columns	2021-04-19 16:49:28 +05:30
noahjacob	9a0a561ec6	feat: Created Dialog Box on trying to create a maintenance visit.	2021-04-19 16:42:50 +05:30
Rucha Mahabal	5d7f7094d6	Merge branch 'develop' into employee-util-report	2021-04-19 16:24:55 +05:30
Hussain Nagaria	1f8326bb1f	chore: Add Report to Dashboard	2021-04-19 16:19:13 +05:30
Afshan	0e949adea5	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-19 14:04:49 +05:30
Nabin Hait	840c921229	Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop	2021-04-19 13:30:19 +05:30
Deepesh Garg	cb718fce88	feat: Role to allow over billing, delivery, receipt (#24854) ... * feat: Role to allow over billing, delivery, receipt * fix: Typo	2021-04-19 13:25:15 +05:30
Rakshith N	ceba5774be	fix(pos): special character scanning in point of sale (#25353) ... Co-authored-by: rakshith.n <rakshith.n@promantia.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-04-19 13:21:49 +05:30
Afshan	632166a933	fix: make filters for payroll entry (#25386)	2021-04-19 12:58:27 +05:30
Ankush Menat	edf3dfa5a4	fix: commit leave_allocation change to db (#25382) (#25383)	2021-04-19 12:47:41 +05:30
Jannat Patel	119b27b97f	feat: Delayed Tasks Summary (#25024) ... * feat: delayed deliverables summary * fix: sider * fix: renamed to delayed tasks * fix: renamed test * fix: test * fix: sider * fix: dates, validations and chart * fix: space and column width * feat: Sort tasks by descending order of delay Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-19 12:46:14 +05:30
Alan	ac8a467b0a	fix: exclude spurious Stock Entry Types from 'consumed' calculation (#25352) ... * fix: exclude spurious 'Stock Entry Type's from 'consumed' calculation * fix: filter using purpose, make requested changes Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-04-19 12:38:25 +05:30
Deepesh Garg	bb746fcbe4	fix: Updated filters for process statement of accounts	2021-04-19 12:19:31 +05:30
Ankush Menat	6c88ab07c7	fix: commit leave_allocation change to db (#25382)	2021-04-19 11:51:46 +05:30
Afshan	b6d2106184	fix: available employee for selection (#25378) ... * fix: available employee for selection * fix: available employee for selection fix: available employee for selection	2021-04-19 11:48:43 +05:30
Afshan	9c9907cf8e	fix: available employee for selection (#25377) ... * fix: available employee for selection * fix: available employee for selection fix: available employee for selection	2021-04-19 11:48:28 +05:30
Marica	e8bc912ffc	perf: Fetching exchange rate on every line item slows down PO (#25345) ... * fix: Dont fetch exchange rates for each line item once fetched at parent ` * perf: Use price list conversion rate from parent - If price list conversion rate exists in args already from earlier call, use that - `get_price_list_currency_and_exchange_rate` wont be called for each child row Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-19 11:05:21 +05:30
Jannat Patel	dcdd3bebbe	feat: Timer in LMS Quiz (#24246) ... * feat: new fields in quiz doctypes * feat: timer in lms quiz * fix: variable initialisation * fix: context, exception fix * fix:sider * fix:sider * fix: indentation * fix: timer * fix: sider * fix: return value and format * fix: show time taken only after all attempts are over * fix: sider Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-04-19 10:36:40 +05:30
Ankush Menat	7eac4a250d	fix: functions using mutable defaults (#25370)	2021-04-19 10:33:39 +05:30
Saqib	e782531529	fix: Apply single transaction threshold on net_total instead of supplier credit amount (#25243) ... * fix: Apply single transaction threshold on net_total instead of supplier credit amount * fix: Apply single transaction threshold on net_total instead of supplier credit amount * fix: test Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-19 10:15:51 +05:30
Raffael Meyer	9ee6e4feb8	Merge branch 'develop' into improve_taxes_setup	2021-04-18 18:34:41 +02:00
barredterra	80d44cada4	fix: remove is_default from country wise tax	2021-04-18 18:33:34 +02:00
Ankush Menat	e972ceb798	fix: patch for updating shipment status	2021-04-18 13:22:19 +05:30
Ankush Menat	9229ee1745	fix: update shipment status in database ... Caught by semgrep rule: https://github.com/frappe/erpnext/blob/develop/.github/helper/semgrep_rules/frappe_correctness.yml#L4	2021-04-18 13:22:19 +05:30
barredterra	476fff149b	Merge branch 'develop' into improve_taxes_setup	2021-04-17 18:41:31 +02:00
Ankush Menat	ad6a2657ae	chore: minor translation fixes	2021-04-17 16:56:09 +05:30
Ankush Menat	dedf2c1b61	fix: remove duplicate keys from dictionaries	2021-04-17 16:56:08 +05:30
Saqib	75e13f7bb6	fix(e-invoicing): add company validation for e-invoicing (#25348) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-17 15:38:47 +05:30
Saqib	18c7815a1b	fix: presentation currency in statement of accounts (#25367)	2021-04-17 15:37:40 +05:30
rohitwaghchaure	fbc0d16d8b	Merge pull request #25372 from ankush/eq_assignment_fix ... fix: equality check instead of assignment in cart	2021-04-17 13:43:54 +05:30
rohitwaghchaure	1254af502b	Merge pull request #25362 from anupamvs/disable_rounded_total ... feat: added Disable Rounded Total in sales transactions	2021-04-17 13:30:24 +05:30
Ankush Menat	d6be154ac2	fix: implicit string concatenation (#25371) ... * fix: implicit string concatenations * chore: rerun healthcare patch for company fields	2021-04-16 22:08:44 +05:30
Ankush Menat	adf974810d	fix: equality check instead of assignment in cart	2021-04-16 21:15:50 +05:30
Saqib	36247faf1a	fix(e-invoicing): add company validation for e-invoicing (#25349) ... * fix(e-invoicing): add company validation for e-invoicing * fix: test	2021-04-16 18:45:19 +05:30
Nabin Hait	eeece59a17	Merge branch 'develop' into disable_rounded_total	2021-04-16 18:44:17 +05:30
Marica	ede339f80b	fix: Serial No not updated correctly via Inter Company Stock Transfer (#25006) ... * fix: Serial No not updated correctly via Inter Company Stock Transfer * chore: Added More Test Cases for inter company Serial Transfer * fix: Test for serial no duplication - fixed serial no test - made errors more meaningful on serial no validation * fix: Stock Reco Test Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-04-16 18:42:54 +05:30
noahjacob	5ebc6abfad	feat: Sales Person field is now editable after submitting.	2021-04-16 16:59:10 +05:30
Jannat Patel	b1aad63a99	fix: leave policy in leave allocation (#25334) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-16 16:08:22 +05:30
Raffael Meyer	6daae681bd	Merge branch 'develop' into datev_fixes	2021-04-16 12:37:14 +02:00
noahjacob	e6fd3b86bd	fix: fixed sider issues and translation syntax.	2021-04-16 15:48:36 +05:30
Hussain Nagaria	2399e84052	Merge branch 'employee-util-report' of https://github.com/NagariaHussain/erpnext into employee-util-report	2021-04-16 15:41:25 +05:30
Hussain Nagaria	f1b4ce7430	feat: Add filtering by department ... Also: - Add department filter to js - Add department column to report - Fetch only those timesheets which have an Employee Linked - Update unit tests	2021-04-16 15:36:43 +05:30
Anupam	9d9c256e70	feat: added Disable Rounded Total in sales transactions	2021-04-16 00:11:40 +05:30
Afshan	4b496b65b7	fix: filter for employees in salary slip (#25361)	2021-04-15 23:53:12 +05:30
Afshan	c0db286dc1	fix: filter for employees in salary slip (#25360)	2021-04-15 23:48:25 +05:30