35348 Commits

Author	SHA1	Message	Date
Nabin Hait	2b8c39eee9	fix: account closing balance patch	2023-05-17 22:05:46 +05:30
Sagar Sharma	fcea907cf9	Merge branch 'develop' into FIX-35014	2023-05-17 16:09:21 +05:30
Sagar Sharma	9fb8b1827d	fix: Pick List Status	2023-05-17 16:07:58 +05:30
Ankush Menat	e5c86bc2e8	fix: consider 0 if rate/qty are null (#35338) ... [skip ci]	2023-05-17 16:04:49 +05:30
Sagar Sharma	adf2474d9d	fix(ux): SCR consumed-qty read-only property	2023-05-17 15:12:47 +05:30
ruthra kumar	84b7c1bba0	fix: tds incorrectly calculated for invoice that are below threshold ... Two purchase invoices for the same supplier, using different tax withholding categories have this issue. | Category | single | cumulative | |----------+--------+------------| | cat1 | 100 | 500 | | cat2 | 1000 | 5000 | 1. PINV1 of net total: 105/- uses cat1. TDS is calculated as it breached single threshold 2. PINV2 of net total: 200/- uses cat2. TDS incorrectly calculated as PINV1 already has TDS calculated and 'consider_party_ledger_amount' is enabled.	2023-05-17 13:55:41 +05:30
Sagar Sharma	42804306fd	Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS	2023-05-17 13:17:59 +05:30
ruthra kumar	e927f6cab1	Merge pull request #35239 from ashish-greycube/patch-8 ... fix: in payment_entry difference amount cal is broken	2023-05-17 10:25:55 +05:30
ruthra kumar	0da6c1688b	fix: unable to create partial invoice with auto fetch terms enabled (#35285) ... fix: fetch so/po terms if auto fetch is enabled	2023-05-16 18:57:42 +05:30
rohitwaghchaure	96e6014d12	Merge pull request #35328 from rohitwaghchaure/fixed-create-reposting-entry-for-cancelled-documents ... fix: force to do reposting for cancelled document	2023-05-16 17:31:45 +05:30
Ashish Shah	ae4e56747c	refactor: use 'flt' for base_total_taxes_and_charges ... difference_amount calculation is broken, as calculation gives NaN. Fix is make frm.doc.base_total_taxes_and_charges as flt(frm.doc.base_total_taxes_and_charges)	2023-05-16 16:55:11 +05:30
Rohit Waghchaure	6e661e7c0e	fix: force to do reposting for cancelled document	2023-05-16 16:23:52 +05:30
ruthra kumar	776a83066d	fix: cancelled vouchers in tax withheld vouchers list (#35309)	2023-05-16 15:54:46 +05:30
Ankush Menat	5574d9a72d	fix(UX): misc "home" onboarding improvements (#35319) ... * fix(UX): cleanup "Home" onboarding - Remove company, letterhead, data import etc from home onboarding step * fix(UX): Show quick entry for item * chore: fix copy here and there	2023-05-16 13:38:55 +05:30
Rucha Mahabal	9feda1b829	perf: cache and simplify queries for holiday list (#35315)	2023-05-16 13:11:47 +05:30
rohitwaghchaure	5c2d7701ea	Merge pull request #35312 from rohitwaghchaure/fixed-item-list-view-not-working ... fix: item list view not working	2023-05-16 01:09:44 +05:30
Rohit Waghchaure	0489e30244	fix: item list view not working	2023-05-16 00:48:52 +05:30
rohitwaghchaure	8afbb06a33	Merge branch 'develop' into FIX-ISS-23-24-00368	2023-05-15 13:42:20 +05:30
Wolfram Schmidt	c236979508	fix: Update de.csv (#35278) ... added many fixes on the base of 'No' which is often wrongly translated to 'Kein'. Also removed translation of Naming Seris like ACC-INV-.YYYY.- to ACC-INV-.YYYY.-	2023-05-15 13:25:23 +05:30
Smit Vora	2a609616d9	fix: port option for additional_conditions in item wise sales register (#35187) ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-05-15 13:24:39 +05:30
vishnu	f2ceb00379	fix: Creating landed cost voucher from connections	2023-05-14 09:35:38 +00:00
Indrajith.vs	0c8276ec82	fix: sales person allocated amount calculation error nonetype and float (#35293) ... fix: sales person allocated amount calculation error nontype and float	2023-05-14 11:47:46 +05:30
Raffael Meyer	870b02b03c	fix: allow over-payment against SO (#35079)	2023-05-14 08:59:58 +05:30
Daizy Modi	19cd687784	fix: function batch_no should only be declared once (#35115) ... fix: remove twice event call of `batch_no` to update batch qty	2023-05-14 08:56:25 +05:30
Kevin Shenk	26c5cfabdc	feat: copy project from timesheet to invoice (#35146) ... copy project from timesheet to invoice	2023-05-14 08:49:28 +05:30
HarryPaulo	e12e3bb012	fix: allow search leads by doctype search fields ... * fix: allow search leads by doctype search fields * fix: allow search leads by doctype search fields, linters fix	2023-05-14 08:08:47 +05:30
Phanupong Janthapoon	2b59a95162	fix: share_transfer display wrong currency symbo ... In multi-companies setting, on amount and rate field of Share Transfer doctype are displaying wrong currency symbol, when create a Share Transfer of others company that has different currency than the main company. This due to the lack of `options` on those fields. To fix this, add `options` to `amount` and `rate` fields.	2023-05-14 08:06:58 +05:30
Rohit Waghchaure	38aaba5720	fix: inventory dimension for inter company transfer return use case	2023-05-13 13:00:05 +05:30
Sagar Sharma	81a57e4e41	Merge branch 'develop' into stock-reservation	2023-05-13 09:44:06 +05:30
Sagar Sharma	9b617cc062	Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS	2023-05-13 09:43:54 +05:30
Sagar Sharma	e17eeec619	Merge branch 'develop' into FIX-ISS-23-24-00368	2023-05-13 09:43:44 +05:30
Sagar Sharma	88ab075b11	Merge branch 'develop' into FIX-35272	2023-05-13 09:33:25 +05:30
Rohit Waghchaure	6798b900ef	fix: inventory dimension for material transfer not working	2023-05-13 01:44:06 +05:30
Sagar Sharma	4aff3c9a50	Merge branch 'develop' into FIX-35272	2023-05-12 15:06:47 +05:30
Sagar Sharma	d16caa2d2c	fix: add missing options for Content Align	2023-05-12 15:06:03 +05:30
rohitwaghchaure	0723fbc108	Merge pull request #35273 from rohitwaghchaure/fixed-incorrect-packing-list ... fix: incorrect packing items	2023-05-12 14:42:57 +05:30
Rohit Waghchaure	a686b8c337	fix: incorrect packing items	2023-05-12 14:12:29 +05:30
rohitwaghchaure	46a2bd8986	Merge pull request #35268 from rohitwaghchaure/fixed-incorrect-bom-filter-issue ... fix: BOM item filter issue	2023-05-12 13:09:57 +05:30
Rohit Waghchaure	2879cb7c28	fix: bom item filter issue	2023-05-12 13:08:37 +05:30
rohitwaghchaure	4aa1508f04	Merge pull request #35261 from rohitwaghchaure/fixed-timeout-error-for-stock-entry-more-than-6-mmoths ... fix: enqueue submit/cancel action for stock entry to avoid time out error	2023-05-12 12:32:33 +05:30
Nabin Hait	ca8b587730	Merge pull request #35178 from nabinhait/account-closing-balance-patch ... fix: account closing balance patch	2023-05-12 12:07:45 +05:30
Sagar Sharma	b22f9a234b	Merge branch 'develop' into FIX-ISS-23-24-00368	2023-05-12 11:55:12 +05:30
Sagar Sharma	9c72c2a6cb	refactor: use calculate_items_qty_and_amount() to update scr items rate	2023-05-12 11:50:27 +05:30
Sagar Sharma	d6433f803b	refactor(minor): rename function to be more descriptive	2023-05-12 11:45:33 +05:30
Sagar Sharma	46c1bef446	Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS	2023-05-12 11:06:00 +05:30
Rohit Waghchaure	2d6f112727	fix: test case	2023-05-12 10:51:14 +05:30
Rohit Waghchaure	7a3801578c	fix: enqueue submit/cancel action for stock entry to avoid time out error	2023-05-11 23:20:12 +05:30
Nabin Hait	f5cc41e182	fix: account closing balance patch	2023-05-10 16:41:47 +05:30
Ankush Menat	2ea38333f0	refactor: use job_id instead of job_name (#35242) ... depends on https://github.com/frappe/frappe/pull/20951	2023-05-10 13:26:10 +05:30
rohitwaghchaure	5d43b35d20	Merge pull request #35230 from rohitwaghchaure/fixed-serial-no-issue-stock-reco ... fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too Long error	2023-05-09 19:54:24 +05:30
rohitwaghchaure	bf29ec4341	Merge pull request #35227 from rohitwaghchaure/fixed-do-not-include-manufacturing-item ... fix: non manufacturing items/fixed asset items in BOM	2023-05-09 18:47:36 +05:30
Rohit Waghchaure	1a673fd424	fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too long error	2023-05-09 18:45:19 +05:30
ruthra kumar	b8971c7add	Merge pull request #35216 from rtdany10/broken-empty-row-save ... fix: broken save on empty row existance	2023-05-09 18:31:17 +05:30
Rohit Waghchaure	aba8431d70	fix: non manufacturing items/fixed asset items in BOM	2023-05-09 16:48:30 +05:30
rohitwaghchaure	d5f123f2e1	Merge pull request #35220 from rohitwaghchaure/fixed-performance-issue-for-ste-mr ... fix: added search index to improve performance	2023-05-09 14:33:56 +05:30
Rohit Waghchaure	80ea22b56c	fix: added search index to improve performance	2023-05-09 12:42:17 +05:30
ruthra kumar	afe9d7614b	Merge pull request #35212 from ruthra-kumar/chore_change_throw_to_msgprint ... chore: convert throw to msgprint in payment reconciliation job hook	2023-05-08 17:57:13 +05:30
Dany Robert	d9b231aa16	fix: broken save on empty row existance	2023-05-08 12:26:47 +00:00
Anand Baburajan	5a3acab110	fix: handle empty FBs properly in TB and GL [develop] (#35190) ... fix: handle empty FBs properly in TB and GL	2023-05-08 16:54:00 +05:30
Sagar Sharma	12785101d9	Merge branch 'develop' into stock-reservation	2023-05-08 16:47:40 +05:30
Sagar Sharma	2e9278ef90	Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS	2023-05-08 16:47:30 +05:30
ruthra kumar	73134d57bf	chore: convert throw to msgprint	2023-05-08 16:42:12 +05:30
ruthra kumar	446f3d12eb	Merge pull request #35153 from ruthra-kumar/fetch_sales_team_from_customer_master ... fix: fetch default sales team on Quotation -> Sales Order creation	2023-05-08 14:19:28 +05:30
ruthra kumar	6315d9f836	Merge pull request #35142 from ruthra-kumar/fix_bypass_check_in_customer_group ... fix: ineffective bypass flag for Credit Limit in Customer Group	2023-05-08 14:10:31 +05:30
ruthra kumar	34a5f24026	Merge pull request #35186 from ruthra-kumar/child_account_should_inherit_parent_account_currency ... fix: child acc will inherit acc currency if explicitly specified	2023-05-08 14:09:46 +05:30
ruthra kumar	f6ea8fd8d7	test: currency inheritance on child accounts	2023-05-08 13:30:39 +05:30
rohitwaghchaure	ecc80a8504	Merge pull request #34998 from Vishnu7025/develop ... fix: update workstation hour rate when workstation change in job card	2023-05-08 09:25:38 +05:30
rohitwaghchaure	328c3369a2	Merge pull request #35200 from rohitwaghchaure/fixed-accepted-warehouse-and-supplier-warehouse-issue ... fix: error regarding accepted and supplier warehouse	2023-05-08 09:23:54 +05:30
Rohit Waghchaure	15f5f98858	fix: error regarding accepted and supplier warehouse	2023-05-07 20:27:17 +05:30
rohitwaghchaure	530edaf3d1	Merge branch 'develop' into develop	2023-05-07 19:58:42 +05:30
rohitwaghchaure	40e3747b93	Merge branch 'develop' into fixed-order-of-reposting-entry	2023-05-07 01:39:23 +05:30
Ritwik Puri	140cec8eb2	Merge branch 'develop' into fix-incorrect-fg-item-qty-in-job-po	2023-05-06 22:49:09 +05:30
Rohit Waghchaure	af16fbb0a3	fix: incorrect fg item quantity in subcontracted PO	2023-05-06 20:30:53 +05:30
Rohit Waghchaure	c8a4791d9b	fix: pick the in progress reposting entries first	2023-05-06 20:09:15 +05:30
Deepesh Garg	23e7c1480f	Merge pull request #34897 from barredterra/fix-translation-files ... fix: translation files	2023-05-06 18:24:50 +05:30
ruthra kumar	abe691c03d	fix: child acc will inherit acc currency if explicitly specified	2023-05-06 10:40:41 +05:30
Hossein Yousefian	27d71e9ec1	Merge branch 'develop' into get_incoming_rate_v14_fix	2023-05-06 08:12:36 +03:30
Nabin Hait	713fa67b96	fix: account closing balance patch	2023-05-05 17:54:34 +05:30
Rohit Waghchaure	8167b24219	fix: not allow to transfer excess materials against the job card	2023-05-04 18:24:16 +05:30
rohitwaghchaure	3993bfd510	Merge pull request #35161 from rohitwaghchaure/configure-notify-reposting-role ... feat: configuration to notify reposting errors to specific role	2023-05-04 17:35:14 +05:30
rohitwaghchaure	2bf771683c	Merge pull request #35158 from rohitwaghchaure/fixed-internal-trasfer-condition ... fix: internal transfer condition	2023-05-04 17:01:58 +05:30
Rohit Waghchaure	c7b62011db	feat: configuration to notify reposting errors to specific role	2023-05-04 16:49:14 +05:30
Rohit Waghchaure	b5a2ccf21d	fix: internal transfer condition	2023-05-04 15:38:35 +05:30
Sagar Sharma	e0b22edb2e	test: add test case	2023-05-04 15:07:52 +05:30
ruthra kumar	4d31436917	fix: fetch default sales team on Quotation -> Sales Order creation	2023-05-04 10:45:22 +05:30
Raffael Meyer	9fd0091b60	Merge branch 'develop' into fix-translation-files	2023-05-04 00:26:01 +02:00
rohitwaghchaure	bea8f481b4	Merge pull request #35148 from rohitwaghchaure/fixed-extra-job-card-quantity-issue ... fix: over production percentage not considered in validation	2023-05-04 00:13:53 +05:30
Rohit Waghchaure	a84d0af81e	fix: over production percentage not considered in validation	2023-05-03 23:22:59 +05:30
rohitwaghchaure	dfee45f7ae	Merge pull request #35144 from rohitwaghchaure/feat-reserved-qty-for-production-plan-in-bin ... feat: reserve qty against production plan raw materials in BIN	2023-05-03 22:24:05 +05:30
Rohit Waghchaure	06e91e758f	feat: reserve qty against production plan raw materials in BIN	2023-05-03 18:21:23 +05:30
ruthra kumar	f9a4972cb6	fix: bypass flag in Customer Group wasn't effective	2023-05-03 16:40:38 +05:30
s-aga-r	7548bb3fbe	Merge branch 'develop' into stock-reservation	2023-05-03 12:06:11 +05:30
Sagar Sharma	6bcda38415	Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS	2023-05-03 12:01:46 +05:30
s-aga-r	a6cb6c6f47	fix: recalculate costs in SCR while reposting	2023-05-03 11:33:52 +05:30
Anand Baburajan	6864b11f83	fix: handle finance book properly in trial balance and general ledger (#35085) ... * fix: get default fb properly and handle different fb and default fb case * chore: minor UX improvement * fix: handle FBs properly in general ledger	2023-05-02 20:58:22 +05:30
Sagar Sharma	862041dc0e	Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS	2023-05-02 19:11:33 +05:30
Vishnu VS	536473a484	Merge branch 'develop' into develop	2023-05-02 17:42:41 +05:30
ruthra kumar	7e24215b3a	Merge pull request #35107 from ruthra-kumar/fix_incorrect_paid_amount_if_bank_cash_account_missing ... fix: incorrect paid_amount and exchange rate in Payment Entry	2023-05-02 15:07:36 +05:30
ruthra kumar	1d70183d8c	Merge pull request #35091 from ruthra-kumar/cost_center_allocation_splits_roundoff ... refactor: button to toggle parent doc cost center preference for rounding adjustment amount	2023-05-02 14:07:22 +05:30
ruthra kumar	8f2302a7bf	Merge pull request #35061 from ruthra-kumar/refactor_pe_dont_book_gain_loss_for_sales_purchase_orders ... refactor: don't book exchange gain/loss for sales/purchase orders	2023-05-02 14:03:17 +05:30
rohitwaghchaure	9aa646512a	Merge pull request #35123 from rohitwaghchaure/fixed-performance-issue-delivery-note ... fix: timeout error while submitting delivery note	2023-05-01 23:30:14 +05:30
Rohit Waghchaure	2d5ccc07b1	fix: timeout error while submitting delivery note	2023-05-01 21:17:18 +05:30
rohitwaghchaure	a10aab35ff	Merge pull request #35118 from rohitwaghchaure/fixed-don-not-allow-to-repost-valuation ... fix: don't allow to make reposting for the closed period	2023-05-01 20:41:14 +05:30
mergify[bot]	49674585a5	fix: handle expected_value_after_useful_life properly in asset value adjustment (backport #35117) (#35119) ... fix: handle expected_value_after_useful_life properly in asset value adjustment (#35117) (cherry picked from commit 80230fec3ef079b75825447a61836f8a9ce64f57) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-05-01 19:59:58 +05:30
Rohit Waghchaure	f751727149	fix: don't allow to make reposting for the closed period	2023-05-01 18:48:29 +05:30
ruthra kumar	ce4e18c8d2	test: Sales/Purchase Orders will not book Exchange gain/loss	2023-05-01 14:09:19 +05:30
ruthra kumar	effb34bbfa	refactor: don't book exch gain/loss for sales/purchase orders	2023-05-01 14:08:30 +05:30
Deepesh Garg	ea0b03ae9e	fix: Updates in process statement of Accounts (#35064)	2023-05-01 13:09:47 +05:30
ruthra kumar	092c4b4c58	refactor: simplify group by invoice logic	2023-05-01 11:53:43 +05:30
Deepesh Garg	64be694087	fix: Patch for posting closing balances (#35037)	2023-05-01 10:56:46 +05:30
Deepesh Garg	f3b3dabb9a	fix: Naming series error in Journal Entry template (#35084)	2023-05-01 10:50:51 +05:30
Sagar Sharma	424bd701f3	Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS	2023-05-01 08:05:18 +05:30
s-aga-r	bbcb65894b	refactor: use get_product_bundle_list() to get all product bundle at once	2023-05-01 08:04:03 +05:30
s-aga-r	ba61292dfc	test: add test case for packed qty validation on DN submit	2023-05-01 07:25:36 +05:30
ruthra kumar	123355392b	fix: incorrect paid_amount and exchange rate in PE ... If Company master has no default cash or bank account set but Party has default company bank account set. In this case, paid_amount and conversion rate are not calculated correctly	2023-04-30 08:36:56 +05:30
Vishnu VS	9fd7a05b40	Merge branch 'develop' into develop	2023-04-29 21:02:54 +05:30
s-aga-r	699532647d	refactor: validate_packed_qty()	2023-04-28 23:03:33 +05:30
s-aga-r	b0eb9ea7bd	refactor(minor): use set_onload to get unpacked items details	2023-04-28 22:47:27 +05:30
s-aga-r	7742c592c5	test: add test cases for Packing Slip	2023-04-28 21:51:15 +05:30
s-aga-r	da00fc0f16	fix(ux): don't show Create > Packing Slip button if items are already packed	2023-04-28 18:28:28 +05:30
s-aga-r	8d1bccada4	fix(ux): remove Get Items button from Packing Slip	2023-04-28 18:02:24 +05:30
s-aga-r	e75aa4e291	fix(ux): get items on selecting DN in Packing Slip	2023-04-28 17:59:34 +05:30
s-aga-r	269cc96c41	refactor: move js validations to py	2023-04-28 17:47:36 +05:30
s-aga-r	90701c7ae9	fix: validate Packing Slip Item Qty with DN Items	2023-04-28 17:05:51 +05:30
rohitwaghchaure	35ee8d19b0	Merge pull request #35092 from rohitwaghchaure/fixed-reserved-qty-issue-for-dn ... fix: not able to create delivery note from sales order	2023-04-28 16:02:35 +05:30
s-aga-r	9e5b102768	fix: make DN item reference mandatory for Packing Slip Item	2023-04-28 15:41:59 +05:30
s-aga-r	372bce4567	fix: Packing Slip Item Qty	2023-04-28 15:26:02 +05:30
Rohit Waghchaure	bdf2f7416a	fix: not able to create delivery note from sales order	2023-04-28 15:16:02 +05:30
s-aga-r	0add90e7ec	chore: enable no_copy for dn_detail and pi_detail in Packing Slip Item	2023-04-28 15:05:28 +05:30
s-aga-r	77f1e8ce78	fix: update Packed Qty in DN on submit and cancel of Packing Slip	2023-04-28 15:04:41 +05:30
ruthra kumar	4ccce93394	refactor: checkbox to toggle parent doc cost center preference	2023-04-28 14:20:50 +05:30
ruthra kumar	0f3b06cc8a	refactor: checkbox in Sales Invoice	2023-04-28 14:20:50 +05:30
ruthra kumar	ebe6787510	refactor: checkbox to toggle parent doc cost center preference	2023-04-28 14:20:48 +05:30
Vishnu VS	bb13c236b9	Merge branch 'develop' into develop	2023-04-28 14:06:12 +05:30
ruthra kumar	b44331c981	refactor: checkbox in purchase invoice	2023-04-28 14:06:04 +05:30
s-aga-r	e6fc281acf	feat: add field Packed Qty in Delivery Note Item and Packed Item	2023-04-28 13:20:47 +05:30
s-aga-r	75fe9dd3ea	fix: don't map items twice ... * don't explicitly map Delivery Note Item custom fields to Packing Slip Item, get auto-mapped while mapping the doc. * call Packing List `set_missing_values` after mapping the doc. * refactor `get_recommended_case_no`, use `frappe.db.get_value` instead of `frappe.db.sql`.	2023-04-28 10:53:17 +05:30
s-aga-r	ee9f97ca7c	fix: remove duplicate items validation	2023-04-28 09:07:03 +05:30
Vishnu VS	489f853ee2	Merge branch 'develop' into develop	2023-04-27 21:17:47 +05:30
s-aga-r	b62bf78814	refactor: packing_slip.js	2023-04-27 19:43:37 +05:30
s-aga-r	380dd73065	fix: map Packed Items while creating Packing Slip	2023-04-27 18:37:32 +05:30
Nihantra Patel	72dd7884a8	fix: Hyperlink in Quality Inspection Summary	2023-04-27 17:04:39 +05:30
s-aga-r	eca77134ae	feat: add field pi_detail in Packing Slip	2023-04-27 15:48:02 +05:30
Nihantra Patel	6dfca79af3	fix: Report link, option, and added a link for Sales Person in GP	2023-04-27 15:04:50 +05:30
Vishnu VS	06e458c745	Merge branch 'develop' into develop	2023-04-27 12:24:29 +05:30
rohitwaghchaure	01bfd2ab67	Merge pull request #35066 from rohitwaghchaure/fixed-delivered-qty-issue-while-making-mr ... fix: don't create material request from sales order against delivered items	2023-04-27 09:05:36 +05:30
Rohit Waghchaure	1e2deee579	fix: don't create material request from sales order against the delivered items	2023-04-26 20:30:53 +05:30
Vishnu VS	f68eef833c	Update erpnext/manufacturing/doctype/job_card/job_card.py ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2023-04-26 20:25:43 +05:30
Vishnu VS	5c94f2cc52	Update erpnext/manufacturing/doctype/job_card/job_card.py ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2023-04-26 20:25:15 +05:30
Vishnu VS	25d0119b7e	Merge branch 'develop' into develop	2023-04-26 18:56:09 +05:30
HarryPaulo	3be1ab9b8d	fix: allow submit delivery note when the sales order was billed... (#34910)	2023-04-25 21:54:41 +05:30
Kitti U. @ Ecosoft	c36dc3dc57	fix: v14, Bank Reconcile Tools not cover case JV debit bank (#35000)	2023-04-25 21:34:28 +05:30
rohitwaghchaure	5e37308b5e	Merge pull request #35050 from Nandhinidevi123/workstation_filter ... add if condition for workstation filter	2023-04-25 21:28:41 +05:30
rohitwaghchaure	b24704740b	Merge pull request #34918 from s-aga-r/FIX-ISS-22-23-06298 ... perf: Journal Entries	2023-04-25 21:27:52 +05:30
mergify[bot]	ab0f7794b7	fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726) ... fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726) * fix: convert asynchronous field update to synchronous * fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (cherry picked from commit 189b020d228bdb1c0c589697162cf91718b2fa27) Co-authored-by: danjeremynavarro <46537526+danjeremynavarro@users.noreply.github.com>	2023-04-25 21:08:50 +05:30
tundebabzy	3d90b970d1	fix: click handler should not attempt indexed access of empty array (#35013) ... fix: click handler should not attempt indexed access of empty array	2023-04-25 20:57:59 +05:30
Ernesto Ruiz	c4512d552e	chore: Add translate function to Depreciation Journal Entry Remark (#35022) ... chore: Add translate function to Depreciation Journal Entry Remark	2023-04-25 20:56:53 +05:30
Deepesh Garg	f88431a79a	fix: Common party JV cost center (#35008)	2023-04-25 20:54:22 +05:30
Raffael Meyer	d6bc8bba8b	fix: per_billed condition for Payment Entry (#34969)	2023-04-25 20:51:11 +05:30
Nandhinidevi123	74fb2bec3a	add if condition for workstation filter	2023-04-25 20:08:35 +05:30
Deepesh Garg	f7b50f2ade	fix: Unable to allocate advance against invoice (#35007)	2023-04-25 19:18:45 +05:30
Nabin Hait	72b5c1f70a	fix: Use set instead of db_set as it is called from validate (#34967)	2023-04-25 19:18:08 +05:30
Deepesh Garg	ecea9b44a3	fix: Payment entry with TDS in bank reco statement (#34961)	2023-04-25 19:17:13 +05:30
Solufy Solution	f1acc5fabb	fix: Bulk Payment Entry from PO/SO (#34942) ... Co-authored-by: Nihantra Patel <n.patel.serpentcs@gmail.com>	2023-04-25 19:16:30 +05:30
HarryPaulo	22290c2694	fix: respect title_field from doctype to bulk transactions (#34928)	2023-04-25 19:13:53 +05:30
Deepesh Garg	b545e3def0	fix: Add company field to lower deduction certificate (#34914)	2023-04-25 19:07:45 +05:30
Ankush Menat	6de71eb158	fix: pass reference_doctype in link queries (#35038)	2023-04-25 18:33:31 +05:30
Anand Baburajan	e08d636bf7	fix: use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (#35031) ... fix: use filter_by_finance_book instead of only_depreciable_assets	2023-04-25 15:16:50 +05:30
Sagar Sharma	31cdfa395a	Merge branch 'develop' into FIX-ISS-22-23-06298	2023-04-25 13:57:34 +05:30
s-aga-r	e782a054c8	refactor: get_stock_value_on() to get stock value of multiple warehouses at once	2023-04-25 13:54:36 +05:30
Anand Baburajan	ca388ed9cd	fix: value of depreciable assets not updating after manual depr entry [develop] (#35020) ... * fix: value of depreciable assets not updating after manual depr entry * chore: add asset depr schedule to jv's ignore_doctypes_on_cancel_all	2023-04-25 12:45:05 +05:30
rohitwaghchaure	7a63fbef4f	Revert "fix: Incorrect difference value in Stock and Account Value Comparison…"	2023-04-25 12:01:26 +05:30
ruthra kumar	20226d0a47	Merge branch 'develop' into revert-33699-tds_report_percentage	2023-04-25 10:43:18 +05:30
ruthra kumar	cb7a99cbaa	Revert "fix: Rate from LDC in TDS reports (#33699)" ... This reverts commit db9beb3cdd.	2023-04-25 10:13:07 +05:30
Vishnu VS	cdb05cd310	Merge branch 'develop' into develop	2023-04-25 09:29:47 +05:30
Sagar Sharma	58dbf7fc24	Merge branch 'develop' into stock-reservation	2023-04-24 22:58:16 +05:30
s-aga-r	bf4a57a37c	fix: miscellaneous ... fix: don't reserve stock in group warehouse fix: partial reservation in multiple warehouses feat: add prompt to select warehouse and qty for reservation in SO	2023-04-24 22:19:09 +05:30
rohitwaghchaure	291845e461	Merge pull request #35015 from rohitwaghchaure/incorrect-or-cond-delivery-note-issue ... fix: incorrect OR condition causing timeout error (For more than 50 line items)	2023-04-24 18:06:59 +05:30
rohitwaghchaure	5d8bf56cb9	Merge pull request #35012 from rohitwaghchaure/fixed-incorrect-bom-end-of-life ... fix: item not showing in the BOM	2023-04-24 18:06:37 +05:30
Rohit Waghchaure	379b215aea	fix: incorrect OR condition causing timeout error	2023-04-24 17:32:32 +05:30
Rohit Waghchaure	02c3b41dc2	fix: item not showing in the BOM	2023-04-24 14:50:27 +05:30
s-aga-r	388f85b109	refactor: Stock Reservation code in sales_order.js	2023-04-24 12:04:22 +05:30
s-aga-r	e517c06847	chore: add warehouse info in SRE msg	2023-04-23 15:45:58 +05:30
s-aga-r	0b5f03e88c	Revert "fix: Reserve and Unreserve buttons visibility in SO" ... This reverts commit cdb3181691.	2023-04-23 15:41:48 +05:30
Vishnu VS	dc0e64a72d	Merge branch 'frappe:develop' into develop	2023-04-22 23:15:42 +05:30
ruthra kumar	ed14d1ce44	feat: Reconcile Payments in background (#34596) ... * feat: auto reconcile in background * chore: Option to enable auto reconciliation in settings * refactor: validate if feature is enabled in settings * refactor: check for running job while using reconciliation tool * chore: using doc to get filter values * chore: use frappe.db.get_value in validations * chore: cleanup commented out code * chore: replace get_list with get_all * chore: use block scope variable * chore: type information for functions * refactor: flag to ignore job validation check * refactor: update parent doc status if all reconciled * chore: create test_records file * test: create a bunch of vouchers for testing auto reconcile * chore: renamed auto_reconcile to process_payment_reconciliation * chore: another child doctype to hold payments * chore: remove duplicate field * chore: add fetched payments to log * chore: Popup comment message update * chore: replace get_all with get_value * chore: replace label in settings page * chore: remove unit test and records * refactor: status in reconciliation log * refactor: set status in log as well * chore: fix field name * chore: change triggered job name * chore: use status field in list view of log * chore: status while there are no allocations * refactor: split trigger function into two * chore: adding cancelled status * refactor: function trigger queued docs * chore: cron job scheduled * chore: fixing accouts settings json file * chore: typos and variable scope * chore: use 'pluck' in db call * chore: remove redundant whitelist decorator * chore: use single DB call to fetch values * chore: replace get_all with get_value * refactor: use raw db calls to fetch reconciliation log records Using get_doc on `Process Payment Reconciliation Log` is costly when handling large volumes of invoices. Use raw frappe.db.get_all to selectively pull status and reconciled count * chore: update status on successful batch operation * chore: make payment table readonly * chore: ability to pause the background job * chore: remove isolate_each_allocation * chore: more description in progress bar * refactor: partially working state * refactor: update reconcile flag and setting hard limits for fetching * chore: make allocation editable -- NEED TO REVERT * chore: pause button * refactor: skip setter function in Payment Entry for better performan * refactor: split reconcile function and skip a setter function 1. Split reconcile function into 2 2. While reconciling against payment entry, skip a set_missing_ref_details setter method * chore: increase payment limit * refactor: replace frappe.db.get_all with frappe.db.get_value * chore: remove unwanted doctypes * refactor: make allocation table readonly * perf: update ref_details only for newly linked invoices * chore: rename skip flag * refactor(UI): receivable_payable field should auto populate * refactor: no control statements in finally block * chore: cleanup section and rename checkbox * chore: update new fieldname in code * chore: update error msg * refactor: start and pause integrated into status pause checkbox has been removed * refactor: added cancelled status to the log doctype 1. Moved the status section to the bottom in parent doc 2. Using alerts to indicate Job trigger status	2023-04-22 17:24:35 +05:30
Rohit Waghchaure	f2253dd645	fix: duplicate reposting entries of same voucher	2023-04-22 11:16:12 +05:30
s-aga-r	0cd10a50d2	Merge branch 'develop' into stock-reservation	2023-04-22 10:04:46 +05:30
s-aga-r	28d0629df1	chore: add depends_on condition for Reserve Stock field in SO	2023-04-22 10:01:00 +05:30
s-aga-r	cdb3181691	fix: Reserve and Unreserve buttons visibility in SO	2023-04-22 09:49:47 +05:30
s-aga-r	b70273b988	chore: remove Enable Stock Reservation field description	2023-04-22 08:49:31 +05:30
rohitwaghchaure	9fa72cb9d8	Merge pull request #34982 from rohitwaghchaure/fixed-added-validation-for-extra-job-card ... fix: added validation for extra job cards	2023-04-21 18:50:39 +05:30
Ankush Menat	ac871797b2	fix: SLA permissions (#34981)	2023-04-21 18:05:29 +05:30
rohitwaghchaure	56d62cae7a	Merge pull request #34980 from rohitwaghchaure/fix-inter-transfer-validation ... fix: validation for internal transfer entry	2023-04-21 17:45:54 +05:30
s-aga-r	7e8fd8f324	chore: update reserved stock SLE validation	2023-04-21 17:44:44 +05:30
Rohit Waghchaure	6a0b7c9e8c	fix: added validation for extra job card	2023-04-21 17:34:22 +05:30
Rohit Waghchaure	19911b48fd	fix: validation for internal transfer entry	2023-04-21 16:56:09 +05:30
s-aga-r	9a37ac6c25	refactor: sum up SLE value in query	2023-04-21 13:28:14 +05:30
HENRY Florian	af8da53cf4	fix: FEC report for France accountancy (#34781) ... * fix: FEC report for France Accountancy legal requirement * fix: FEC report for France Accountancy legal requirement * fix: change to query standard * fix: change to query standard * fix: columns to standard dict * fix: columns to standard dict * fix: columns to data * refactor: french report FEC * refactor: french report FEC (2) --------- Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>	2023-04-21 13:26:32 +05:30
Deepesh Garg	a02705ded7	chore: Move source and campaign to more info section (#34946)	2023-04-21 13:25:32 +05:30
ruthra kumar	3ec1597860	Merge pull request #34940 from ruthra-kumar/broken_set_exchange_gain_loss_btn_in_payment_entry ... fix: broken 'set exchange gain/loss' btn in payment entry	2023-04-21 09:47:53 +05:30
Hossein Yousefian	984eb2a0dd	Merge branch 'develop' into get_incoming_rate_v14_fix	2023-04-20 16:50:34 +03:30
rohitwaghchaure	f218df460f	Merge pull request #34958 from rohitwaghchaure/removed-depends-on-for-employee-detail ... fix: removed depends on for the Employee Detail section	2023-04-20 18:03:46 +05:30
rohitwaghchaure	6259c81adc	Merge pull request #34960 from rohitwaghchaure/fixed-stock-entry-type ... fix: stock entry type issue	2023-04-20 18:03:23 +05:30
Sagar Vora	776b56ccd1	fix: use functools.wraps to preserve doc signature	2023-04-20 05:17:30 -07:00
Sagar Vora	2fa641f86d	fix: simplify erpnext.get_region	2023-04-20 05:17:30 -07:00
Sagar Vora	17ef3c964f	fix: set frappe.flags.company to call regional code accurately	2023-04-20 05:17:30 -07:00
Rohit Waghchaure	c3b5dcb767	fix: stock entry type issue	2023-04-20 16:39:26 +05:30
Rohit Waghchaure	a90a5b4aa4	fix: removed depends on for the Employee Detail section	2023-04-20 16:01:05 +05:30
Sagar Sharma	81653e4762	Merge branch 'develop' into FIX-ISS-23-24-00209	2023-04-20 15:46:01 +05:30
s-aga-r	8108b2de0a	fix: PermissionError in Work Order	2023-04-20 15:41:37 +05:30
Nihantra Patel	b572bef71d	fix: process_loss_percentage in BOM	2023-04-20 14:32:32 +05:30
Deepesh Garg	ea6eeace80	fix: filtering via batch no(#34950) ... * fix: filtering via batch no	2023-04-20 12:48:44 +05:30
Sagar Sharma	e1f5a5adea	Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES	2023-04-20 11:00:22 +05:30
ruthra kumar	fc6486d87d	Merge pull request #34922 from ruthra-kumar/refactor_payment_entry_ref_details ... refactor: refactor set_missing_values and set_missing_ref_details in Payment Entry	2023-04-20 10:59:50 +05:30
ruthra kumar	df0682fa8c	fix: broken set exchagne gain/loss btn broken in payment entry	2023-04-20 10:39:15 +05:30
Sagar Sharma	66723dc5db	Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES	2023-04-20 10:31:29 +05:30
s-aga-r	11c8503180	fix(test): test_backdated_stock_reco_cancellation_future_negative_stock	2023-04-20 09:59:11 +05:30
Rohit Waghchaure	fcfa8842a7	fix: limit stock reco issue	2023-04-20 09:48:15 +05:30
rohitwaghchaure	3df4edc5c5	Merge branch 'develop' into get_incoming_rate_v14_fix	2023-04-19 21:07:54 +05:30
rohitwaghchaure	dd238aa5b4	Merge pull request #34929 from rohitwaghchaure/fixed-stock-and-account-value-report ... fix: Incorrect difference value in Stock and Account Value Comparison…	2023-04-19 21:07:25 +05:30
Rohit Waghchaure	a77182645f	fix: Incorrect difference value in Stock and Account Value Comparison report	2023-04-19 20:35:14 +05:30
Sagar Sharma	45c27e4e3d	Merge branch 'develop' into FIX-ISS-23-24-00145	2023-04-19 19:22:42 +05:30
Sagar Sharma	6519514db4	Merge branch 'develop' into use-UnixTimestamp	2023-04-19 18:23:29 +05:30
Vishal Dhayagude	59f3fedbf7	fix: batch qty conversion factor issue fixed in pos transaction (#34917)	2023-04-19 15:57:28 +05:30
ruthra kumar	b7d6e30f63	refactor: update ref details for selected references ... set_missing_ref_details can update only for selected references	2023-04-19 15:13:10 +05:30
s-aga-r	c86c543fbf	test: add test case for internal PR GL Entries	2023-04-19 13:30:37 +05:30
Sagar Sharma	2c0e22c01d	Merge branch 'develop' into use-UnixTimestamp	2023-04-19 12:57:20 +05:30
s-aga-r	e43bc38e05	refactor: rewrite get_stock_value_on() queries in QB	2023-04-19 12:05:17 +05:30
ruthra kumar	11cb2db3fe	refactor: move set_missing_ref_detials out of set_missing_values	2023-04-19 11:54:08 +05:30
ruthra kumar	eaa5f1fd9d	Merge pull request #34838 from ruthra-kumar/making_similar_ledger_entries_merging_optional ... refactor: toggle merging similar ledger entries in JE	2023-04-19 09:48:44 +05:30
barredterra	98d51b6c7b	fix: remove empty translations	2023-04-18 18:27:21 +02:00
barredterra	f0a3e61ee9	fix: remove excessive fourth column	2023-04-18 17:27:46 +02:00
s-aga-r	6fca9adcd4	fix: internal Purchase Receipt GL Entries	2023-04-18 18:38:28 +05:30
Hossein Yousefian	13d4f85923	get_incoming_rate_voucher_no_fix	2023-04-18 14:50:09 +03:30
Hossein Yousefian	bbd44e6e7e	Merge branch 'frappe:develop' into get_incoming_rate_zero_in_rate_fix	2023-04-18 14:47:19 +03:30
barredterra	debc013728	fix: remove excessive fourth column	2023-04-18 12:23:54 +02:00
s-aga-r	e91abbfbe3	fix: add item-code filter for SCR supplied-items batch-no	2023-04-18 13:03:47 +05:30
Sagar Sharma	d07d67a968	Merge branch 'develop' into use-UnixTimestamp	2023-04-18 12:56:25 +05:30
s-aga-r	91a398a191	fix: use CombineDatetime instead of Timestamp in QB queries	2023-04-18 12:55:16 +05:30
Sagar Sharma	a78b4bef0e	Merge branch 'develop' into FIX-ISS-23-24-00171	2023-04-18 11:44:03 +05:30
ruthra kumar	3f537d30bd	chore(patch): by default ledger entries of JE's will not be merged	2023-04-18 10:55:49 +05:30
ruthra kumar	a3e3fe149d	refactor: checkbox to toggle merging of JE account heads	2023-04-18 08:59:33 +05:30
Ankush Menat	e4f152a416	fix: whitelist doc method ... This should've been whitelisted, looks like it was missed out closes https://github.com/frappe/erpnext/issues/34898	2023-04-18 08:24:22 +05:30
barredterra	aba87db6be	fix: translation files ... - remove leading "DocType: XXX" - remove leading path and line number - add trailing comma (three columns total)	2023-04-17 22:28:53 +02:00
MohsinAli	dd93ea067e	fix: change discuss forum url (#34891) ... [skip ci]	2023-04-17 17:00:52 +05:30
Deepesh Garg	534ea5ad21	fix: Add offers info to website item (#34873) ... * fix: Add offers info to website item * Revert "fix: Add offers info to website item" This reverts commit 88b598edb61f0ab97b751581cc2719964e169055. * fix: Add offer properties to website item	2023-04-17 16:35:22 +05:30
s-aga-r	a527221709	test: add test case for consumption of reserved stock	2023-04-17 15:33:55 +05:30
s-aga-r	2ed7d8a1fb	fix: don't allow Stock Reconciliation for items having reserved stock	2023-04-17 15:33:55 +05:30
s-aga-r	dc9bb772cb	refactor(test): use change_settings instead of update_stock_settings	2023-04-17 15:33:55 +05:30
s-aga-r	a87bb78d72	fix: don't allow to enable Stock Reservation and Negative Stock simultaneously	2023-04-17 15:33:55 +05:30
s-aga-r	73f16752a6	chore: conflicts	2023-04-17 15:33:55 +05:30
s-aga-r	866f98ac15	test: Stock Reservation for Serial and Batch Items	2023-04-17 15:33:46 +05:30
Rohit Waghchaure	6bccd8644e	fix: stock reco test case	2023-04-17 14:22:35 +05:30
rohitwaghchaure	9fd8b8e53a	Merge pull request #34851 from rohitwaghchaure/fixed-too-many-writes-error-in-stock-reco ... fix: too many writes error while making backdated stock reconciliation	2023-04-17 12:01:36 +05:30
rohitwaghchaure	9f399f8741	Merge pull request #34882 from rohitwaghchaure/filter-to-hide-disabled-warehouses ... fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report	2023-04-17 12:00:57 +05:30
Rohit Waghchaure	9ceb1f6bda	fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report	2023-04-17 11:05:32 +05:30
Rohit Waghchaure	d9dd64b4d2	fix: linters issues	2023-04-16 23:25:51 +05:30
Sagar Sharma	db7b78328b	Merge branch 'develop' into FIX-ISS-23-24-00171	2023-04-16 20:13:42 +05:30
Deepesh Garg	5c75894065	fix: Advance payment against payment terms (#34872)	2023-04-16 17:11:24 +05:30
Shariq Ansari	f27c921783	Merge pull request #34876 from shariquerik/selling-workspace-fix	2023-04-16 14:26:24 +05:30
rohitwaghchaure	634d526d15	Merge pull request #34852 from wojosc/patch-36 ... fix allowing rename of Lead	2023-04-16 14:18:49 +05:30
Shariq Ansari	5a4dd354c1	fix: selling workspace is not migrating properly	2023-04-16 13:10:42 +05:30
Hossein Yousefian	1d162ffb87	get_incoming_rate_zero_in_rate_fix	2023-04-16 11:03:16 +03:30
s-aga-r	c9418aab45	chore: add items field label	2023-04-14 16:57:14 +05:30
s-aga-r	fb3271c624	fix: unable to change company for manual Serial No entry	2023-04-14 15:59:35 +05:30
Devin Slauenwhite	51c4338661	fix(ux): don't throw error when company defaults aren't set (#34825) ... * fix(ux): don't throw error when company defaults aren't set; instead prompt account input. * fix: translate label and title	2023-04-14 15:20:51 +05:30
Rohit Waghchaure	7bfc8f1236	fix: too many writes error while making backdated stock reconciliation	2023-04-14 15:12:58 +05:30
Raffael Meyer	59f6b773cd	feat: add german sales tax template (#34823) ... Nullsteuersatz nach § 12 Abs. 3 UStG	2023-04-14 13:14:00 +05:30
Wolfram Schmidt	9d1cae01bd	fix allowing rename of Lead ... This is needed to consolidate data like merging leads together when duplicated appear.	2023-04-14 09:05:09 +02:00
Deepesh Garg	a7051cb9b5	fix: Don't use stale item details (#34847)	2023-04-14 09:59:42 +05:30
Deepesh Garg	66130493eb	fix: Remove unnecessary checkbox from Accounts doctype (#34821)	2023-04-14 09:47:15 +05:30
Vishnu VS	194ed1842f	fix: update workstation hour rate	2023-04-13 19:02:03 +05:30
s-aga-r	6c9e419fec	fix: validation for Non-Stock item in Sales Order Reservation	2023-04-12 16:18:13 +05:30
s-aga-r	e65b6d47e4	fix: disable Stock Reservation by default	2023-04-12 15:12:56 +05:30
s-aga-r	f0acb2049b	fix: don't allow to deliver/transfer reserved stock	2023-04-12 14:13:54 +05:30
s-aga-r	56097807b4	fix: Stock Reservation validation in Stock Settings	2023-04-12 13:58:11 +05:30
s-aga-r	e7491d117d	test: add test case for Stock Reservation against SO	2023-04-11 17:25:13 +05:30
Rohit Waghchaure	6851b5ba97	fix: reposting record not created for backdated stock reco	2023-04-11 14:35:33 +05:30
s-aga-r	51946c5528	chore: linter	2023-04-11 12:46:59 +05:30
Anand Baburajan	c957a5cd2e	fix: provide filter by depreciable assets in fixed asset register (#34803)	2023-04-11 12:16:07 +05:30
s-aga-r	a14a6002e7	Merge branch 'develop' into stock-reservation	2023-04-11 10:00:39 +05:30
s-aga-r	efcb84cedf	test: add test cases for SO	2023-04-11 09:11:51 +05:30
s-aga-r	bc3cb6bff6	fix: cancel SRE on SO cancel	2023-04-11 08:32:37 +05:30
s-aga-r	a918adaa33	test: add test cases for SRE	2023-04-11 08:29:59 +05:30
Raffael Meyer	934e1b4e6a	fix: add german translation of "Partly Paid" (#34776)	2023-04-09 19:04:57 +05:30
Deepesh Garg	6f6928fa7b	fix: Item tax validity comparison fixes (#34784) ... fix: Item tax validity comparsion fixes	2023-04-09 09:38:13 +05:30
Sagar Sharma	299fb2619f	Merge branch 'develop' into refactor-batch	2023-04-08 11:15:08 +05:30
s-aga-r	4a9a5f03fc	Merge branch 'develop' into refactor-batch	2023-04-08 11:06:27 +05:30
Sagar Sharma	ba553dba62	Merge pull request #34739 from resilient-tech/item-tax-override-remove ... chore!: remove override to set item tax based on HSN code	2023-04-07 21:39:08 +05:30
Anand Baburajan	29e025c012	Merge pull request #34778 from AnandBaburajan/asset_value_adjust_get_depr_amt ... fix: improper usage of get_depreciation_amount in asset_value_adjustment	2023-04-07 16:48:06 +05:30
Anand Baburajan	90dee8b663	Merge pull request #34735 from ihosseinu/asset_movement_translation_fix ... 'Make Asset Movement' button translation fix in asset_list.js	2023-04-07 15:30:26 +05:30
Anand Baburajan	edaa0bc3f7	Merge branch 'develop' into asset_value_adjust_get_depr_amt	2023-04-07 15:24:37 +05:30
anandbaburajan	984905109d	fix: improper usage of get_depreciation_amount in asset_value_adjustment	2023-04-07 15:23:02 +05:30
Sagar Sharma	f7fb001126	Merge branch 'develop' into FIX-ISS-22-23-06306	2023-04-06 15:59:32 +05:30
s-aga-r	a575bd50ef	test: add test cases for internal PR received qty	2023-04-06 15:26:19 +05:30
rohitwaghchaure	7d2d2dd0af	Merge pull request #34768 from rohitwaghchaure/fixed-ux-issue ... fix: UX for stock entry, bom and work order	2023-04-06 14:16:20 +05:30
Sagar Sharma	cfd4da3e8a	Merge branch 'develop' into FIX-ISS-22-23-06397	2023-04-06 13:23:39 +05:30
s-aga-r	a55b818119	fix: Subcontracting Receipt incorrect status	2023-04-06 13:20:33 +05:30
Rohit Waghchaure	82a136f991	fix: UX for stock entry, bom and work order	2023-04-06 12:51:32 +05:30