brotherton-erpnext

Author	SHA1	Message	Date
rohitwaghchaure	e9f6c8cdb1	fix: validation message of quality inspection in purchase receipt (#25667 )	2021-05-14 12:34:13 +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
casesolved-co-uk	6ab46e288f	fix: workspace formatting due to manual edit and filter tweaks	2021-05-13 12:56:02 +00:00
casesolved-co-uk	d5256b60d4	fix: lint	2021-05-13 12:53:11 +00:00
casesolved-co-uk	6998786055	fix: use correct fiscal year function in testing	2021-05-13 12:53:11 +00:00
casesolved-co-uk	cf5b57bfac	fix: only load data for tests that need it	2021-05-13 12:53:11 +00:00
casesolved-co-uk	68a31d3d0d	fix: fiscal year error	2021-05-13 12:53:11 +00:00
casesolved-co-uk	75ebfbdaf3	fix: fiscal year test case issue	2021-05-13 12:53:11 +00:00
casesolved-co-uk	89fcdf3226	fix: exclude rounding GL Entries from invoice tax lines	2021-05-13 12:53:11 +00:00
casesolved-co-uk	06e31e5d7d	fix: Test data for empty db	2021-05-13 12:53:11 +00:00
casesolved-co-uk	391dc45964	chore: fix sider	2021-05-13 12:53:11 +00:00
casesolved-co-uk	7555f5f613	fix: add to workspace and fix lint	2021-05-13 12:53:11 +00:00
casesolved-co-uk	77ffa6b1f6	feat: add test case for report output	2021-05-13 12:53:11 +00:00
casesolved-co-uk	2cb0da8780	fix: rewrite to allow referring to existing sections and reduce to single amount column	2021-05-13 12:53:10 +00:00
casesolved-co-uk	1c37390899	fix: Change & simplify query to cater for zero rate tax entries	2021-05-13 12:53:10 +00:00
casesolved-co-uk	442a0de094	fix: finalise query, fix bugs, put Add Columns back	2021-05-13 12:53:10 +00:00
casesolved-co-uk	ece00287ea	Refactor for Journal Entries (payroll)	2021-05-13 12:53:10 +00:00
casesolved-co-uk	3027cc7da6	fix: minor bug and tidy	2021-05-13 12:53:10 +00:00
casesolved-co-uk	5d9217ab29	fix: minor bugs and improvements	2021-05-13 12:53:10 +00:00
casesolved-co-uk	8e413651c2	fix: major refactor to monkey-patch into the QueryReport class	2021-05-13 12:53:10 +00:00
casesolved-co-uk	dba4b3cd13	feat: add run mode, add tests, various fixes	2021-05-13 12:53:10 +00:00
Richard Case	ef8ab135c9	develop: progress tax detail report	2021-05-13 12:53:10 +00:00
casesolved-co-uk	a5d47f70b8	Fleshed out report setup functionality	2021-05-13 12:53:10 +00:00
casesolved-co-uk	3503598735	Initial commit of Tax Detail report and report builder	2021-05-13 12:53:10 +00:00
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	0048418c46	Merge pull request #25703 from rohitwaghchaure/change-today-to-now-for-reposting-pre fix: change today to now to get data for reposting	2021-05-13 17:44:27 +05:30
rohitwaghchaure	fc44478810	Update repost_item_valuation.py	2021-05-13 17:42:33 +05:30
Rohit Waghchaure	a0a88a710e	fix: change today to now to get data for reposting	2021-05-13 17:42:06 +05:30
casesolved-co-uk	aca8c34c4d	fix: filter for Indian workspace card	2021-05-13 12:11:41 +00:00
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
Mohammad Hasnain Mohsin Rajan	7c6de1a8ac	fix: bank statement import via google sheet (#25677 ) * fix: change links in workspace * fix: google sheet bank statement import * chore: quotes * fix: capitalization * fix: typo * chore: add translation	2021-05-13 17:28:49 +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
Anuja Pawar	b28889c6f7	Merge branch 'develop' into fix_process_statement_report	2021-05-13 16:23:06 +05:30
Rohit Waghchaure	27f50d5852	fix: timeout error while loading warehouse tree	2021-05-13 15:54:35 +05:30
Suraj Shetty	14ca9ce1b7	Merge pull request #25635 from surajshetty3416/parallel-distributed-testing	2021-05-13 15:41:13 +05:30
Deepesh Garg	8e748f8451	fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet	2021-05-13 15:21:51 +05:30
Anuja P	e90a2a346b	fix: update new changes	2021-05-13 15:15:47 +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
Anuja P	554c91d638	fix: solved conflicts	2021-05-13 14:48:38 +05:30
Anuja P	ab1ae418cc	fix: Process SOA enhancement	2021-05-13 14:26:27 +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
Prssanna Desai	0eb3a38c9d	fix: quiz evalutation issue (#25671 )	2021-05-13 12:17:28 +05:30
David Angulo	c55aa295fc	fix: Translate weekday when getting weekly off dates (#25691 )	2021-05-13 12:16:04 +05:30
rohitwaghchaure	c29c6ff9a7	Merge pull request #25692 from rohitwaghchaure/fixed-woocommerce-order-sync-issue-pre fix: Woocommerce order sync issue	2021-05-12 23:09:33 +05:30
Rohit Waghchaure	fe68a0ff80	fix: Woocommerce order sync issue	2021-05-12 23:08:16 +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
Suraj Shetty	75909f061c	Merge branch 'develop' into parallel-distributed-testing	2021-05-12 18:14:49 +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
Afshan	6578c045ca	fix: Dialog variable assignment after definition in POS (#25680 )	2021-05-12 17:41:50 +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
rohitwaghchaure	4ec0656f64	Merge pull request #25678 from rohitwaghchaure/fixed-new-fields-not-added-pre fix: updated modified time in purchase invoice to pull new fields	2021-05-12 16:39:35 +05:30
Rohit Waghchaure	aaca8335f0	fix: updated modified time to pull new fields	2021-05-12 16:36:25 +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
Mohammad Hasnain Mohsin Rajan	dd1822ef58	fix: change links in workspace (#25673 )	2021-05-12 13:01:53 +05:30
Mohammad Hasnain Mohsin Rajan	af8436d0dc	fix: change links in workspace (#25670 )	2021-05-12 13:01:03 +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
Nabin Hait	e38192cb6d	fix: merge conflict	2021-05-11 11:15:09 +05:30
Suraj Shetty	b76ebb3f4b	fix: Use frappe.safe_eval instead of eval	2021-05-11 10:59:16 +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
Suraj Shetty	b3fadebb41	style: Fix sider issues	2021-05-10 20:49:07 +05:30
Suraj Shetty	a13c453c69	test: Fix a case where test used to fail due to holiday list - fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error	2021-05-10 20:33:47 +05:30
Suraj Shetty	404e7d07c5	test: Fix permission error	2021-05-10 18:39:09 +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
Suraj Shetty	018ccc2b6d	test: Fix test name - Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred	2021-05-10 18:01:53 +05:30
Suraj Shetty	4d6d5f4d89	test: Fix valuation rate for raw materials	2021-05-10 17:37:44 +05:30
Suraj Shetty	a132de42ca	fix: allow_zero_valuation_rate for rejected qty	2021-05-10 17:25:21 +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
Suraj Shetty	ec6b652cd4	refactor: Rename assertEquals to assertEqual to avoid deprecation warnings	2021-05-10 09:18:25 +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
Suraj Shetty	2ac27d774d	test: Fix test dependency	2021-05-09 14:38:28 +05:30
Suraj Shetty	142ec9e99e	test: Pass ConflictingTaxRule during tax rule test	2021-05-08 19:03:53 +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
Suraj Shetty	80aa8a3149	Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing	2021-05-08 11:28:27 +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
Faris Ansari	f97cc0367b	fix: initialize filters in constructor	2021-05-07 15:32:06 +05:30
Faris Ansari	69eb6d476e	Merge remote-tracking branch 'upstream/develop' into esbuild	2021-05-07 15:21:33 +05:30
Faris Ansari	464d838447	fix: Update bundle paths	2021-05-07 14:53:42 +05:30
Faris Ansari	ff3b71d2e7	fix: Make css bundles	2021-05-07 14:52:13 +05:30
Faris Ansari	f751738267	fix: Make js bundles	2021-05-07 14:51:05 +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
Syed Mujeer Hashmi	bcf3f3dd29	fix: Monthly Attendance Sheet Summarized view (#24976 ) * fix: Monthly Attendance Sheet Summarized view This fixes the count of different leave types in the monthly attendance sheet summarized view. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: Avoid using raw sql query Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2021-05-07 13:34:21 +05:30
HENRY Florian	3ecd7ac4c7	fix: Add french chart accounts with account number (#25009 ) * fix: Add french chart accounts with account number * fix actual franch plan	2021-05-07 13:33:12 +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
Shariq Ansari	ad3edc83ec	fix: Render timesheet template on timer field (#25565 ) * fix: Render timesheet template on timer field * fix: sider fix	2021-05-07 12:25:40 +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
Nikhil Ponnuru	ef9f126cb2	fix: change get_all to get_list in employee leave balance summary report to hide descendants when hide descendants is selected in user permissions (#25599 ) Co-authored-by: nikhilponnuru <nikhil.kp@zerodha.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-05-07 10:06:29 +05:30
Noah Jacob	4ecae62194	fix: added is_stock_item filter (#25530 )	2021-05-06 19:42:01 +05:30
Nabin Hait	7481f54e0c	Merge branch 'version-13' into develop	2021-05-06 19:18:18 +05:30
Nabin Hait	ae18efaa0a	bumped to version 13.2.1	2021-05-06 19:38:17 +05:50
Nabin Hait	0e41295c0e	perf: Performance enhancement on setup wizard (#25606 ) * perf: Performance enhancement on setup wizard * fix: create departments without updating nsm	2021-05-06 19:14:06 +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
Suraj Shetty	c702408f99	chore: Remove unnecessary print statements	2021-05-06 18:37:45 +05:30
Suraj Shetty	bdf8c528f1	test: Fix dependencies	2021-05-06 18:37:14 +05:30
Rohit Waghchaure	695becdd05	fix: added validation in stock entry to check duplicate serial nos	2021-05-06 18:03:32 +05:30
Anurag Mishra	80c5c866db	Revert "fix: default value for Templates (#25591 )" (#25608 ) This reverts commit `60f3e9ee29`.	2021-05-06 17:45:58 +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
Suraj Shetty	c5430afe2d	test: Fix test_dependencies	2021-05-06 17:44:26 +05:30
Saqib	92cefd5655	feat(pos): ability to retry on pos closing failure (#25604 ) * 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:03:16 +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
Deepesh Garg	daf6c124a9	fix: Check if payment schedule exists	2021-05-06 16:47:02 +05:30
Deepesh Garg	be66ee9723	fix: Check if payment schedule exits before updating label	2021-05-06 16:46:55 +05:30
Deepesh Garg	a0ed517c85	fix: function call to update payment schedule labels	2021-05-06 16:46: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
Suraj Shetty	c981969446	test: Fix dependency	2021-05-06 13:04:12 +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
Anurag Mishra	60f3e9ee29	fix: default value for Templates (#25591 )	2021-05-05 13:23:42 +05:30
Anurag Mishra	ca9599da51	Merge branch 'develop' into Employee-Referrals-ui-fix	2021-05-05 12:57:17 +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
Rohit Waghchaure	c432766a70	fix: stock reconciliation getting time out error during submission	2021-05-05 10:16:21 +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
Hendy Irawan	05f9df6c10	fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled) Fixed #25572 Period Closing Voucher incorrect journal entry amount for Income/Expenses Accounts containing canceled transactions.	2021-05-04 13:32:16 +00:00
Anurag Mishra	16da87a307	fix: created new section for deatils	2021-05-04 17:05:42 +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
Faris Ansari	1fe891b287	refactor: Replace Class.extend with native class	2021-04-23 08:04:00 +05:30
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
Ankush Menat	5207edc188	Merge branch 'develop' into fix_shipment_pickup_to	2021-04-15 21:01:52 +05:30
18alantom	6179cc1311	fix: make pickup_to and pickup_from mandatory fields	2021-04-15 20:36:28 +05:30
18alantom	597bb8be18	fix: remove pickup_to, pickup_from and get_pickup_time relies on server-side validation instead js controller	2021-04-15 20:32:45 +05:30
noahjacob	2c802720c3	feat: Automated setting end_date based on periodicity, no of visits and improved ux.	2021-04-15 20:31:18 +05:30
Rucha Mahabal	56c428663f	fix: Additional Salary component amount not getting set (#25356 )	2021-04-15 18:54:38 +05:30
Rucha Mahabal	39b1cd827a	fix: Additional Salary component amount not getting set (#25355 )	2021-04-15 18:54:29 +05:30
Afshan	2da6ab7f2a	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-15 18:07:04 +05:30
noahjacob	1ac471e04f	feat: generate schedule is also triggered on save.	2021-04-15 16:48:01 +05:30
rohitwaghchaure	72929aab38	Merge pull request #24878 from anupamvs/planning feat: add total available stock field in PO	2021-04-15 16:28:49 +05:30
Sun Howwrongbum	c50fbc6897	fix: list lookup with undefined variable (#25210 ) Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-04-15 14:52:13 +05:30
rohitwaghchaure	640b5e00ce	Merge pull request #25152 from ankush/customer_duplicates fix: disable auto naming of customer during import	2021-04-15 14:46:11 +05:30
rohitwaghchaure	1bdc457777	Merge pull request #25304 from ankush/fix_sl_rounding fix(stock_ledger): round off values near to zero	2021-04-15 14:44:09 +05:30
Saqib	593071bd53	fix: currency symbol in bank transaction list view (#25336 )	2021-04-15 14:12:11 +05:30
Anupam Kumar	ee0dda6ba5	Merge branch 'develop' into planning	2021-04-15 12:48:25 +05:30
Marica	4e25aa77dd	Merge branch 'develop' into dev-quality-inspection-accounts	2021-04-14 19:06:14 +05:30
Marica	f045fde9f4	Merge branch 'develop' into patch-8	2021-04-14 18:56:15 +05:30
Marica	24e45163d5	fix: Sider	2021-04-14 18:53:15 +05:30
Ganga Manoj	c4565651ff	fix: Let Administrator delete company transactions (#25300 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-14 17:11:36 +05:30
Saqib	b54cc7c7f5	fix: pos print receipt (#25330 )	2021-04-14 15:09:11 +05:30
Saqib	8798f30808	fix: pos print receipt (#25328 )	2021-04-14 15:05:33 +05:30
Rohan Bansal	03f711e3a2	style: sider issues	2021-04-14 14:41:55 +05:30
rohitwaghchaure	ac6facda3d	Merge pull request #25186 from rohitwaghchaure/fixed-incorrect-batch-selected-in-purchase-rceipt-develop fix: incorrect batch picked in subcontracted purchase receipt	2021-04-14 14:35:12 +05:30
Rohan Bansal	7f8b95efe8	fix: move QI logic to stock module	2021-04-14 14:15:45 +05:30
Nabin Hait	2535fe9b1e	fix: Resolved merge conflict	2021-04-14 13:09:50 +05:30
Nabin Hait	88b3c52533	bumped to version 13.0.2	2021-04-14 13:13:53 +05:50
Nabin Hait	ece4c16d8f	chore: Added change log	2021-04-14 12:53:25 +05:30
rohitwaghchaure	3f6ba12344	Merge pull request #24408 from rohitwaghchaure/custom-user-type-feat feat: Employee Self Service	2021-04-14 11:54:25 +05:30
Nabin Hait	1bc65ddbe4	Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop	2021-04-14 11:23:34 +05:30
Nabin Hait	5931931c93	Merge branch 'develop' into customer_duplicates	2021-04-14 11:23:12 +05:30
Nabin Hait	f7441c4c0a	Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop	2021-04-14 11:23:00 +05:30
Nabin Hait	b7b35734a7	Merge branch 'develop' into employee-util-report	2021-04-14 11:22:51 +05:30
Deepesh Garg	e2dc102bc6	fix: Zero amount completed delivery notes being shown in Sales Invocie get items (#25317 )	2021-04-14 11:21:11 +05:30
Deepesh Garg	b67058869a	fix: Round off final tax amount instead of current tax amount (#25188 ) * fix: Round off final tax amount instead of current tax amount * fix: Syntax error * fix: Indentation * fix: Round Off taxes order execution Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-14 11:20:27 +05:30
Deepesh Garg	b717420842	fix: Role to override maintain same rate check in transactions (#25193 ) * feat: configurable action if the same purchase/selling rate is not maintained * fix: Role to override maintain same rate check in transactions Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-14 10:43:45 +05:30
Nabin Hait	dd02b5abf1	Merge branch 'develop' into fix_sl_rounding	2021-04-14 10:36:40 +05:30
rohitwaghchaure	ce6c3b5b74	fix: incorrect incoming rate for the sales return (#25306 )	2021-04-13 20:55:52 +05:30
Afshan	82ebc47ba1	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-13 19:38:04 +05:30
Rohit Waghchaure	a8f78fabfd	fix: patch failing while migrating from v7 to v13	2021-04-13 18:51:21 +05:30
Rohit Waghchaure	610ccd4c03	fix: modified permission	2021-04-13 18:51:21 +05:30
Rohit Waghchaure	03635fb0c4	feat: ESS User	2021-04-13 18:51:21 +05:30
Saqib	dbb76a7d00	fix(e-invoicing): validations & tax calculation fixes (#25314 ) * fix: GST on freight charge in e-invoicing * feat(india): bulk e-invoice generation (#24969) * fix: cannot fetch e invoice settings * fix: patch condition (#25301) * fix: patch condition * fix: except einvoice loading error seperately * fix: json.loads error Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-04-13 18:49:03 +05:30
Deepesh Garg	ca412d37c8	Merge pull request #25290 from deepeshgarg007/gstr_1_taxable_value_update fix: Taxable value including Freight and Forwarding charges in GSTR-1 Report	2021-04-13 17:49:56 +05:30
Nabin Hait	10c61376e3	fix: Backport missing commits to develop branch (#25305 )	2021-04-13 15:46:01 +05:30
Marica	1f9d231acf	Merge branch 'develop' into patch-8	2021-04-13 15:43:46 +05:30
Deepesh Garg	2fe3056fa2	Merge pull request #24993 from frappe/ishanloya-regional Correct state code for 'Other Territory'	2021-04-13 15:37:29 +05:30
Deepesh Garg	9aad73b9f0	Merge pull request #25195 from ankush/use_isinstance_instead_of_type fix: broken type check in stock ageing report	2021-04-13 15:24:53 +05:30
Deepesh Garg	0dcb48a6ee	Merge pull request #25167 from ankush/escape_sql_credit_report fix: escape sql filters in credit report	2021-04-13 15:24:15 +05:30
Deepesh Garg	3db8ba2d4a	Merge pull request #25033 from anupamvs/se-add-to-transit fix: unable to submit stock entry	2021-04-13 14:59:54 +05:30
Deepesh Garg	c05f4ee1aa	Merge pull request #25082 from AfshanKhan/add-blank-for-status-issue-reports fix: added blank option for status in report related to issue	2021-04-13 14:59:01 +05:30
Deepesh Garg	bb92929048	Merge pull request #25256 from nextchamp-saqib/italy-e-invoicing feat(italy): add document type field for e-invoicing	2021-04-13 13:48:21 +05:30
Suraj Shetty	36083ff36c	Merge pull request #25310 from rmehta/grid-field-fix	2021-04-13 12:40:27 +05:30
Suraj Shetty	82d0a1a13e	style: Add missing semicolons - & make formatting consistent	2021-04-13 12:35:42 +05:30
Rushabh Mehta	ff935b4586	fix(minor): fix dynamically changing grid properties	2021-04-13 12:09:36 +05:30
Rushabh Mehta	3c58fd4d5e	fix(minor): fix dynamically changing grid properties	2021-04-13 12:05:10 +05:30
Rushabh Mehta	65f25c27b3	fix(minor): fix dynamically changing grid properties	2021-04-13 11:58:16 +05:30
Abdullah Abouzekry	20140425c8	fix: sales order not saving due type mismatch in promo scheme (#24748 ) (#25222 )	2021-04-13 11:36:39 +05:30
Deepesh Garg	1f49335335	Merge branch 'develop' into gstr_1_taxable_value_update	2021-04-13 10:29:52 +05:30
Ankush Menat	6a014d12c1	fix(stock_ledger): round off values near to zero	2021-04-12 20:21:27 +05:30
Ankush Menat	c65751d97f	test: ignore floating point errors in test_bom	2021-04-12 19:45:34 +05:30
Saqib	a19c98255f	fix: patch condition (#25301 )	2021-04-12 19:02:28 +05:30
Saqib	9320316462	feat(india): bulk e-invoice generation (#24969 )	2021-04-12 17:55:46 +05:30
Andy Zhu	bffe933c22	Fix: attempts to add overrides function Overrides parent_fieldname in outer form to all child rows's fieldname	2021-04-12 22:49:26 +12:00
Rohit Waghchaure	bda4c5cc52	fix: update scheduler check tim	2021-04-12 16:11:52 +05:30
Rohit Waghchaure	2339de7333	fix: update scheduler check tim	2021-04-12 16:09:55 +05:30
Saqib Ansari	faca478317	fix: payment amount showing in foreign currency	2021-04-12 15:40:27 +05:30
Deepesh Garg	719e0c1e60	fix: Taxxable value including Freight and Forwarding charges in GSTR-1 Report	2021-04-12 14:37:43 +05:30
Ankush Menat	53ce877ad9	Merge branch 'develop' into escape_sql_credit_report	2021-04-12 14:37:31 +05:30
Saqib	49336b8065	fix: consolidated sales invoice posting date (#25119 )	2021-04-12 12:17:50 +05:30
prssanna	42f4a00c88	fix: declare data before assigining	2021-04-12 12:01:20 +05:30
Marica	be26e59087	Merge pull request #25196 from noahjacob/UX fix: Company field in Warehouse	2021-04-12 11:08:45 +05:30
Deepesh Garg	5f3d7f547c	fix: Item wise tax rate for consolidated POS invoice (#25029 ) * fix: Item wise tax rate for consolidated POS invoice * fix: Do not alter item wise taxes for consolidated invoices * fix: Add test case * fix: Update * fix: Set opening stock for test item * fix: Add valuation rate for opening stock	2021-04-12 10:56:47 +05:30
Deepesh Garg	c36e48a869	fix: GST on freight charge in e-invoicing (#25000 ) * fix: GST on freight charge in e-invocing * fix: Add patch for taxable value field * fix: Handle discounts on net total * fix: Handle all types of discounts for e-invoicing * fix: Absolute taxable values * fix: Use correct tax amount	2021-04-12 10:55:43 +05:30
Marica	99522252c4	Merge branch 'develop' into UX	2021-04-12 10:51:24 +05:30
Anupam Kumar	9f73bd8040	fix: don't delete mode of payment account details while deleting company transactions (#25217 )	2021-04-12 10:31:36 +05:30
Saqib	b8a270074e	fix(pos): cannot set qty to less than zero (#25258 )	2021-04-12 10:28:05 +05:30
Anoop	207166fe8b	fix(patch): copy Lab Test / Template renamed field values (#25276 ) reload_doc doctypes introduced since v11	2021-04-12 10:25:34 +05:30
Ankush Menat	d235fc75ad	fix: remove nonexistent method from pick list (#25279 ) This method is merged in calculate_rate_and_amount() during repost item valuation refactoring. Ref: `e10f0a5a6c (diff-a160e3a8907dcdf28ce7728bb7dd45914ad8ab033489ea3de4c80fb1c4ca7fe9)`	2021-04-12 10:23:06 +05:30
Deepesh Garg	4d4d7074d0	Merge pull request #25053 from deepeshgarg007/delivery_note_gst_category fix: Add GST category field in Delivery Note	2021-04-10 22:12:42 +05:30
Deepesh Garg	1466e2d758	Merge pull request #25271 from deepeshgarg007/loan_penalty_new_fix fix: Consider paid repayment entries in subsequent loan repayments	2021-04-10 21:00:46 +05:30
Deepesh Garg	81ecd0b8b6	Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category	2021-04-10 20:54:38 +05:30
Deepesh Garg	b58590251b	fix: minor improvements and tests	2021-04-10 19:55:36 +05:30
rohitwaghchaure	5899477cbb	Merge pull request #25015 from rohitwaghchaure/fixed-patch-item-reposting-for-incorrect-sl-and-gl-develop fix: patch	2021-04-10 18:58:44 +05:30
Deepesh Garg	f38a653a08	fix: Show exact error message in datetime	2021-04-10 18:34:51 +05:30
Deepesh Garg	e7efbc1d33	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_penalty_new_fix	2021-04-10 18:33:38 +05:30
Deepesh Garg	37d6c19a34	fix: Consider paid repayment entries in subsequent loan repayments	2021-04-10 18:33:26 +05:30
Deepesh Garg	8a01dbe8e1	Merge pull request #25261 from ankush/issue_status_banner_fix fix: condition for SLA status banner	2021-04-10 17:56:51 +05:30
Rohit Waghchaure	a5d062453e	feat: added test case	2021-04-10 10:49:31 +05:30
Rohit Waghchaure	cb6494876f	feat: purchase receipt creation from purchase invoice	2021-04-10 10:49:30 +05:30
Rohit Waghchaure	1db8c51749	fix: changed logic	2021-04-10 10:45:29 +05:30
Rohit Waghchaure	b9aa775f3b	fix: pricing_rule test cases	2021-04-10 10:45:28 +05:30
Rohit Waghchaure	1358443cdb	fix: patch	2021-04-10 10:42:08 +05:30
Deepesh Garg	c85c243f9c	Merge pull request #25255 from nextchamp-saqib/issue-condition-fix fix: condition for setting agreement status	2021-04-09 21:40:14 +05:30
Deepesh Garg	df9388aa8e	Merge pull request #25086 from deepeshgarg007/advance_amount_precision fix: Precision issues while allocating advance amount	2021-04-09 21:39:02 +05:30
noahjacob	110f28f869	Company field editable and is readonly after saving.	2021-04-09 20:01:47 +05:30
Saqib	14b98c1737	Merge branch 'develop' into issue-condition-fix	2021-04-09 18:29:01 +05:30
Afshan	23f645e7da	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-09 18:22:43 +05:30
Anupam Kumar	986452107b	fix: Lead Source's module (#24583 ) * fix: Lead Source's module * fix: patch fix	2021-04-09 18:15:51 +05:30
Anupam Kumar	a91d7bd4b5	Merge branch 'develop' into se-add-to-transit	2021-04-09 18:00:03 +05:30
Anupam Kumar	cd2aedd0c6	Merge branch 'develop' into planning	2021-04-09 17:59:47 +05:30
Afshan	1f08d8e3de	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-09 17:44:54 +05:30
Afshan	c42318ec24	chores: clean up	2021-04-09 17:44:30 +05:30
Ankush Menat	5451bbf7d2	fix: condition for SLA status banner If the document is NOT in the closed state and fulfilled then there won't be any banner. This bug was introduced while fixing a bug related to buttons, so separated out code for showing buttons and showing banners.	2021-04-09 17:19:02 +05:30
rohitwaghchaure	526f76c27d	Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project fix: travis	2021-04-09 17:07:22 +05:30
Afshan	31b5dfe9ee	feat: Dimension-wise Accounts Balance Report	2021-04-09 16:52:14 +05:30
Rohit Waghchaure	ca5e10892c	fix: travis	2021-04-09 16:23:45 +05:30
Afshan	dc73a9995d	Merge branch 'develop' into add-blank-for-status-issue-reports	2021-04-09 13:04:34 +05:30
Saqib Ansari	032246dc2b	feat(italy): add document type field for e-invoicing	2021-04-09 12:08:24 +05:30
Marica	d38618fc34	Merge branch 'develop' into item-dashboard-fixes	2021-04-09 11:57:56 +05:30
Marica	5467d7c3e3	fix: Use system precision instead of SLE precision	2021-04-09 11:56:49 +05:30
Marica	a7ac01153e	fix: Remove redundant import and import cint	2021-04-09 11:55:44 +05:30
Saqib Ansari	e7813b69c4	fix: condition for setting agreement status	2021-04-09 11:46:16 +05:30
Marica	b89a40aa3c	Merge branch 'develop' into fix_picked_qty_in_DN	2021-04-09 11:45:39 +05:30
Marica	7f0e92c9b9	Merge pull request #25232 from nextchamp-saqib/coa-importer-validate-fix fix: keyerror while validating coa file	2021-04-09 11:44:40 +05:30
Deepesh Garg	63e6036d12	Merge pull request #25235 from ankush/remove_purch_inv_validation fix: remove gst name validation for purchase Invoice	2021-04-09 10:48:34 +05:30
barredterra	e66cf0aa44	fix: hanging indent	2021-04-08 18:26:45 +02:00
barredterra	0a45fc8c58	fix: remove unused import	2021-04-08 18:25:17 +02:00
barredterra	3a12f1f1ae	fix: prettier error log	2021-04-08 17:53:48 +02:00
Saqib	4191e7999d	chore: add error title Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-04-08 21:04:56 +05:30
barredterra	ea0fd31f60	Merge branch 'datev_fixes' of https://github.com/alyf-de/erpnext into datev_fixes	2021-04-08 17:25:54 +02:00
Raffael Meyer	3b4b17476a	Merge branch 'develop' into datev_fixes	2021-04-08 17:25:12 +02:00
Deepesh Garg	edb4663258	Merge pull request #25251 from nextchamp-saqib/einv-ack-no-fix fix(india): set correct ack no. on irn generation	2021-04-08 20:48:01 +05:30
barredterra	c6e13ac218	fix: patch to fill Debtor/Creditor Number	2021-04-08 16:57:55 +02:00
barredterra	ed36fb2073	docs: doctring for patch	2021-04-08 16:57:20 +02:00
barredterra	03425071e7	fix: patch to add custom fields	2021-04-08 16:31:00 +02:00
barredterra	368a6541e9	fix: Debtor/Creditor Number is not translatable	2021-04-08 16:26:56 +02:00
Saqib Ansari	30720d2139	fix: set correct ack no. on irn generation	2021-04-08 19:06:44 +05:30
Rucha Mahabal	b7aa658a51	refactor(HR): Add missing reports and doctypes to the Workspace (#24994 ) * refactor(HR): Add missing reports and doctypes to the Workspace * refactor: remove Employee Tax and Benefits from HR Workspace Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2021-04-08 18:13:21 +05:30
Jannat Patel	d9fa79de99	fix: serial no refresh issue (#25127 ) * fix: serial no refresh issue * fix: sider	2021-04-08 16:04:57 +05:30
Anupam Kumar	9d830255c1	Merge branch 'develop' into se-add-to-transit	2021-04-08 14:44:08 +05:30
rohitwaghchaure	f9fde054e1	Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost fix: bom cost test case	2021-04-08 14:39:08 +05:30
Marica	6a98d39201	Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop	2021-04-08 13:57:35 +05:30
HENRY Florian	e286750a0f	fix: UOM length unit in global setup list is empty (#24855 ) * When ERPNext is installed in localized language the category of UOM Conversion Factor is tranlasted into installed languaes. Filter must be locallized * fix * fix Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-04-08 13:56:29 +05:30
Marica	fb9fc944c5	Merge branch 'develop' into coa-importer-validate-fix	2021-04-08 13:46:42 +05:30
Rohit Waghchaure	fa8bb87a86	fix: bom cost test case	2021-04-08 13:38:22 +05:30
Ankush Menat	cb625d868c	fix: round total quantity in job card	2021-04-08 12:05:52 +05:30
Saqib	f10d107a0a	Merge branch 'develop' into coa-importer-validate-fix	2021-04-08 11:25:29 +05:30
Anupam Kumar	dfdf72cbb2	Merge branch 'develop' into planning	2021-04-08 10:58:05 +05:30
Anupam Kumar	8edf9d23c0	Merge branch 'develop' into se-add-to-transit	2021-04-08 10:57:50 +05:30
barredterra	94f293940c	fix: better party export	2021-04-07 20:06:16 +02:00
barredterra	4fe2d35b2e	feat: more infos for transactions	2021-04-07 20:05:41 +02:00
barredterra	b39608a02e	fix: handle encoding errors replace unknown characters by '?'	2021-04-07 20:04:38 +02:00
barredterra	6b2e4f2b5d	feat: add custom field debtor_creditor_number to Party Account	2021-04-07 20:03:59 +02:00
barredterra	09c7598a67	fix: make account field non-mandatory	2021-04-07 20:03:33 +02:00
Ankush Menat	76c8521010	fix: remove gst name validation for purch Invoice	2021-04-07 16:28:13 +05:30
Afshan	e2da3cbc28	fix: payroll issues (#24540 ) * fix: payroll issues * fix: enhancements * fix: rename variables and refactor * fix: slider * fix: added missing arguments * fix: test cases * fix: slider * fix: slider fix: slider Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-07 15:13:44 +05:30
Saqib Ansari	5541aeaa82	fix: keyerror while validating coa file	2021-04-07 12:34:20 +05:30
Walstan Baptista	c39720db50	fix: frappe.whitelist for doc methods (#25231 )	2021-04-07 11:51:22 +05:30
Walstan Baptista	90e240c3e6	fix: frappe.whitelist for doc methods (#25230 )	2021-04-07 11:32:51 +05:30
Saurabh	547fd31a37	bumped to version 13.0.1	2021-04-07 11:33:40 +05:50
Nabin Hait	aa809ceffe	fix: Patch fixes for v13 upgrade (#25220 )	2021-04-07 10:57:46 +05:30
Deepesh Garg	5af6aea9f9	fix: Posting Date check	2021-04-07 09:46:13 +05:30
Deepesh Garg	d551940dc5	fix: Remove comments	2021-04-06 23:55:48 +05:30
Deepesh Garg	a42194f3d5	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2	2021-04-06 23:53:34 +05:30
Rohan Bansal	a93b514b2f	feat: create Quality Inspections from account and stock documents	2021-04-06 17:20:16 +05:30
Rucha Mahabal	d77ea7c88b	Merge pull request #25190 from ruchamahabal/approver-perms feat(HR): share doc with employee approvers if they don't have access	2021-04-06 14:32:34 +05:30
Rucha Mahabal	0bcd3c45ed	fix: leave approver perms test	2021-04-06 13:46:53 +05:30
Hussain Nagaria	d2da7b673b	fix: Sider Issues	2021-04-06 11:44:54 +05:30
Hussain Nagaria	33e0c8ed19	test: Unique Employee IDs for tests	2021-04-06 11:40:35 +05:30
Deepesh Garg	dfe91b5df3	Merge pull request #25212 from deepeshgarg007/loan_shortfall_preference fix: Give first preference to loan security on repayment	2021-04-06 11:06:03 +05:30
Anupam Kumar	7b6c8bb3ab	fix: error message compensatory leave request (#25206 )	2021-04-06 10:20:10 +05:30
Rucha Mahabal	d1970d3c38	Merge branch 'develop' into approver-perms	2021-04-06 10:09:18 +05:30
Rucha Mahabal	084e90e5d3	fix(test): set user as Administrator	2021-04-06 10:07:50 +05:30
Deepesh Garg	015fd681ec	fix: Give first preference to loan security on repayment	2021-04-06 00:49:46 +05:30
Hussain Nagaria	bb32f5a92a	fix: Rename utilisation to utilization	2021-04-05 19:32:10 +05:30
Sagar Vora	c9cdf74dc5	test: remove `print()` (#25205 )	2021-04-05 16:38:10 +05:30
Marica	4440ff7a0d	Merge branch 'develop' into item-dashboard-fixes	2021-04-05 16:25:57 +05:30
Marica	bc50193702	Merge branch 'develop' into fix_picked_qty_in_DN	2021-04-05 16:24:53 +05:30
Sagar Vora	9967a7ce02	test: clear all existing quotations to avoid AssertionError (#25202 )	2021-04-05 15:35:52 +05:30
Rucha Mahabal	9948525dd3	Merge branch 'develop' into approver-perms	2021-04-05 14:54:11 +05:30
Sagar Vora	9a0907131a	test: create tax rule if it doesnt exist (#25199 )	2021-04-05 14:50:09 +05:30
Walstan Baptista	8789ef16a1	test: uses `_Test Item` instead of `_Test Item Home Desktop 100` (#25198 )	2021-04-05 13:18:03 +05:30
Hussain Nagaria	ccb15de1c9	fix: Handle overtime edge case	2021-04-05 11:23:06 +05:30
Anoop	b27441b40c	fix: failing patch - reload_doc new doctypes added in v13 (#25194 )	2021-04-05 10:41:28 +05:30
Ankush Menat	36ff0748bf	fix: broken type check in stock ageing report	2021-04-05 10:18:44 +05:30
Rucha Mahabal	b7436a04c3	fix: Ignore Permission for Leave Ledger Entry (#25172 )	2021-04-04 20:09:00 +05:30
Rucha Mahabal	57ab3a5a88	Merge branch 'develop' into approver-perms	2021-04-04 19:57:58 +05:30
Rucha Mahabal	19c3286b06	fix: linter and sider issues	2021-04-04 19:54:00 +05:30
Rucha Mahabal	8c055b5469	fix: ignore share permission while sharing doc with approver	2021-04-04 18:45:06 +05:30
Rucha Mahabal	13c0a350af	test: leave, expense, shift request approver permissions	2021-04-04 18:37:46 +05:30
Rucha Mahabal	ba10ef4403	feat(HR): share doc with employee approvers if they don't have access	2021-04-04 17:16:48 +05:30
Rohit Waghchaure	8b829711fc	fix: incorrect batch picked in subcontracted purchase receipt	2021-04-04 12:43:38 +05:30
Sagar Vora	8aacd341c7	test: disable shopping cart before running Tax Rule tests (#25183 )	2021-04-03 23:01:16 +05:30
Sagar Vora	993cf8c2cd	test: cleanup BOM in `test_routing` and prevent overlap in `test_job_card` (#25180 )	2021-04-03 20:25:19 +05:30
Walstan Baptista	37b826b988	fix: correct calculation for discount amount when margin is set (#25179 )	2021-04-03 19:48:46 +05:30
Sagar Vora	cce3efe0c1	test: specify warehouse list to avoid error (#25174 ) * test: specify warehouse list to avoid error * test: get_all_warehouses of BOM company	2021-04-03 19:46:44 +05:30
Walstan Baptista	b7481633b1	test: adds role after setting user to Administrator (#25177 )	2021-04-03 17:37:59 +05:30
Sagar Vora	f68f41d7a7	test: fix multiple tests in Leave Application (#25173 )	2021-04-03 17:34:57 +05:30
Deepesh Garg	232c127295	Merge pull request #25107 from deepeshgarg007/stock_entry_serial_batch_selector fix: Hide serial and batch selector in Stock Entry	2021-04-03 17:15:22 +05:30
Deepesh Garg	b7e7eeaf8d	Merge pull request #25138 from deepeshgarg007/loan_shortfall_percentage fix: Add shortfall ratio in Loan Security Shortfall	2021-04-03 17:13:27 +05:30
rohitwaghchaure	fe72e17a7b	Merge pull request #25109 from ankush/po_to_pr_fixes fix: incorrect status creating PR from PO after creating PI	2021-04-03 17:11:14 +05:30
Sagar Vora	f6b1fa0a1c	test: clear tax rules before making POS Invoices (#25171 )	2021-04-03 16:06:41 +05:30
Walstan Baptista	5d77f10baa	test: docs are not deleted in tearDown (#25123 ) * test: docs are not deleted in tearDown	2021-04-03 13:38:55 +05:30
Ankush Menat	87b2a51322	fix: escape sql filters in credit report closes #24965	2021-04-03 12:34:34 +05:30
Saqib	a30d70e490	Merge branch 'develop' into customer_duplicates	2021-04-03 12:22:22 +05:30
Kaviya Periyasamy	2cef23d4c9	fix: object referencing the same address issue (#25159 ) * fix: variable reference to same address * fix: object referencing same address issue * fix: value error	2021-04-03 11:30:49 +05:30
Hussain Nagaria	40abd2a2e1	test: Add test case for summary data	2021-04-02 19:55:54 +05:30
Hussain Nagaria	d27fc93edd	feat: Add additional stats to report summary	2021-04-02 19:54:58 +05:30
Rucha Mahabal	2453b0cf6a	fix: component amount calculation based on formula with abbr not working (#25117 )	2021-04-02 17:00:28 +05:30
bhavesh95863	7535341016	fix(regional): remove shipping address GSTIN validation for e-invoice (#25153 )	2021-04-02 15:04:48 +05:30
Ankush Menat	e41d48c7de	fix: disable auto naming of customer during import	2021-04-02 14:22:04 +05:30
Marica	7f9fedf08a	Merge branch 'develop' into fix_picked_qty_in_DN	2021-04-02 13:19:19 +05:30
Saqib	5447b250fe	fix: place of supply of e-invoicing (#25148 )	2021-04-02 12:16:19 +05:30
Deepesh Garg	7f10044195	fix: Typo	2021-04-02 12:04:42 +05:30
Jannat Patel	0353b0f5f6	Merge branch 'develop' into profitability-report	2021-04-02 10:15:28 +05:30
Saurabh	e7b3047eca	chore: Bump version to v13.0.0	2021-04-01 22:59:28 +05:30
Anuja Pawar	87dea3923b	fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List (#25106 ) * fix: picked qty from Stock Qty to Qty in DN * fix: suggested changes and added test * fix: sider changes * fix: sider changes	2021-04-01 22:05:08 +05:30
Saurabh	f9b9298a6d	fix: reload doc in patch (#25144 )	2021-04-01 21:59:35 +05:30
Jannat Patel	c01b2caaa3	fix: serial no refresh issue (#25129 )	2021-04-01 20:48:51 +05:30
Afshan	ace4ce64a0	fix: validation msg for TransDocNo e-invoicing (#25121 )	2021-04-01 20:28:12 +05:30
Suraj Shetty	c5347c4a34	fix: get_route_options_for_new_doc for project	2021-04-01 19:59:29 +05:30
Nabin Hait	db5f0f79b1	chore: added v13 change log (#25140 )	2021-04-01 19:59:02 +05:30
Suraj Shetty	7b97d49a58	Merge pull request #25141 from surajshetty3416/fix-get_route_options_for_new_doc fix: get_route_options_for_new_doc for Project	2021-04-01 19:58:01 +05:30
Suraj Shetty	67169ba2d3	fix: get_route_options_for_new_doc for project	2021-04-01 19:52:07 +05:30
Marica	f46fbcc1ad	Merge pull request #25118 from marination/qc-back-update fix: Query values incorrectly escaped while back updating Quality Inspection	2021-04-01 18:30:58 +05:30
Sagar Vora	d3ee8c7731	fix: customer creation from shopping cart (#25136 )	2021-04-01 18:18:19 +05:30
Deepesh Garg	eea20f83ab	fix: Add shortfall ratio in Loan Security Shortfall	2021-04-01 18:13:54 +05:30
Rucha Mahabal	0773d6772d	fix(POS): local variable 'customer_currency' referenced before assignment (#25137 )	2021-04-01 17:47:19 +05:30
Marica	913e7254cb	Merge branch 'develop' into qc-back-update	2021-04-01 17:40:46 +05:30
Marica	f4e7e72f67	Merge pull request #25131 from marination/qc-back-update-pre-release fix: Query values incorrectly escaped while back updating Quality Inspection	2021-04-01 17:39:56 +05:30
Walstan Baptista	446a6df662	test: set opening stock to fix NegativeStock errors (#25101 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-04-01 16:54:26 +05:30
Sagar Vora	98d250995d	fix(India): create property setters for shorter naming series (#25134 )	2021-04-01 16:52:28 +05:30
Sagar Vora	88f5c42b09	test: set formula in scorecard to avoid ValidationError (#25116 )	2021-04-01 16:44:05 +05:30
Anuja P	7982688508	fix: sider changes	2021-04-01 16:04:28 +05:30
Walstan Baptista	58625674f4	test: correct naming series to avoid ValidationError (#25132 )	2021-04-01 15:55:37 +05:30
marination	a3da206b64	fix: Don't string format args as they may not be escaped properly - Append even conditional args to args list and send to query executer - It will escape all values that are sent to it - String formatting without escaping causes issues with % sign, etc.	2021-04-01 15:45:33 +05:30
Marica	9ef323fcfd	Merge branch 'develop' into qc-back-update	2021-04-01 15:44:20 +05:30
Anuja P	45d0b9bce6	test: added tests for Pick List for item with multiple UOM	2021-04-01 15:38:13 +05:30
Sagar Vora	4c31fbb687	fix(India): create property setters for shorter naming series (as per GST Rules) (#25128 )	2021-04-01 15:32:37 +05:30
Rucha Mahabal	6717773c28	fix: Travis (#25078 ) * fix(test): set default accounts in mode of payment * fix(test): import_doc params in shopify settings test * fix: syntax error in salary slip test * fix(test): use Temporary Opening account for Stock Reco opening entry * fix(test): skip GST doc naming validations for tests * fix(test): Salary Structure Assignment date edge case * fix(test): GST doc naming validations * fix: sider * revert: skip GST doc naming validations for tests	2021-04-01 15:30:34 +05:30
Nabin Hait	7f7b3608bb	fix: merge conflict	2021-04-01 15:05:53 +05:30
Nabin Hait	11eb30d082	fix: merge conflict	2021-04-01 15:03:11 +05:30
Rohit Waghchaure	58ca5a7329	fix: repost not completed backdated transactions	2021-04-01 14:59:49 +05:30
Rucha Mahabal	53a1aaf33d	fix: Salary Structure object has no attribute set_totals (#25113 )	2021-04-01 14:40:15 +05:30
Rucha Mahabal	d765b21825	fix: Salary Structure object has no attribute set_totals (#25114 )	2021-04-01 14:39:52 +05:30
marination	561fa6b530	fix: Don't string format args as they may not be escaped properly - Append even conditional args to args list and send to query executer - It will escape all values that are sent to it - String formatting without escaping causes issues with % sign, etc.	2021-04-01 12:56:05 +05:30
Ankush Menat	1bdf9c4161	fix: patch for purchase receipt status	2021-04-01 11:58:34 +05:30
Ankush Menat	427a98d6cd	fix: do not copy percent billed from PO to PR	2021-04-01 11:51:31 +05:30
Ankush Menat	8993ccb7d2	fix: update PR status in database	2021-04-01 11:51:31 +05:30
Ankush Menat	4198cf58e5	test: add tests for PO->PI, PO->PR workflow Add failing test cases for PR status and PR percent billed.	2021-04-01 11:51:30 +05:30
Hussain Nagaria	1e772bb9a4	test: Basic report data testing	2021-04-01 00:44:35 +05:30
rohitwaghchaure	56bd4d71a9	Merge pull request #25112 from rohitwaghchaure/fixed-clear-source-warehouse fix: not able to save material request	2021-03-31 23:58:44 +05:30
Rohit Waghchaure	825850a58f	fix: not able to save material request	2021-03-31 23:55:06 +05:30
Marica	bfc2590e3b	Merge branch 'develop' into patch-7	2021-03-31 22:23:23 +05:30
Marica	8617c0ab99	Merge pull request #25070 from marination/update-items-bin fix: Update Bin via Update Item on Purchase/Sales Order	2021-03-31 22:21:41 +05:30
Afshan	2fef245607	fix: don't set Company:company:default_currency as default for currency link fields (#25111 )	2021-03-31 21:57:04 +05:30
Prssanna Desai	f3c34aa6ae	fix: don't set "Company:company:default_currency" as default for currency link fields (#25095 ) * fix: don't set Company:company:default_currency as default for currency link fields * fix: Company:company:default_currency and refactor Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Afshan <afshan13k@gmail.com>	2021-03-31 21:52:48 +05:30
marination	85a7ec91a1	fix: Run Patches to updated Reserved, Requested and Ordered Qty	2021-03-31 21:07:59 +05:30
marination	7665a85039	fix: Run Patches to updated Reserved, Requested and Ordered Qty	2021-03-31 21:03:55 +05:30
Deepesh Garg	9f7bb14ea1	fix: Remove console	2021-03-31 20:01:00 +05:30
Anuja P	a1d0932093	fix: suggested changes	2021-03-31 19:59:28 +05:30
Deepesh Garg	2d86eb3ab1	fix: Hide serial and batch selector in Stock Entry	2021-03-31 19:57:50 +05:30
Ankush Menat	777745f1e0	fix: do not fetch stopped MR in production plan - Ignore stopped MR while using fetch button - Add filter on field inside child table. Related issue: ISS-20-21-10757	2021-03-31 19:53:19 +05:30
Anupam Kumar	1033cf72f6	fix: added flag for dont_fetch_price_list_rate in transaction (#25041 )	2021-03-31 19:39:45 +05:30
Anupam Kumar	35415fa575	fix: added flag for dont_fetch_price_list_rate in transaction (#25083 )	2021-03-31 19:39:33 +05:30
Anuja P	fb9ce3f37b	fix: Picked Qty conversion from Stock Qty to item Qty in DN	2021-03-31 19:26:42 +05:30
Prssanna Desai	9920d4062c	Merge pull request #25103 from prssanna/redesign-fixes-v13	2021-03-31 19:02:10 +05:30
Sagar Vora	27f48739d4	test: pass force parameter to avoid LinkExistsError (#25100 )	2021-03-31 18:49:03 +05:30
Anupam Kumar	526497bc43	Merge pull request #25104 from anupamvs/purchase-side-margin-beta feat: price margin in buying	2021-03-31 18:38:58 +05:30
Prssanna Desai	e9236ab60f	Merge pull request #25102 from prssanna/pos-print-v13	2021-03-31 18:36:07 +05:30
Sagar Vora	4e07695a08	test: use insert instead of save (#25045 ) * test: use insert instead of save * test: use do_not_save	2021-03-31 18:33:27 +05:30
Anupam	ad520e08ba	feat: price margin in buying	2021-03-31 18:31:12 +05:30
prssanna	bcd63f04da	style: missing semicolon	2021-03-31 18:26:52 +05:30
prssanna	5cdb1cb7a9	fix: item variant dialog dropdown issue	2021-03-31 18:26:45 +05:30
prssanna	56ab3fb132	fix: issue web list style	2021-03-31 18:26:37 +05:30
prssanna	b5843dbdcd	fix: print recepit dialog	2021-03-31 18:21:51 +05:30
prssanna	b6ce868199	fix: POS print receipt	2021-03-31 18:21:38 +05:30
Jannat Patel	c814aab0b6	fix: delivery note print error (#25081 )	2021-03-31 16:24:31 +05:30
Jannat Patel	11e9ae3841	fix: delivery note print error (#25080 )	2021-03-31 16:24:08 +05:30
Prssanna Desai	c5ae9ee0e1	fix: do not set standard link in Sales Invoice as custom (#25097 )	2021-03-31 16:16:12 +05:30
Prssanna Desai	45eccfafc1	fix: do not set standard link in Sales Invoice as custom (#25096 )	2021-03-31 16:16:00 +05:30
Marica	116ac3cde7	Merge pull request #24863 from marination/drop-shipping fix: PO not created against all selected suppliers (drop shipping)	2021-03-31 16:06:44 +05:30
Deepesh Garg	21a3ea462a	fix: Purchase from registered composition dealer (#25040 ) * fix: Purchase from registered composition dealer * fix: Test case for GSTR 3b report	2021-03-31 16:05:12 +05:30
Deepesh Garg	c482c9592f	fix: Purchase from registered composition dealer (#25057 ) * fix: Purchase from registered composition dealer * fix: Test case for GSTR 3b report	2021-03-31 16:04:46 +05:30
Marica	1b8d36634f	Merge branch 'develop' into patch-7	2021-03-31 16:04:24 +05:30
Marica	8339987cf1	Merge branch 'develop' into drop-shipping	2021-03-31 16:03:14 +05:30
Saqib	fb4051bddd	feat: discount configuration on early payments (#25089 ) * feat: discount configuration on early payments Co-authored-by: Nabin Hait <nabinhait@gmail.com> * fix: remove duplicate patch call Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:52:51 +05:30
Saqib	4d0939de8d	feat: introduce parameter group in quality inspection (#25094 ) * feat: introduce parameter group in quality inspection * chore: make parameter group optional	2021-03-31 15:51:48 +05:30
rohitwaghchaure	e353c84aa5	Merge pull request #25092 from rohitwaghchaure/fixed-multiply-issue-material-request-develop fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:31:50 +05:30
rohitwaghchaure	968885af26	Merge pull request #25091 from rohitwaghchaure/fixed-multiply-issue-material-request fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:31:30 +05:30
Rohit Waghchaure	1bc53a32bf	fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:30:42 +05:30
Rohit Waghchaure	94c145f3c3	fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:28:26 +05:30
Rohan	99a8cb7143	fix: commit individual SLE rename for large datasets (#25084 )	2021-03-31 15:22:00 +05:30
Saqib	f239dbdd03	feat: tax collected at source using tax withholding category (#25090 ) * refactor: tax withholding category against customer * feat: pan and tax withholding category fields for customer * fix: test * feat: charging tcs on sales invoice * fix: tcs chargable amount * fix: tcs amount calculation * fix: sider	2021-03-31 15:15:29 +05:30
Marica	0af1aedf34	Merge branch 'develop' into drop-shipping	2021-03-31 15:05:11 +05:30
Saqib	0586b7db79	feat: discount configuration on early payments (#24586 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:03:53 +05:30
Saqib	df1ef6f8e5	fix: make round off GLE always non-opening (#25087 )	2021-03-31 14:23:09 +05:30
Deepesh Garg	5d73d8281b	fix: Remove unintentionally added field	2021-03-31 14:10:56 +05:30
Deepesh Garg	f54d596ae1	fix: Precision issues while allocating advance amoount	2021-03-31 14:06:02 +05:30
rohitwaghchaure	83b3e87497	Merge pull request #25076 from rohitwaghchaure/fixed-bom-stock-calculated-report fix: bom stock calculated report	2021-03-31 13:51:32 +05:30
Afshan	b07de03ddb	fix: added blank option for status in report related to issue	2021-03-31 13:39:04 +05:30
marination	59bff8a2f1	fix: Test - Preserve order of supplier list while removing duplicates - Dont use list of set, but list of dict with unique keys	2021-03-31 13:17:25 +05:30
marination	1b903e39c8	fix: Sider (unused variables)	2021-03-31 13:17:13 +05:30
marination	1999ae0a91	fix: PO not created against all selected suppliers (drop shipping) - Return list of created POs instead of first doc - test case added	2021-03-31 13:17:00 +05:30
Hussain Nagaria	39b75c63ad	feat: Add chart generation	2021-03-31 13:13:25 +05:30
Marica	5a601ce851	Merge branch 'develop' into drop-shipping	2021-03-31 13:12:13 +05:30
Sagar Vora	e50324aed7	perf: reduce number of queries for checking if future SL entry exists (#25064 )	2021-03-31 12:44:03 +05:30
Sagar Vora	368cb45147	fix(Italy): setup, validations, optimisations (#25065 )	2021-03-31 12:43:33 +05:30
Walstan Baptista	d6360755b9	chore: frappe.whitelist for doc methods (#25068 ) * chore: frappe.whitelist for doc methods * fix: incorrect spelling * fix: sider issue Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-31 12:30:32 +05:30
Marica	14c44e5e9e	Merge branch 'develop' into drop-shipping	2021-03-31 12:27:32 +05:30
marination	120da991d0	fix: Test - Preserve order of supplier list while removing duplicates - Dont use list of set, but list of dict with unique keys	2021-03-31 12:27:57 +05:30
Hussain Nagaria	92c768972f	fix: Missing quotation marks in SQL query	2021-03-31 12:26:37 +05:30
Hussain Nagaria	f5576d67dd	feat: Add Report Summary generation	2021-03-31 12:25:36 +05:30
Walstan Baptista	353aa59c42	test: sets company while making a project (#25061 )	2021-03-31 12:16:54 +05:30
Walstan Baptista	d65458d534	test: corrected item name (#25075 )	2021-03-31 12:14:41 +05:30
Rohit Waghchaure	410d36beca	fix: bom stock calculated report	2021-03-31 12:11:00 +05:30
Marica	8451da7924	Merge branch 'develop' into drop-shipping	2021-03-31 11:44:07 +05:30
Afshan	91a8a74d54	fix: column width in Recruitment Analytics report (#25074 )	2021-03-31 11:30:04 +05:30
Anurag Mishra	720f69caaf	fix: column width in Recruitment analytics report (#25003 ) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-03-31 11:23:34 +05:30
Anupam	41229ba705	fix: unable to submit stock entry	2021-03-31 02:32:25 +05:30
marination	a5de6c779b	fix: Cleaned up and fixed validation and bin updation on deletion - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 02:03:26 +05:30
Andy Zhu	ba3578929e	Update accounts_controller.py Updating Bin quantity based on doctype to optimize running efficiency.	2021-03-31 02:03:16 +05:30
Andy Zhu	c0ba6eafd5	fix: Update Items on Purchase Order 1. set warehouse using `get_item_warehouse` 2. update "reserved_qty" for sales order	2021-03-31 02:03:10 +05:30
Andy Zhu	a21e347bf1	fix: Update Items on Purchase Order If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated. This fix is not mature yet but to give an tempopary solution for fixing this issue.	2021-03-31 02:03:02 +05:30
marination	0673f558c1	fix: Cleaned up and fixed validation and bin updation on deletion - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 01:42:18 +05:30
Prssanna Desai	7e442c74b6	Merge pull request #25020 from prssanna/help-links-fix-v13	2021-03-30 19:29:30 +05:30
Hussain Nagaria	1a0229eb36	feat: Add report table data generation	2021-03-30 18:20:22 +05:30
Marica	c5739957de	Merge branch 'develop' into patch-7	2021-03-30 18:07:32 +05:30
Deepesh Garg	6be78db62c	Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta feat: Normal rounding for GST Taxes	2021-03-30 17:01:45 +05:30
Anurag Mishra	679177f9e0	Merge pull request #25022 from shariquerik/employee-profile-pic-access-fix fix: Employee profile pic upload access for erpnext user	2021-03-30 14:32:21 +05:30
Hussain Nagaria	2b85a81a1c	feat: Add filters to front end	2021-03-30 13:57:44 +05:30
Rucha Mahabal	30f67c3f57	fix: add filters to account link fields in Non Profit Settings (#25060 ) - fetch memberships ordered by date in certificate	2021-03-30 12:39:56 +05:30
Rucha Mahabal	04c0296558	fix: add filters to account link fields in Non Profit Settings - fetch memberships ordered by date in certificate	2021-03-30 12:30:40 +05:30
Hussain Nagaria	b7f2ba1556	feat: Add Report boilerplate	2021-03-30 12:19:16 +05:30
Anupam Kumar	9be11afbde	feat: price margin in buying (#25058 )	2021-03-30 12:09:46 +05:30
Rucha Mahabal	a54eecb230	fix: membership renewal validation (#24963 )	2021-03-30 12:02:52 +05:30
Rucha Mahabal	146cbb10f8	fix: calculate 80g certificate amount on validate for memberships (#24925 )	2021-03-30 12:02:28 +05:30
Rucha Mahabal	5f4a2bfc61	fix(Non Profit): Membership and Donation API fixes (#24900 ) * fix: Donation fixes - differentiate between subscription payment and payment - issue with donation amount * fix: existing membership validation * fix: ignore subscription payments while capturing donations	2021-03-30 12:02:09 +05:30
Rucha Mahabal	170d2efd35	fix(Payroll): Exchange Rate not getting set in Salary Slip (#25013 )	2021-03-30 11:02:46 +05:30
Sagar Vora	7f43c051df	fix(Italy): setup, validations, optimisations	2021-03-29 21:18:26 +05:30
Deepesh Garg	f954ec7c78	fix: Add patch for GST category field in Delivery Note	2021-03-29 20:31:11 +05:30
Sagar Vora	ba76f87e44	fix(Italy): setup, validations, optimisations (#25054 ) * fix(Italy): setup, validations, optimisations * fix: remove unused import	2021-03-29 20:18:45 +05:30
Deepesh Garg	29997414ad	fix: Add GST category field in Dellivery Note	2021-03-29 19:49:52 +05:30
Deepesh Garg	237033704f	fix: Add test case	2021-03-29 16:42:59 +05:30
Deepesh Garg	c2548ddc75	feat: Normal rounding for GST Taxes	2021-03-29 16:42:47 +05:30
Saurabh	ceb026c5ab	bumped to version 13.0.0-beta.14	2021-03-28 16:14:56 +05:50
rohitwaghchaure	b38ea0cc8b	fix: patch (#25014 ) * fix: patch * fix: pricing_rule test cases	2021-03-28 15:51:32 +05:30
Sagar Vora	5c907fa7f0	test: make Stock Entry to avoid NegativeStockError (#25044 )	2021-03-27 20:30:26 +05:30
rohitwaghchaure	f4901b4f22	Merge pull request #25034 from anupamvs/naming-pre-release fix: unable to submit stock entry	2021-03-27 19:50:06 +05:30
Walstan Baptista	ee822a9dcd	test: use different product attribute value; cleanup (#25043 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-27 19:42:25 +05:30
Anupam	d429138dcc	fix: added flag for dont_fetch_price_list_rate in transaction	2021-03-27 19:31:23 +05:30
Walstan Baptista	d6c7d8e631	test: reset session user if test errors in test_sle (#25042 )	2021-03-27 18:30:07 +05:30
Sagar Vora	868c0bf45b	perf: reduce no of queries for checking if future sl entry exists (#24881 )	2021-03-27 16:10:20 +05:30
walstanb	ab673d9e4b	fix: minor changes	2021-03-27 12:54:49 +05:30
walstanb	225c64a1ad	test: sets is_purchase_item while item creation	2021-03-27 12:54:49 +05:30
walstanb	52403c537b	fix: check if gst account exists before appending	2021-03-27 12:54:49 +05:30
walstanb	9826ac4602	test: reset session user if test errors	2021-03-27 12:54:49 +05:30
walstanb	98dcf8a1fd	fix: type casting for None type value	2021-03-27 12:54:49 +05:30
rohitwaghchaure	6c7f029597	Merge pull request #25016 from hasnain2808/fix-ams-error-v13-pre-release fix: ams integration breaks when error raised	2021-03-27 09:59:51 +05:30
Anupam	4adaf7ed2e	Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release	2021-03-27 00:56:48 +05:30
Anupam	5d994d8aa1	fix: unable to submit stock entry	2021-03-27 00:54:19 +05:30
Anupam	096da429ed	fix: unable to submit stock entry	2021-03-27 00:45:31 +05:30
rohitwaghchaure	d5759bab11	Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule feat: recursive pricing rule	2021-03-26 19:10:10 +05:30
Rohit Waghchaure	256b9c7bf9	fix: total weight not set for free items	2021-03-26 19:05:46 +05:30
Rohit Waghchaure	0486276789	fix: don't club same free item	2021-03-26 19:05:45 +05:30
Rohit Waghchaure	fce552b811	fix: nonetype object has no attribute options	2021-03-26 19:05:45 +05:30
Rohit Waghchaure	cd8422a840	feat: recursive product discount	2021-03-26 19:05:43 +05:30
Rucha Mahabal	44853da7c2	feat: Show Required Qty as per BOM in Material Request Items	2021-03-26 18:55:16 +05:30
Rucha Mahabal	4cd68cdecb	feat: Add more fields to raw material download	2021-03-26 18:55:08 +05:30
Rucha Mahabal	d74ff72527	fix: Ordered and Reserved Qty for Production not getting fetched in Items	2021-03-26 18:55:00 +05:30
Rucha Mahabal	28a885a3a9	feat: show ordered and reserved qty in Material Request Plan Item table	2021-03-26 18:54:51 +05:30
Rucha Mahabal	efe2b425b1	feat(Production Plan): Consider Safety Stock in Required Qty Calculation	2021-03-26 18:54:34 +05:30
Rucha Mahabal	87a70fe8cb	feat: Show Required Qty as per BOM in Material Request Items	2021-03-26 18:37:50 +05:30
Rucha Mahabal	9dbabb92df	feat: Add more fields to raw material download	2021-03-26 18:37:40 +05:30
Rucha Mahabal	07409990a0	fix: Ordered and Reserved Qty for Production not getting fetched in Items	2021-03-26 18:37:24 +05:30
Rucha Mahabal	1f86471656	feat: show ordered and reserved qty in Material Request Plan Item table	2021-03-26 18:36:52 +05:30
Rucha Mahabal	66bae19c16	feat(Production Plan): Consider Safety Stock in Required Qty Calculation	2021-03-26 18:36:33 +05:30
shariquerik	82d7986a2f	fix: sider fix	2021-03-26 17:02:37 +05:30
Saqib	f66aab6d98	fix: e-invoicing option visible even if settings disabled (#25021 )	2021-03-26 16:40:51 +05:30
shariquerik	1989375be4	fix: Employee profile pic upload access for erpnext user	2021-03-26 16:34:22 +05:30
prssanna	5243eea532	style: fix formatting	2021-03-26 15:47:08 +05:30
prssanna	0ae0368d34	fix: re-execute add_standard_navbar_items patch - check that same items aren't appended again	2021-03-26 15:47:07 +05:30
prssanna	eeb3121622	fix: missing help links in navbar help dropdown	2021-03-26 15:47:07 +05:30
Prssanna Desai	3da2df55f4	Merge branch 'develop' into help-links-fix	2021-03-26 15:35:17 +05:30
Sagar Vora	0b569b3e43	fix: allow creating stock entry based on work order for customer provided items (#24885 )	2021-03-26 14:40:15 +05:30
prssanna	dd2a315d06	style: fix formatting	2021-03-26 14:35:47 +05:30
hasnain2808@gmail.com	e9c801e4bd	fix: ams integration breaks when error raised	2021-03-26 14:32:02 +05:30
Nabin Hait	2a39b74ad2	fix: Fixes on job card and salary slip (#25011 ) * fix: map conversion factor while making stock entry from job card * fix: fetch additional salary in salary slip	2021-03-26 10:49:39 +05:30
Marica	ffb4e3f280	Merge pull request #24937 from ankush/hide_alt_field fix: hide alt tag if item is not shown in website	2021-03-25 20:14:52 +05:30
Anurag Mishra	344c14c9ca	Merge pull request #25004 from ruchamahabal/fix-exchange-rate-in-salary-slip fix(Payroll): Exchange Rate not getting set in Salary Slip	2021-03-25 18:12:11 +05:30
Deepesh Garg	74200bcd62	Merge pull request #24975 from frappe/revert-24039-fixed-incorrect-gstr-report-issue Revert "fix: GSTR B2C report"	2021-03-25 16:50:10 +05:30
Deepesh Garg	7b8742bd70	Merge pull request #24998 from frappe/revert-24318-fix-currency-validation-for-party Revert "fix: validating party currency with doc currency"	2021-03-25 16:49:50 +05:30
Rucha Mahabal	b2b12f303e	fix(Payroll): Exchange Rate not getting set in Salary Slip	2021-03-25 14:48:08 +05:30
pateljannat	c0b4eea415	fix: sider	2021-03-25 14:39:05 +05:30
pateljannat	6597bf7dd7	feat: profitability report default working hours and tests	2021-03-25 13:31:43 +05:30
Mohammad Hasnain Mohsin Rajan	52701dcbbc	fix: patch regional fields for old companies (#24988 )	2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan	f29c075bc3	fix: patch regional fields for old companies (#24999 ) * fix: patch regional fields for old companies * chore: fix sider	2021-03-25 12:56:13 +05:30
Marica	36d125a720	Merge branch 'develop' into item-dashboard-fixes	2021-03-25 12:32:47 +05:30
Nabin Hait	d4499277b4	chore: Added change log	2021-03-25 12:18:22 +05:30
Marica	7c6f72fd39	Merge branch 'develop' into hide_alt_field	2021-03-25 12:15:58 +05:30
Nabin Hait	91026e026f	chore: Added change log	2021-03-25 11:53:07 +05:30
Syed Mujeer Hashmi	f8b44e05c4	refactor: Add student mobile number to student attendance (#24990 ) To setup SMS alert notification for student attendance we need student mobile number in this doctype. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2021-03-25 11:48:29 +05:30
Anupam Kumar	b4e842e25e	fix: opportunity-quotation mapping order status (#25001 )	2021-03-25 11:45:57 +05:30
Deepesh Garg	1a6e6320cf	Revert "fix: validating party currency with doc currency (#24318 )" This reverts commit `02142c41bb`.	2021-03-24 21:26:04 +05:30
Prssanna Desai	8a87ffc8f6	fix: POS print receipt (#24924 ) * fix: POS print receipt * fix: print recepit dialog	2021-03-24 19:52:39 +05:30
Saqib	dd39a6b47c	fix(pos): mode of payments disappear on loading draft pos invoice (#24917 )	2021-03-24 17:56:24 +05:30
prssanna	194dd12882	fix: re-execute add_standard_navbar_items patch - check that same items aren't appended again	2021-03-24 16:45:32 +05:30
prssanna	97aab3ac21	fix: missing help links in navbar help dropdown	2021-03-24 16:44:49 +05:30
Rohit Waghchaure	244f3eeedc	fix: incorrect fieldname	2021-03-24 16:42:22 +05:30
Anurag Mishra	4217a4b1ff	Merge branch 'develop' into item-dashboard-fixes	2021-03-24 15:35:33 +05:30
Anupam Kumar	d1bbb4c311	Merge branch 'develop' into planning	2021-03-24 15:12:04 +05:30
rohitwaghchaure	3c490088c4	Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre fix: repost not completed backdated transactions	2021-03-24 12:38:42 +05:30
Ishan Loya	de774ae080	Correct state code for 'Other Territory' Corrects state code for 'Other Territory' to match e-invoicing state codes list. Attempts to fix #24992	2021-03-24 12:30:51 +05:30
Rohit Waghchaure	9165327cf6	fix: repost not completed backdated transactions	2021-03-24 11:32:26 +05:30
rohitwaghchaure	575f8f226b	fix: repost not completed backdated transactions (#24980 )	2021-03-24 11:30:53 +05:30
Deepesh Garg	734f5c2533	Merge pull request #24971 from deepeshgarg007/loan_security_shortfall_process_update fix: Pending shortfall update on processing loan security shortfall	2021-03-24 11:24:49 +05:30
Anupam Kumar	5ce0569f80	fix: validate_series (#24984 )	2021-03-23 21:13:41 +05:30
Anupam Kumar	5c172044d7	fix: validate_series (#24987 )	2021-03-23 21:13:06 +05:30
Deepesh Garg	d26ed25c3e	fix: Period list for exponential smoothing forecasting report (#24983 )	2021-03-23 21:11:06 +05:30
Deepesh Garg	82983369fa	fix: Period list for exponential smoothing forecasting report (#24982 )	2021-03-23 21:11:01 +05:30
Jannat Patel	d7b139182b	fix: serial no trim issue (#24981 ) * fix: serial no trim issue * fix: sider	2021-03-23 21:09:54 +05:30
Jannat Patel	12f0923a61	fix: serial no trim issue (#24949 ) * fix: serial no trim issue * fix: valid serial nos * fix: sider Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-03-23 21:09:49 +05:30
Afshan	02142c41bb	fix: validating party currency with doc currency (#24318 ) * fix: validating supplier currency * fix: compare current currency with company currency as well. * fix: replaced or with add in condition * fix: conditioning to get proper payment terms values Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-03-23 20:53:56 +05:30
Syed Mujeer Hashmi	f114da2f67	refactor: Make Discharge Schedule Date as Datetime (#24940 ) * refactor: Make Discharge Schedule Date as Datetime Like Admitted Datetime make discharge date as discharge datetime. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: Add patch for renaming discharge_date to discharge_datetime Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: quote style Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-03-23 17:48:25 +05:30
Anupam	940c75f8ac	fix: validate_series	2021-03-23 16:54:54 +05:30
Ankush Menat	2ba198576c	fix: set valuation rate for customer items to zero - In stock reconciliation always set valuation rate of customer provided items to zero during validation. - Let user know the valuation has been changed.	2021-03-23 14:03:09 +05:30
Ankush Menat	2a391298a7	test: customer item in stock reconciliation	2021-03-23 14:03:00 +05:30
Ankush Menat	6a534ea82b	fix: Allow zero valuation in stock reconciliation Stock reconciliation can not be done for customer provided item as they have zero valuation. This change adds a checkbox in item table to allow such items. Related issue: ISS-20-21-10248	2021-03-23 14:02:52 +05:30
Ankush Menat	e76ecb8f74	fix: set valuation rate for customer items to zero - In stock reconciliation always set valuation rate of customer provided items to zero during validation. - Let user know the valuation has been changed.	2021-03-23 13:01:21 +05:30
Ankush Menat	714b780868	test: customer item in stock reconciliation	2021-03-23 12:43:02 +05:30
pateljannat	453e07e32a	fix: exclude cancelled salary slips	2021-03-23 11:18:57 +05:30
Ankush Menat	762d6e38f7	fix: Allow zero valuation in stock reconciliation Stock reconciliation can not be done for customer provided item as they have zero valuation. This change adds a checkbox in item table to allow such items. Related issue: ISS-20-21-10248	2021-03-23 11:18:04 +05:30
Marica	e6ad39038e	chore: Allow changing Work Stations in WO. (#24897 )	2021-03-23 10:46:03 +05:30
Marica	4ccda9f799	chore: Allow changing Work Stations in WO. (#24898 )	2021-03-23 10:45:57 +05:30
Deepesh Garg	ad9b65fcf2	fix: TDS check getting checked after reload (#24972 )	2021-03-23 10:45:20 +05:30
Deepesh Garg	d1f15b2a88	fix: TDS check getting checked after reload (#24973 )	2021-03-23 10:45:06 +05:30
Rohit Waghchaure	bde159a77d	fix: total weight not set for free items	2021-03-22 23:36:48 +05:30
Deepesh Garg	48d5a65ef5	fix: Add test for pending shortfall update	2021-03-22 21:19:19 +05:30
Deepesh Garg	ea487b6c2e	Revert "fix: GSTR B2C report"	2021-03-22 20:54:07 +05:30
Deepesh Garg	f112ce14cf	fix: Pending shortfall update on processing loan security shortfall	2021-03-22 18:33:55 +05:30
Anupam	661b1e59c1	Merge branch 'develop' of https://github.com/frappe/erpnext into planning	2021-03-22 11:48:11 +05:30
Anupam	4980dd616b	fix: resolving commits	2021-03-22 11:23:47 +05:30
Anuja Pawar	c7c921495b	fix: payment reference on adding cost center in PE and Issue Summary Report error fixes (#24951 )	2021-03-22 11:21:15 +05:30
Rucha Mahabal	dffa647071	fix: membership renewal validation (#24963 ) (#24964 )	2021-03-20 22:24:55 +05:30
Rucha Mahabal	5e1cb5e4bc	fix: membership renewal validation (#24963 )	2021-03-20 22:22:01 +05:30
Sagar Vora	a85959f574	fix: remove unwanted parameter in calculate_rate_and_amount (#24883 ) * fix: remove unwanted parameter in calculate_rate_and_amount * fix: translation syntax	2021-03-20 16:37:33 +05:30
Walstan Baptista	22054044a3	test: created a new user to test warehouse user perms (#24954 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-20 16:35:14 +05:30
Jannat Patel	08855182a3	test: fix test_loan for payroll module (#24946 ) * test: fix test_loan for payroll module * fix: minor style changes	2021-03-19 16:34:14 +05:30
rohitwaghchaure	98a40d81d5	Merge pull request #24957 from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre fix: revert stock balance value calculation	2021-03-19 16:22:51 +05:30
rohitwaghchaure	081499c0c0	Merge pull request #24956 from rohitwaghchaure/revert-stock-balance-value-calculation-develop fix: revert stock balance value calculation	2021-03-19 16:22:13 +05:30
Rohit Waghchaure	67d94ac0cc	fix: revert stock balance value calculation	2021-03-19 16:21:30 +05:30
Rohit Waghchaure	f21a55c8ef	fix: revert stock balance value calculation	2021-03-19 16:19:34 +05:30
Deepesh Garg	23af1ed372	Merge pull request #24947 from deepeshgarg007/multi_currency_lcv_issues_v13 fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:21:57 +05:30
Deepesh Garg	b75cbeee4d	fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:20:44 +05:30
Deepesh Garg	9b0a9cc2c0	Merge pull request #24912 from deepeshgarg007/multi_currency_lcv_issues fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:20:06 +05:30
Deepesh Garg	adcf9a42bd	Merge pull request #24916 from deepeshgarg007/nil_exempt_gstr_3b fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-18 21:02:51 +05:30
Deepesh Garg	a5de22cb8e	Merge pull request #24918 from deepeshgarg007/nil_exempt_gstr_3b_v13 fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-18 21:02:41 +05:30
Walstan Baptista	6df61d217f	test: created a new user to test child perms (#24943 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-18 19:23:59 +05:30
Sagar Vora	6ac11a04b0	test: added warehouse for TCS Item as it is a Stock Item (#24942 )	2021-03-18 18:07:21 +05:30
Sagar Vora	8ee1146f72	test: add stock to avoid NegativeStockError (#24941 )	2021-03-18 17:45:25 +05:30
Afshan	a04091aaf7	fix: exclude current doc while validation. (#24914 )	2021-03-18 16:40:43 +05:30
Sagar Vora	b134b89fb0	test: fix NegativeStockError (#24936 )	2021-03-18 16:36:40 +05:30
pateljannat	a2068d9b98	feat: profitability report	2021-03-18 15:25:22 +05:30
Sagar Vora	78e576ee6a	fix: default total_estimated_cost to zero (#24939 ) Co-authored-by: walstanb <walstanb@gmail.com>	2021-03-18 15:23:52 +05:30
Ankush Menat	c0a9c391eb	fix: hide alt tag if item is not shown in website	2021-03-18 14:07:24 +05:30
Deepesh Garg	d39055785a	Merge pull request #24934 from Anuja-pawar/fix_report_issue_summary fix: Report Issue Summary fix for zero issues	2021-03-18 12:24:43 +05:30
Anuja Pawar	9bf1083d9e	fix: payment references from disappearing on selecting cost center (#24831 ) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-03-18 11:22:24 +05:30
Rushabh Mehta	14c3c5172d	fix(minor): rearrange the cards on home workspace	2021-03-18 10:45:38 +05:30
Anuja P	2c8a38d9fa	fix: report issue summary fix for zero issues	2021-03-18 10:36:46 +05:30
Sagar Vora	500f54e515	test: fix shift type not found (#24929 )	2021-03-17 23:25:04 +05:30
Sagar Vora	52bbd4e182	test: clear Leave Period before running Leave Allocation tests (#24928 )	2021-03-17 22:37:59 +05:30
Sagar Vora	7645315424	test: set correct qty when creating subcontract transfer entry (#24903 )	2021-03-17 20:01:21 +05:30
Sagar Vora	95e9b2fd6e	refactor(payroll): simplified logic for additional salary (#24907 )	2021-03-17 19:58:56 +05:30
Sagar Vora	f4a6c7823a	test: create new item instead of using _Test Item to prevent error (#24915 )	2021-03-17 19:57:53 +05:30
Sagar Vora	cf3fc99b12	test: fix salary component not found; other optimisation (#24920 )	2021-03-17 19:54:08 +05:30
Rucha Mahabal	bacfaa4396	fix: calculate 80g certificate amount on validate for memberships (#24925 ) (#24926 )	2021-03-17 19:51:59 +05:30
Rucha Mahabal	cbd67e662f	fix: calculate 80g certificate amount on validate for memberships (#24925 )	2021-03-17 19:49:27 +05:30
Anurag Mishra	abf974daee	fix: precision and formated document	2021-03-17 18:55:04 +05:30
Rohit Waghchaure	77add49c6a	fix: don't club same free item	2021-03-17 18:49:54 +05:30
Deepesh Garg	438d9cad90	fix: Remove print statement	2021-03-17 18:04:05 +05:30
Deepesh Garg	f9519c7e13	fix: Group nil exempted and non gst items separately	2021-03-17 18:03:58 +05:30
Deepesh Garg	f9f0e347ed	fix: Remove print statement	2021-03-17 18:03:17 +05:30
Deepesh Garg	084ec9773e	fix: Group nil exempted and non gst items separately	2021-03-17 18:00:08 +05:30
Anurag Mishra	23b6294f5c	Merge pull request #24842 from resilient-tech/allow-duplicate-additional fix(payroll): allow duplicate additional salaries	2021-03-17 17:39:52 +05:30
Deepesh Garg	a5987782bd	fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-17 15:49:44 +05:30
Deepesh Garg	56c20fb79f	fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-17 15:47:03 +05:30
Rohit Waghchaure	a9b1347600	fix: nonetype object has no attribute options	2021-03-17 14:30:34 +05:30
Rohit Waghchaure	ff70e61d7a	feat: recursive product discount	2021-03-17 14:30:34 +05:30
Deepesh Garg	22f5ff8492	fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-17 10:56:52 +05:30
Sagar Vora	68aaf12902	test: use _Test Company to avoid Holiday List error (#24902 )	2021-03-17 10:06:05 +05:30
Sagar Vora	bce904cf97	test: fix Employee Not Found errors (#24906 )	2021-03-17 10:03:30 +05:30
Sagar Vora	65d7f2c798	fix(Project): get correct holiday list when calculating dates; test fixes (#24901 )	2021-03-17 10:00:35 +05:30
Andy Zhu	6117ac5aff	fix: copy_parent_value_in_all_row function error	2021-03-17 13:53:02 +13:00
Anurag Mishra	8fbb043190	Merge pull request #24824 from resilient-tech/fix-salary refactor(payroll): simplified logic for additional salary	2021-03-16 21:42:10 +05:30
Rucha Mahabal	00cce433a5	fix(Non Profit): Membership and Donation API fixes (#24900 ) (#24905 ) * fix: Donation fixes - differentiate between subscription payment and payment - issue with donation amount * fix: existing membership validation * fix: ignore subscription payments while capturing donations	2021-03-16 20:52:53 +05:30
Rucha Mahabal	1482b2883f	fix(Non Profit): Membership and Donation API fixes (#24900 ) * fix: Donation fixes - differentiate between subscription payment and payment - issue with donation amount * fix: existing membership validation * fix: ignore subscription payments while capturing donations	2021-03-16 20:08:51 +05:30
prssanna	1cdef8bd97	style: missing semicolon	2021-03-16 15:39:16 +05:30
prssanna	b8b89a02af	fix: item variant dialog dropdown issue	2021-03-16 14:16:22 +05:30
prssanna	f1dbc021fc	fix: issue web list style	2021-03-16 14:15:59 +05:30
Deepesh Garg	d4a3cf1395	Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into add_account_method_v13	2021-03-16 13:24:33 +05:30
Deepesh Garg	635c480771	fix: Add method for regional round off account back	2021-03-16 13:22:20 +05:30
Afshan	46eb4b2f90	Merge branch 'develop' into settings_for_eanbling_leave_notificstion	2021-03-16 13:15:55 +05:30
Deepesh Garg	004f9e6b0c	fix: Add method for regional round off account back	2021-03-16 13:09:59 +05:30
Anurag Mishra	6bafbffee0	fix: added also for leave applier as requested	2021-03-16 13:01:39 +05:30
Anurag Mishra	54482fd83f	feat: added for disabling leave notification in HR settings	2021-03-16 13:01:39 +05:30
Rushabh Mehta	45735b35c4	fix(minor): login: set as Login to ERPNext	2021-03-16 12:22:31 +05:30
marination	dd7d71ca2e	fix: POS Opening Entry with empty balance detail rows	2021-03-16 12:05:37 +05:30
Rushabh Mehta	6ef213e5c6	fix(minor): patch add_state_code_for_ladakh	2021-03-16 11:59:54 +05:30
Marica	4d869906b6	Merge branch 'develop' into drop-shipping	2021-03-16 11:43:46 +05:30
Deepesh Garg	7f2e45e0f4	fix: Unequal debit and credit issue on RCM Invoice (#24838 ) * fix: Unequal debit and credit issue on RCM Invoice * fix: Travis	2021-03-15 18:04:47 +05:30
Deepesh Garg	93f925fb98	fix: Unequal debit and credit issue on RCM Invoice (#24836 ) * fix: Unequal debit and credit issue on RCM Invoice * fix: Travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-15 18:04:42 +05:30
Raffael Meyer	db24b13a7d	Merge branch 'develop' into improve_taxes_setup	2021-03-15 13:27:56 +01:00
Anurag Mishra	5e475f85b9	Merge branch 'develop' into suplier_portal_fixes	2021-03-15 16:21:55 +05:30
Raffael Meyer	6d5ea4cee8	Merge branch 'develop' into improve_taxes_setup	2021-03-15 11:40:39 +01:00
Rohit Waghchaure	00a0e8da10	fix: validation of job card in stock entry	2021-03-15 14:15:10 +05:30
Marica	3575314260	Merge branch 'develop' into drop-shipping	2021-03-15 12:53:45 +05:30
Marica	4ceea333a7	fix: POS Opening Entry with empty balance detail rows (#24876 )	2021-03-15 12:49:14 +05:30
Mohammad Hasnain Mohsin Rajan	46d5431bad	fix: Github Action not failing when tests fail (#24867 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-15 11:17:19 +05:30
Anupam Kumar	ed42afc5e8	feat: price margin in buying (#24685 )	2021-03-15 11:11:28 +05:30
Marica	5499401fcb	Merge branch 'develop' into drop-shipping	2021-03-15 11:09:04 +05:30
Deepesh Garg	a2e4564464	fix: Prevent non sequential repayment entries	2021-03-15 10:32:38 +05:30
Anupam	d8f7a75eae	feat: add total available stock field	2021-03-15 10:31:53 +05:30
Deepesh Garg	5165859e51	Merge pull request #24873 from GangaManoj/filter-bank-reconciliation fix(Bank Reconciliation Tool): Filter Bank Account drop-down list	2021-03-15 10:21:14 +05:30
Deepesh Garg	61fb9bf869	fix: Loan Repayment entry cancellation on salary slip cancel	2021-03-14 21:25:21 +05:30
Ganga Manoj	ca03997ab5	fix(Bank Reconciliation): Filter Bank Account drop-down list	2021-03-13 22:21:07 +05:30
Deepesh Garg	e196be4d8a	Merge pull request #24866 from resilient-tech/fix-test-import test: fix import_doc call in test_shopify_settings	2021-03-13 19:12:15 +05:30
Sagar Vora	c5869d5b47	test: fix import_doc call in test_shopify_settings	2021-03-12 16:21:45 +05:30
Marica	51c500d446	fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640 ) (#24864 ) Co-authored-by: casesolved-co-uk <richard@casesolved.co.uk>	2021-03-12 15:51:45 +05:30
Afshan	5d66a2b326	fix: added correct path in hooks (#24862 )	2021-03-12 15:51:34 +05:30
Afshan	9ab3bedd0a	fix: added correct path in hooks (#24865 )	2021-03-12 15:51:23 +05:30
marination	e685c787d2	fix: Sider (unused variables)	2021-03-12 14:24:09 +05:30
marination	86725a6580	fix: PO not created against all selected suppliers (drop shipping) - Return list of created POs instead of first doc - test case added	2021-03-12 14:12:46 +05:30
rohitwaghchaure	90ea17fbd6	Merge pull request #24825 from rohitwaghchaure/allow-to-set-item-in-batch-naming-pre fix: allow to select item code in batch naming	2021-03-12 11:52:43 +05:30
Sagar Vora	6727792aaf	test: fix syntax error	2021-03-11 18:12:01 +05:30
Raffael Meyer	fb68aba30d	Merge branch 'develop' into improve_taxes_setup	2021-03-11 13:17:44 +01:00
Sagar Vora	514122bf6f	refactor(payroll): simplified logic for additional salary	2021-03-11 17:22:11 +05:30
Nabin Hait	fe3529b194	fix: merge conflict	2021-03-11 16:45:41 +05:30
Nabin Hait	6e3668dc30	fix: merge conflict	2021-03-11 16:14:27 +05:30
Ankush Menat	2b61491adb	fix: use account_name only in consolidated report (#24840 ) Don't use account_number and only rely on account_name for preparing consolidated financial statement. Related issue: ISS-20-21-10217	2021-03-11 16:05:58 +05:30
Rucha Mahabal	0b29f87fa2	feat(Non Profit): 80G Certificates and Donations (#24848 ) * feat(Non Profit): 80G Certificates and Donations * fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)	2021-03-11 16:02:23 +05:30
Rucha Mahabal	d1e331f77f	fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849 )	2021-03-11 15:27:22 +05:30
Rucha Mahabal	be2c1fca7b	feat(Non Profit): 80G Certificates and Donations (#24657 ) * feat: 80G Certificates * feat: add non-profit custom fields for India * feat: 80G Certificate print format for memberships * feat: Donation doctype and API endpoint to capture donations via razorpay * chore: Rename Membership Settings to Non Profit Settings * chore: clean up Non Profit Settings - Rename fields, better labels - patch for renaming * feat: Webhook secret generation for Razorpay donations in Non-Profit Settings * feat: Payment Entry for donations - added Donor as Party Type - setting for automating payment entries for donations created via web form * fix: linter and sider issues * fix: translation syntax * feat: PAN Details custom field for Indian donors * feat: 80G certificates for Donations with Print Format * fix: sider * feat: validations for donor and donation - create donor for website user from donations - validate donor email * feat: extract member name from subscription notes * test: Donation * test: Tax Exemption 80G Certificate * chore: styling fixes * fix: tests * fix: sider * feat: extract PAN number from additional subscription notes * feat: Add creation user field in Non Profit Settings fix: Payment Entry not generating for memberships and donations * feat: update desk page * fix: tests	2021-03-11 13:19:44 +05:30
Marica	63eb6bdb3c	Merge pull request #24643 from CaseSolvedUK/sinvfix-v13 fix: Don't throw exception on invoice lines when there is no item_code	2021-03-11 10:47:24 +05:30
Sagar Vora	5822b6d76f	fix(payroll): allow duplicate additional salaries	2021-03-10 21:45:32 +05:30
casesolved-co-uk	a780306ec7	fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640 )	2021-03-10 15:50:45 +00:00
Anupam Kumar	6f0fabc54e	fix: gle issue in internal transfer(Purchase) (#24830 )	2021-03-10 18:36:46 +05:30
Ankush Menat	59fdee4dfa	Merge branch 'develop' into consolidated_report_acc_name_fix	2021-03-10 16:35:59 +05:30
Raffael Meyer	fbd810c2ae	Merge branch 'develop' into improve_taxes_setup	2021-03-10 11:38:52 +01:00
Rucha Mahabal	c7fff34cf5	fix(travis): Customer Testcase Failing (#24833 )	2021-03-10 15:51:44 +05:30
Ankush Menat	000fa824d3	fix: use account_name only in consolidated report Don't use account_number and only rely on account_name for preparing consolidated financial statement. Related issue: ISS-20-21-10217	2021-03-10 15:23:48 +05:30
rohitwaghchaure	a0e7787f7b	fix: removed show cancelled entries checkbox from the stock ledger report (#24826 )	2021-03-10 13:46:42 +05:30
Anupam Kumar	77eaf2939a	fix: rate of stock uom division by zero error (#24829 )	2021-03-10 12:04:54 +05:30
Raffael Meyer	20cc2bb0d8	fix: autoname for Item Tax Template * fix: autoname for Item Tax Template Use title + company abbreviation instead of just title. * fix: test records of Item Tax Template * fix: rename item tax templates in test records * Revert "fix: test records of Item Tax Template" This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1. * fix: rename hardcoded item tax templates in tests * fix: rename hardcoded Item Tax Templates in tests (2) * fix: delete Item Tax Template with company	2021-03-10 10:24:43 +05:30
Marica	6ccd64c2ec	Merge pull request #24464 from sgtpepper9907/feat-make-patient-age-translateable feat: Make patient age translateable	2021-03-10 10:15:38 +05:30
Afshan	0623a34210	fix: added supplier warehouse field back again (#24827 )	2021-03-10 09:46:38 +05:30
David Angulo	fe0f46c5b3	fix sider	2021-03-09 13:28:08 -06:00
David Angulo	06e99dfe7b	fix sider	2021-03-09 13:23:48 -06:00
David Angulo	358153b04b	fix sider	2021-03-09 13:19:12 -06:00
Francisco Roldán	894cff5aa4	fix: lms program and index missing context variables when is no data available (#24828 ) * fix: program and index * fix: moved default value to get_course_progress	2021-03-09 23:35:24 +05:30
Afshan	27bcb2a064	fix: renamed "supplier_warehouse" to "set_from_warehouse" (#24816 ) * fix: reverting and adding new field for supplier warehouse	2021-03-09 22:25:48 +05:30
Anupam Kumar	832098f042	fix: In-Transit Feature enhancements (#24652 )	2021-03-09 21:14:25 +05:30
Syed Mujeer Hashmi	ec829786e9	fix: Add student category to student applicant (#24779 ) * fix: Add student category to student applicant Student category will be automatically fetched during program enrollment while importing students into the system. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: Allow student category during program enrollment Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2021-03-09 21:04:55 +05:30
Rohan	db2d196296	fix: do not send emails to disabled users from Employee Onboarding (#24795 )	2021-03-09 21:03:45 +05:30
Rohit Waghchaure	535406cb0c	fix: allow to select item code in batch naming	2021-03-09 21:01:12 +05:30
Jannat Patel	d7ac2394e8	fix: error in bulk attendance (#24806 ) * fix: error in bulk attendance * fix: no date selected scenario * fix: translation and sider	2021-03-09 20:41:58 +05:30
Sagar Vora	78777d6ed4	fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From (#24756 ) Co-authored-by: walstanb <walstanb@gmail.com>	2021-03-09 20:35:08 +05:30
Afshan	e314b8b209	fix: general ledger report (#24770 )	2021-03-09 20:31:57 +05:30
Afshan	9f6015a4e9	fix: batch no in POS (#24771 ) * fix: batch no in list * fix: check for batch no to be list	2021-03-09 20:31:14 +05:30
Shariq Ansari	261c42186f	fix: updating phone icon setup logic for readonly fields (#24787 ) * fix: updating phone icon setup logic for readonly fields * fix: sider fix	2021-03-09 20:28:00 +05:30
Jannat Patel	fa73074250	fix: salary structure assign to employee (#24798 ) * fix: salary structure assign to employee * fix: pass data from dialog	2021-03-09 20:27:29 +05:30
Raffael Meyer	79b5be1830	fix: Group German VAT Accounts (#24804 ) * fix: group account for tax assets and liabilities (germany) * fix: spacing	2021-03-09 20:26:43 +05:30
Deepesh Garg	06a6ee37cb	fix: Ignore mandatory fields in opening invoice via Opening Invoice Creation tool (#24821 )	2021-03-09 20:23:26 +05:30
Deepesh Garg	47c6d2e00f	Merge pull request #24814 from AfshanKhan/fix-tds-computation-summary fix: sending proper arguments for TDS Computation Summary report	2021-03-09 20:01:30 +05:30
Deepesh Garg	6249798d84	Merge pull request #24801 from ankush/dont_update_pe_title fix: do not update PE title during data import	2021-03-09 19:47:21 +05:30
Deepesh Garg	79005a4a76	Merge pull request #24820 from resilient-tech/fix-company-breadcrumbs fix: breadcrumbs for company	2021-03-09 19:46:39 +05:30
Marica	e1ee9034ef	Merge branch 'develop' into item-attribute-fix	2021-03-09 18:35:44 +05:30
Marica	5accf8adf5	Merge branch 'develop' into salary_slip_error	2021-03-09 18:20:54 +05:30
Ankush Menat	9b4e5bfa87	chore: improve error message for missing fields.	2021-03-09 13:59:14 +05:30
Marica	5471265f92	Merge branch 'develop' into patch-6	2021-03-09 13:32:23 +05:30
walstanb	be98ee26cd	fix: breadcrumbs for company	2021-03-09 13:03:52 +05:30
Marica	baa406e99f	Merge pull request #24794 from alyf-de/set_value_instead_of_sql fix: use set_value instead of sql	2021-03-09 11:54:31 +05:30
barredterra	99c8b8efcf	Merge branch 'develop' into improve_taxes_setup	2021-03-08 20:00:59 +01:00
barredterra	ebd1d08e55	refactor: taxes setup Better structure of input data.	2021-03-08 19:53:50 +01:00
Afshan	d1fb363a37	Merge branch 'develop' into fix-tds-computation-summary	2021-03-08 22:50:04 +05:30
Afshan	d95b59e90c	fix: call function when arguments available	2021-03-08 18:19:53 +05:30
Ankush Menat	afc766bbf1	Merge branch 'develop' into dont_update_pe_title	2021-03-08 15:44:15 +05:30
Ankush Menat	5571b988dd	fix: make title field read only	2021-03-08 15:43:03 +05:30
Ankush Menat	cc46866cd9	fix: do not update PE title during data import Related issue: ISS-20-21-10132	2021-03-08 15:42:39 +05:30
Afshan	1002e36c53	fix: removed unused import	2021-03-08 14:39:19 +05:30
Afshan	fa932e2a3e	fix: sending proper arguments for report	2021-03-08 14:36:40 +05:30
Deepesh Garg	48b0f0da96	Merge pull request #24776 from ankush/gst_invoice_validation fix: Add warning for invalid GST invoice numbers	2021-03-07 18:09:00 +05:30
Rohit Waghchaure	4c089b5852	minor fixes	2021-03-07 12:17:59 +05:30
Deepesh Garg	45870317f2	Merge pull request #24797 from UrvashiKishnani/patch-1 fix: total row in AR/AP summary report	2021-03-06 21:28:04 +05:30
Saqib	92b0691c68	fix: einvoice button visiblity condition (#24800 )	2021-03-06 19:00:08 +05:30
Deepesh Garg	36a0085905	Merge pull request #24799 from danielchalmers/patch-8 fix: typo in Charts of Account doctype	2021-03-06 13:11:26 +05:30
Deepesh Garg	3e0a9383b4	Merge pull request #24789 from ankush/track_settings fix: track setting changes	2021-03-06 13:09:58 +05:30
Saurabh	202ef92fa1	Merge branch 'version-13-beta-pre-release' into version-13-beta	2021-03-05 09:34:01 +05:30

... 17 18 19 20 21 ...

27743 Commits