brotherton-erpnext

Author	SHA1	Message	Date
Deepesh Garg	1564d39bf4	Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13 fix: Taxes on Internal Transfer payment entry	2021-06-24 19:51:48 +05:30
Deepesh Garg	e3ca177828	fix: Remove debug flag	2021-06-24 19:51:23 +05:30
Deepesh Garg	bdba29bab5	fix: Account filter not working with accounting dimension filter	2021-06-24 19:48:11 +05:30
Ankush	5708b7140b	fix: batch nos in packed items (bp #26105 ) * test: batch info in packed_items * fix(ux): make packed items editable * refactor: allow custom table name for set_batch In some doctypes there are multiple child tables requiring batched items. This change makes the function a bit more flexible. * fix: Auto fetch batch_nos in packed_item table	2021-06-24 19:38:37 +05:30
Noah Jacob	ac0bc1f170	fix: precision rate for packed items (#26208 )	2021-06-24 19:36:17 +05:30
Saqib	b3a0a7b432	fix: too many writes while renaming company abbreviation (#26203 )	2021-06-24 19:30:10 +05:30
Saqib	64c6b34b94	fix: too many writes while renaming company abbreviation (#26142 )	2021-06-24 19:29:56 +05:30
Saqib	3b5978cdb8	Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix fix: purchase receipt gl entries with same item code	2021-06-24 19:29:08 +05:30
Deepesh Garg	1658107a92	fix: Linting fixes	2021-06-24 19:18:50 +05:30
Deepesh Garg	e21e435a0d	fix: Add python 3 compatible string types	2021-06-24 19:17:58 +05:30
Nabin Hait	a57976660a	fix: merge conflict	2021-06-24 19:14:33 +05:30
Ankush	7a63d782db	fix: batch nos in packed items (#26105 ) * test: batch info in packed_items * fix(ux): make packed items editable * refactor: allow custom table name for set_batch In some doctypes there are multiple child tables requiring batched items. This change makes the function a bit more flexible. * fix: Auto fetch batch_nos in packed_item table	2021-06-24 19:07:16 +05:30
Deepesh Garg	9382b1f154	fix: Flaky test	2021-06-24 19:03:22 +05:30
Deepesh Garg	acbf56f162	Merge pull request #26182 from deepeshgarg007/gstr_1_export_invoices_error_develop fix: Export invoices not visible in GSTR-1 report	2021-06-24 18:43:40 +05:30
Deepesh Garg	11591b3e3e	Merge pull request #26202 from nextchamp-saqib/pr-item-gl-fix-v13 fix: purchase receipt gl entries with same item code	2021-06-24 18:36:23 +05:30
Anuja Pawar	a50196bcd9	fix: dunning permission error in payment entry (#26204 )	2021-06-24 18:25:16 +05:30
rohitwaghchaure	27797ffa46	Merge pull request #24523 from rohitwaghchaure/sub-operation-new-branch Feat: Job Card Enhancements	2021-06-24 18:19:42 +05:30
Rohit Waghchaure	2330c41cca	fix: total time calculation	2021-06-24 18:14:19 +05:30
Rohit Waghchaure	57307443f0	is corrective job card	2021-06-24 18:14:19 +05:30
Rohit Waghchaure	c878389050	fix: or condition filter in the get_all	2021-06-24 18:14:18 +05:30
Jannat Patel	6a9798f305	fix: update leave allocation after submit (#26191 ) * fix: update leave allocation after submit v13 * fix: test * fix: test	2021-06-24 18:11:33 +05:30
Rohit Waghchaure	fcab53b238	fix: skip job card	2021-06-24 18:07:31 +05:30
Rohit Waghchaure	6e81489095	feat: Job Card Enhancements	2021-06-24 18:07:30 +05:30
Saqib Ansari	f6dce4df73	test: service item purchase with perpetual inventory enabled	2021-06-24 17:41:52 +05:30
Saqib Ansari	1ca8f6a51d	fix: purchase receipt gl entries with same item code	2021-06-24 17:41:44 +05:30
Saqib	c10fea8a59	Merge branch 'develop' into pr-item-gl-fix	2021-06-24 17:39:36 +05:30
Saqib	2980db30ce	Merge pull request #26157 from nextchamp-saqib/pos-fixes-9 refactor(pos): use pos invoice item name as unique identifier	2021-06-24 17:38:41 +05:30
Saqib	81d164134d	Merge pull request #26198 from nextchamp-saqib/pos-fixes-9-v13 refactor(pos): use pos invoice item name as unique identifier	2021-06-24 17:37:51 +05:30
Afshan	9dc625c1c9	fix: validate product bundle for existing transactions before deletion (#25978 )	2021-06-24 17:36:39 +05:30
Deepesh Garg	79daed00c1	Merge pull request #26201 from noahjacob/shipping_address_fix_v13 fix: fetch preferred shipping address (bp #26132)	2021-06-24 17:35:34 +05:30
Deepesh Garg	755ebdf582	Update party.js	2021-06-24 17:35:14 +05:30
Deepesh Garg	e693cceb58	Merge pull request #26132 from noahjacob/shipping_address_fix fix: fetch preferred shipping address	2021-06-24 17:31:21 +05:30
Deepesh Garg	f84f8d5260	Update party.js	2021-06-24 17:29:55 +05:30
Noah Jacob	da82bd4b51	refactor: update cost updates operation time and hour rates in BOM (#25891 ) * refactor: updates hour_rate and operation time on update cost * refactor: hour_rates are updated in routing when updated in workstations * test: test cases for updating hour_rates and operation time in linked bom	2021-06-24 17:23:21 +05:30
Noah Jacob	dbdf2515cd	fix: fetches correct preferred shipping address	2021-06-24 17:06:18 +05:30
Nabin Hait	5b462ad11a	fix: merge conflict	2021-06-24 15:36:51 +05:30
Nabin Hait	b5d1a7731c	bumped to version 13.5.2	2021-06-24 15:55:50 +05:50
Nabin Hait	c1954ec72a	Merge pull request #26195 from deepeshgarg007/deferred_revenue_error fix: Error while booking deferred revenue	2021-06-24 15:35:02 +05:30
Nabin Hait	7a8a449ed4	Merge pull request #26197 from deepeshgarg007/deferred_revenue_error_pre_release fix: Error while booking deferred revenue	2021-06-24 15:34:58 +05:30
GangaManoj	e21d44c5c3	fix(Asset): Remove to_date field	2021-06-24 15:04:44 +05:30
Saqib Ansari	3b12601461	fix: sider issues	2021-06-24 15:03:04 +05:30
Saqib Ansari	e39c3f2e69	fix: add missing semicolons	2021-06-24 15:02:59 +05:30
Saqib Ansari	ea70f6f933	fix: hide images from cart & details	2021-06-24 15:02:53 +05:30
Saqib Ansari	54cc1dedf2	refactor(pos): use pos invoice item name as unique identifier	2021-06-24 15:02:43 +05:30
Saqib Ansari	4d3e748c00	fix: sider issues	2021-06-24 15:01:33 +05:30
Marica	bf3e191570	Merge pull request #26193 from marination/country-modal-cart-v13-release fix: Address Card issues in e-commerce	2021-06-24 14:57:39 +05:30
GangaManoj	2fdb923953	fix(Asset Repair): Change controller hooks	2021-06-24 14:56:34 +05:30
Deepesh Garg	f79a72dbf3	fix: Error while booking deferred revenue	2021-06-24 14:49:09 +05:30
Saqib	73aaa1c275	Merge branch 'develop' into pos-fixes-9	2021-06-24 14:31:19 +05:30
Saqib Ansari	8aa0e31bb4	fix: add missing semicolons	2021-06-24 14:29:22 +05:30
Afshan	7fd44907ba	feat: fetching of qty as per received qty from PR to PI (#26184 )	2021-06-24 14:26:36 +05:30
Ankush	98e98d25e6	fix(Work Order): added freeze when trying to stop work order (#26192 ) (#26196 ) * fix: added freeze when trying to stop work order * fix(ux): add freeze message Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-24 14:24:28 +05:30
Noah Jacob	b2b7369874	fix(Work Order): added freeze when trying to stop work order (#26192 ) * fix: added freeze when trying to stop work order * fix(ux): add freeze message	2021-06-24 14:21:35 +05:30
Deepesh Garg	ca2e914715	fix: Error while booking deferred revenue	2021-06-24 14:14:46 +05:30
marination	820a579051	chore: Test for Item visibility in multiple item group pages	2021-06-24 13:57:18 +05:30
marination	4f0e6cd911	fix: Sider	2021-06-24 13:57:00 +05:30
marination	f913838373	fix: Consider Table Multiselect fields in Query engine - Since table multiselect fields were not handled, the query tried searching for this child field in item master - This broke the query - On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks	2021-06-24 13:56:49 +05:30
marination	9f305e983c	fix: Filters did not consider Website Item Group	2021-06-24 13:56:35 +05:30
marination	ea2408744a	fix: Consider Website Item Groups in Item group page product listing - Passed an argument to query engine to know when query is for item group page - If for item group page, get data with regards to website item group table - This query should be fast since there's one filter and that shortens the table beforehand - This data is merged with the results from the Item master (results only considering item attributes and field filters) - The combined data is then sorted as per weightage Co-authored-by: Gavin D'souza <gavin18d@gmail.com>	2021-06-24 13:56:15 +05:30
marination	5884f1aeb0	fix: (style) Address card buttons hover state	2021-06-24 13:50:29 +05:30
marination	26bec9d7b4	fix: Country Link field in 'Add address' website modal auto-clears	2021-06-24 13:50:18 +05:30
Marica	ce99701150	Merge pull request #26170 from marination/web-item-group fix: Website item group logic for product listing in Item Group pages	2021-06-24 13:28:18 +05:30
GangaManoj	550fe8ae39	fix(Asset): Remove redundant code	2021-06-24 13:22:26 +05:30
Jannat Patel	ca8c3b90f0	fix: Update leave allocation after submit (#25975 ) * update leave allocation after submit * fix: leave allocation update after submit * fix: circular dependency * fix: replaced update with submit in tests * fix: replaced update with submit in tests * fix: updating total leaves allocated	2021-06-24 13:13:03 +05:30
marination	a4f5dcaa9a	chore: Test for Item visibility in multiple item group pages	2021-06-24 13:08:20 +05:30
GangaManoj	60a44ae1e6	fix(Asset): Fix test	2021-06-24 12:44:13 +05:30
Marica	6b15a05de4	Merge pull request #26187 from marination/country-modal-cart fix: Address Card issues in e-commerce	2021-06-24 12:25:21 +05:30
Deepesh Garg	437e972108	Merge pull request #26143 from deepeshgarg007/gstr_1_export_invoices_error fix: Export invoices not visible in GSTR-1 report	2021-06-24 12:15:29 +05:30
Deepesh Garg	ab7a16a952	Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop fix: Billing address not fetched in Purchase Invoice	2021-06-24 12:13:17 +05:30
Deepesh Garg	5b119ac4a4	Merge pull request #26178 from deepeshgarg007/payroll_accounting_dimension_develop fix: Accounting Dimensions for payroll entry accrual Journal Entry	2021-06-24 12:12:37 +05:30
Deepesh Garg	9d8e8f8bdf	fix: Do not show received amount after tax for internal tarnsfers	2021-06-24 12:02:39 +05:30
Deepesh Garg	bd9317956b	fix: Taxes on Internal Transfer payment entry	2021-06-24 12:02:32 +05:30
marination	bbe64b5604	fix: (style) Address card buttons hover state	2021-06-24 12:01:12 +05:30
Rucha Mahabal	a9b5dc6030	fix: chart not visible for First Response Time reports (#26032 ) (#26185 )	2021-06-24 11:53:28 +05:30
Ganga Manoj	604f0b8f01	fix: message on successful creation of opening invoices (#25998 )	2021-06-24 11:04:27 +05:30
marination	f5fa1ee4b6	fix: Country Link field in 'Add address' website modal auto-clears	2021-06-24 11:03:32 +05:30
Rucha Mahabal	7dbb032468	fix: chart not visible for First Response Time reports (#26032 )	2021-06-24 10:41:56 +05:30
Deepesh Garg	269962a8dc	fix: Check if item tax template exists	2021-06-24 10:40:07 +05:30
Deepesh Garg	808f83f385	fix: Make item tax templates optional	2021-06-24 10:39:58 +05:30
Deepesh Garg	94d460412a	fix: User is not able to change item tax template	2021-06-24 10:39:49 +05:30
Deepesh Garg	5e49bee755	Merge pull request #26083 from deepeshgarg007/payroll_accounting_dimension fix: Accounting Dimensions for payroll entry accrual Journal Entry	2021-06-24 10:38:42 +05:30
Deepesh Garg	2dc90dd8ac	fix: Export invoices not visible in GSTR-1 report	2021-06-24 10:37:19 +05:30
Deepesh Garg	03b629c851	Merge pull request #26100 from deepeshgarg007/pi_billing_address fix: Billing address not fetched in Purchase Invoice	2021-06-24 10:29:01 +05:30
Deepesh Garg	7bef18f3d8	fix: Remove unintentional changes	2021-06-24 10:28:25 +05:30
Deepesh Garg	c8a6b31f06	Merge branch 'develop' of https://github.com/frappe/erpnext into pi_billing_address_develop	2021-06-24 10:27:16 +05:30
Deepesh Garg	da7f45130b	fix: Billing address not fetched in Purchase Invoice	2021-06-24 10:25:24 +05:30
Deepesh Garg	5f5bbf622a	Merge pull request #26179 from deepeshgarg007/sales_order_billed_qty_develop fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:22:07 +05:30
Deepesh Garg	4cf0b02ddc	Merge pull request #26095 from deepeshgarg007/sales_order_billed_qty fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:21:57 +05:30
Deepesh Garg	70823b6d9a	fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:21:17 +05:30
Deepesh Garg	c451f43f64	fix(minor): Translation and linting issues	2021-06-24 10:18:46 +05:30
Deepesh Garg	3da0541000	fix: Accouting Dimensions for payroll entry accrual Journal Entry	2021-06-24 10:18:36 +05:30
Afshan	53fefd7513	feat: fetching of qty as per received qty from PR to PI (#25837 )	2021-06-24 10:09:02 +05:30
Deepesh Garg	3007c9900b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension	2021-06-23 23:06:15 +05:30
Deepesh Garg	7e006496dd	fix: Check if item tax template exists	2021-06-23 22:52:51 +05:30
Deepesh Garg	c9c1d10435	fix: Make item tax templates optional	2021-06-23 22:47:29 +05:30
GangaManoj	dce2113736	fix(Asset Repair): Remove test that's no longer necessary	2021-06-23 22:26:45 +05:30
GangaManoj	2f5f9d8566	fix(Asset): Fix value_after_depreciation calculation	2021-06-23 22:19:05 +05:30
Deepesh Garg	1f7b95f390	fix: User is not able to change item tax template	2021-06-23 20:56:27 +05:30
marination	078826d510	fix: Sider	2021-06-23 20:12:59 +05:30
marination	f913e0dd05	fix: Consider Table Multiselect fields in Query engine - Since table multiselect fields were not handled, the query tried searching for this child field in item master - This broke the query - On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks	2021-06-23 20:06:11 +05:30
Noah Jacob	b4b6288596	fix: fetches correct preferred shipping address	2021-06-23 17:05:44 +05:30
rohitwaghchaure	b4863bfa50	Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report feat: Incorrect valuation rate report for serialized items	2021-06-23 16:52:51 +05:30
marination	1b9b72d12e	fix: Filters did not consider Website Item Group	2021-06-23 16:03:24 +05:30
Deepesh Garg	0bfffddac4	fix: Test Cases	2021-06-23 15:37:17 +05:30
marination	d802d73973	fix: Consider Website Item Groups in Item group page product listing - Passed an argument to query engine to know when query is for item group page - If for item group page, get data with regards to website item group table - This query should be fast since there's one filter and that shortens the table beforehand - This data is merged with the results from the Item master (results only considering item attributes and field filters) - The combined data is then sorted as per weightage Co-authored-by: Gavin D'souza <gavin18d@gmail.com>	2021-06-23 14:24:13 +05:30
Jannat Patel	9ec0ded28f	fix: Staffing plan vacancies data type issue (#25941 ) * fix: staffing plan vacancies data type issue * fix: translation issue * fix: removed greater than 0 condition	2021-06-23 14:05:10 +05:30
Jannat Patel	da66cefefc	fix: staffing plan vacancies data type issue (#25936 ) * fix: staffing plan vacancies data type issue * fix: translation issue * fix: removed greater than 0 condition * fix: sider Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 14:04:48 +05:30
GangaManoj	80399802c6	fix(Asset Repair): Replace asset_value with value_after_depreciation in tests	2021-06-23 13:26:47 +05:30
Deepesh Garg	35e11fbea6	fix: Tests	2021-06-23 13:17:01 +05:30
Anurag Mishra	d021db1cb1	fix: Training event (#26164 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:59:43 +05:30
Deepesh Garg	208b5f9e73	chore: Add comments	2021-06-23 12:44:56 +05:30
Deepesh Garg	40a4330ec1	fix: Move tax categories up in country wise json	2021-06-23 12:38:37 +05:30
Jannat Patel	44815393b3	fix: job applicant link issue (#25934 )	2021-06-23 12:28:02 +05:30
Jannat Patel	0354ec6363	fix: job applicant link issue (#25933 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:27:45 +05:30
Anurag Mishra	11c155e6ce	feat: Employee Grievance (#25705 ) (#26162 ) * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:13:32 +05:30
GangaManoj	88348e2da7	fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset	2021-06-23 11:57:53 +05:30
Deepesh Garg	e8817f97d6	Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width fix: Changed profitability analysis report width	2021-06-23 11:36:43 +05:30
Deepesh Garg	673470705b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup	2021-06-23 11:33:15 +05:30
GangaManoj	32d7b1f6ad	fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets	2021-06-23 11:24:05 +05:30
Anurag Mishra	fc98abece9	feat: Employee Grievance (#25705 ) * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 11:21:38 +05:30
Saqib	46ae97dfd3	Merge branch 'develop' into pr-item-gl-fix	2021-06-23 11:02:48 +05:30
Saqib	5a824cad81	fix: cannot cancel payment entry if linked with invoices (#26075 )	2021-06-23 11:02:05 +05:30
Saqib	08c269510e	Merge branch 'develop' into pos-fixes-9	2021-06-23 10:15:07 +05:30
GangaManoj	8127208774	fix(Sales Invoice): Reset Asset status on issuing Credit Note	2021-06-22 23:12:56 +05:30
GangaManoj	721ff9438a	Merge branch 'develop' into asset-credit-note	2021-06-22 22:45:11 +05:30
marination	ea2c02738d	fix: Include Stock Reco logic in update_qty_in_future_sle	2021-06-22 21:44:50 +05:30
Saqib Ansari	75ce023170	fix: hide images from cart & details	2021-06-22 21:18:44 +05:30
Saqib Ansari	3b225b13e8	refactor(pos): use pos invoice item name as unique identifier	2021-06-22 21:18:20 +05:30
Deepesh Garg	dc6e4f12c6	Merge pull request #26076 from nextchamp-saqib/export-round-off-fix fix(e-invoicing): IRN generation for export invoices with round off	2021-06-22 20:45:24 +05:30
Deepesh Garg	7b0d86ead5	fix: Do not show received amount after tax for internal tarnsfers	2021-06-22 20:38:35 +05:30
Deepesh Garg	2af8c171c1	fix: Taxes on Internal Transfer payment entry	2021-06-22 19:48:08 +05:30
Noah Jacob	ce72d0c2c1	fix: fixed rounding off ordered percent to 100 in condition (#26148 )	2021-06-22 17:54:16 +05:30
Noah Jacob	c05496a5a7	fix: fixed rounding off ordered percent to 100 in condition (#26152 )	2021-06-22 17:53:53 +05:30
GangaManoj	2e45965405	fix(Asset Repair): Fix Sider issues	2021-06-22 17:24:14 +05:30
GangaManoj	859c8c92f7	fix: Remove changes made to Asset Maintenance	2021-06-22 17:16:12 +05:30
Subin Tom	a446d61e10	fix: Changed profitability analysis report width	2021-06-22 16:51:15 +05:30
GangaManoj	2ea325c0c3	fix(Asset Repair): Revert Stock Entry on cancellation	2021-06-22 16:33:10 +05:30
Subin Tom	219a87d530	fix: disable sales order cancellation if linked to draft invoice (#26125 )	2021-06-22 16:28:58 +05:30
GangaManoj	3a44d88866	fix(Asset): Fix tests for Asset Repair	2021-06-22 16:28:29 +05:30
Subin Tom	e3a697c582	fix: disable sales order cancellation if linked to draft invoice (#26104 )	2021-06-22 16:27:53 +05:30
Subin Tom	889140fd8c	fix: sql syntax error in get_project_name method (#26147 )	2021-06-22 16:26:19 +05:30
GangaManoj	3b0eac79bf	fix(Asset Repair): Compute total_value	2021-06-22 16:26:09 +05:30
Saqib	4b4eb990a9	Merge branch 'develop' into asset-repair-refactor	2021-06-22 16:21:13 +05:30
Subin Tom	943b46a759	fix: sql syntax error in get_project_name method (#26145 )	2021-06-22 14:26:36 +05:30
Deepesh Garg	cfdda21dd2	fix: Export invoices not visible in GSTR-1 report	2021-06-22 13:03:22 +05:30
marination	c212d7fafd	fix: Sort website products by weightage mentioned in Item master	2021-06-22 11:20:23 +05:30
Marica	703c30f5f8	fix: Consistent alert indicators	2021-06-22 11:20:17 +05:30
Dany Robert	884dd9764b	Merge branch 'develop' into patch-4	2021-06-22 11:18:17 +05:30
GangaManoj	d0d5fedd48	fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset	2021-06-22 00:22:08 +05:30
GangaManoj	5b07e58412	fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice	2021-06-21 23:51:09 +05:30
GangaManoj	600333875a	fix(Sales Invoice): Let item.asset be copied on duplicating the doc	2021-06-21 23:41:35 +05:30
rohitwaghchaure	82adb4f16e	Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop fix: material request and supplier quotation not linked if supplier quotation created from supplier portal	2021-06-21 22:36:03 +05:30
marination	f97206b3cb	fix: Sort website products by weightage mentioned in Item master	2021-06-21 19:38:37 +05:30
GangaManoj	5776a962b3	fix(Asset Repair): Return Depreciation Schedule to original state on cancellation	2021-06-21 18:57:11 +05:30
marination	ea0dea46e0	fix: sider and semgrep	2021-06-21 16:51:12 +05:30
marination	49ec0e5ac3	feat: Optionally allow rejected quality inspection on submission	2021-06-21 16:18:35 +05:30
rohitwaghchaure	6a07869e55	Update production_plan.js	2021-06-21 15:41:30 +05:30
Noah Jacob	38f105eaee	test: test cases for fetching customer group details	2021-06-21 15:40:13 +05:30
Rohit Waghchaure	00c05108b2	fix: allow to select group warehouse while downloading materials from production plan	2021-06-21 15:39:49 +05:30
rohitwaghchaure	d6eacf556d	Merge pull request #26126 from rohitwaghchaure/production-plan-fix-to-show-parent-warehouse fix: allow to select group warehouse while downloading materials from production plan	2021-06-21 15:39:13 +05:30
Noah Jacob	acef77fb53	test: test case for fetching supplier group details	2021-06-21 15:39:05 +05:30
rohitwaghchaure	8347eb1dba	Update production_plan.js	2021-06-21 15:38:44 +05:30
Noah Jacob	89215e44a4	feat: details fetched from customer group in customer	2021-06-21 15:37:17 +05:30
Noah Jacob	ffe306c2f6	feat: details fetched from supplier group in supplier	2021-06-21 15:36:46 +05:30
GangaManoj	91a99e0d89	fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation	2021-06-21 15:22:02 +05:30
GangaManoj	f88a13b292	fix(Asset Repair): Compute total_value instantly	2021-06-21 15:02:40 +05:30
Rohit Waghchaure	01faa9ca11	fix: rate not able to change in purchase order	2021-06-21 14:56:38 +05:30
GangaManoj	a34bf5edec	fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'	2021-06-21 14:55:34 +05:30
Rohit Waghchaure	773aabae44	fix: allow to select group warehouse while downloading materials from production plan	2021-06-21 14:54:27 +05:30
GangaManoj	b081d79332	fix(Asset Repair): Fix tests	2021-06-21 14:52:00 +05:30
rohitwaghchaure	3956f82e7c	Merge pull request #26122 from rohitwaghchaure/fix-rate-not-able-to-change fix: rate not able to change in purchase order	2021-06-21 13:40:29 +05:30
Nabin Hait	27f0495156	Merge branch 'version-13' into develop	2021-06-21 11:28:58 +05:30
Nabin Hait	94484d7766	bumped to version 13.5.1	2021-06-21 11:48:57 +05:50
Afshan	127d637b3d	fix: check for duplicate payment terms in Payment Term Template (#25999 )	2021-06-21 11:24:45 +05:30
Ankush	7dae0fbe95	fix: status indicator for delivery notes (bp #26062 ) On list view `per_returned` isn't fetched i.e. `undefined` which become 0 hence the list view indicator is false. This "computation" is already done by status updater, so relying on doc.status is better than redefining it.	2021-06-21 11:19:47 +05:30
Saqib Ansari	9b54aee43e	test: service item purchase with perpetual inventory enabled	2021-06-21 11:18:56 +05:30
Saqib Ansari	d329e27346	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-item-gl-fix	2021-06-21 11:18:45 +05:30
Ankush	e78364c191	fix: status indicator for delivery notes (#26062 ) On list view `per_returned` isn't fetched i.e. `undefined` which become 0 hence the list view indicator is false. This "computation" is already done by status updater, so relying on doc.status is better than redefining it.	2021-06-21 11:15:16 +05:30
Saqib	d8d3e536e0	Merge branch 'develop' into export-round-off-fix	2021-06-21 10:52:12 +05:30
Saqib	fb89008a13	fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097 )	2021-06-21 10:49:09 +05:30
Saqib	7ff19ebec8	fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096 )	2021-06-21 10:48:50 +05:30
Saqib Ansari	99531a35e0	fix(pos): unsupported operand type -= for 'float' and 'NoneType'	2021-06-21 10:47:23 +05:30
Rohit Waghchaure	582f187726	fix: rate not able to change in purchase order	2021-06-21 00:59:02 +05:30
GangaManoj	740df95c58	fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'	2021-06-20 17:44:35 +05:30
Rohit Waghchaure	f0dfea1d47	fix: test case for Project Profitability report	2021-06-20 15:31:25 +05:30
Rohit Waghchaure	e5fb23972a	fix: available qty for consumption	2021-06-20 15:28:25 +05:30
Rohit Waghchaure	110e152fa3	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-20 15:28:23 +05:30
Rohit Waghchaure	6bbc8ec3e8	fix: code cleanup and convert public method to private for subcontracting class	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	d755b29943	fix: toggle consumed qty field based on condition	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	21b58ef045	fix: semgrep error	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	7b7ceaadd9	feat: subcontract code refactor and enhancement	2021-06-20 15:27:01 +05:30
Rohit Waghchaure	9e616b09a2	fix: material request and supplier quotation not linked if sq created from supplier portal against rfq	2021-06-20 15:17:20 +05:30
rohitwaghchaure	ab3cd7e283	Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq fix: material request and supplier quotation not linked if supplier quotation created from supplier portal	2021-06-20 15:16:32 +05:30
Rohit Waghchaure	3d7f660bec	fix: test case for Project Profitability report	2021-06-20 10:20:35 +05:30
Rohit Waghchaure	f5db407461	fix: available qty for consumption	2021-06-19 23:19:45 +05:30
Rohit Waghchaure	5cc3f14506	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	ddb0ec261a	fix: code cleanup and convert public method to private for subcontracting class	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	2fb5291785	fix: toggle consumed qty field based on condition	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	9a2db0b5b1	fix: semgrep error	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	a94b89727c	feat: subcontract code refactor and enhancement	2021-06-19 23:16:22 +05:30
rohitwaghchaure	1c846c5be7	Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix fix: time out while submitting the stock transactions with more than 50 Items	2021-06-19 18:51:47 +05:30
Rohit Waghchaure	4d81d45a0e	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 16:15:08 +05:30
rohitwaghchaure	a2bb1b8acd	Merge pull request #26081 from rohitwaghchaure/fixed-stock-entry-submission-performance fix: time out while submit / cancel the stock transactions with more than 50 Items	2021-06-19 16:14:14 +05:30
Rohit Waghchaure	8c844e4515	fix: material request and supplier quotation not linked if sq created from supplier portal against rfq	2021-06-19 16:08:26 +05:30
GangaManoj	23876c0854	fix(Asset Repair): Prevent some fields from being copied on duplicating the doc	2021-06-19 15:23:06 +05:30
GangaManoj	012b9eaeff	fix(Asset Repair): Make Error Description non-mandatory	2021-06-19 15:18:54 +05:30
GangaManoj	7db7988e4c	fix(Asset Repair): Add Stock Entry field	2021-06-19 14:54:30 +05:30
GangaManoj	09ba6f6477	fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section	2021-06-19 14:06:45 +05:30
GangaManoj	da8da9fa4e	fix: Replace edit_dates with flags.increase_in_asset_life	2021-06-19 14:00:26 +05:30
GangaManoj	2b93e54e1f	fix(Asset Repair): Fix depreciation_amount calculation	2021-06-19 13:45:37 +05:30
GangaManoj	93b9752771	fix: Add comments	2021-06-19 13:06:27 +05:30
Dany Robert	ba288274f2	fix: ignore permission to update call log	2021-06-19 12:31:12 +05:30
Rohit Waghchaure	8520edc952	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 00:55:35 +05:30
Deepesh Garg	52992b345f	Merge pull request #26106 from deepeshgarg007/loan_repay_via_salary fix: Sanctioned loan amount limit check	2021-06-18 23:30:54 +05:30
Deepesh Garg	81c97c13ce	fix: Sanctioned loan amount limit check	2021-06-18 19:57:53 +05:30
Deepesh Garg	22e75725ea	fix: Sanctioned loan amount limit check	2021-06-18 17:25:37 +05:30
Anurag Mishra	ef6e005c04	Merge pull request #26071 from Anurag810/training_event_fixes_2.0 fix: Training event	2021-06-18 15:44:56 +05:30
Ankush	4e88dcf956	fix: auto unlink warehouse from item on delete (#26073 ) (#26101 ) * fix: auto unlink warehouse from item on delete * fix: sider * refactor: use delete_doc * test: add test for unlinking warehouse from item * refactor: add msgprint to inform user of unlink * refactor: cleanup and reuse extant functions * fix: don't delete row, update table Co-authored-by: Alan <2.alan.tom@gmail.com>	2021-06-18 14:48:30 +05:30
Ankush	584fe32900	fix: escaped warehouse value for sql query (bp #26049 ) Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-18 14:47:30 +05:30
Ganga Manoj	3d8f82459b	fix(Issue): reset response_by and resolution_by if SLA is removed (#25997 )	2021-06-18 11:42:28 +05:30
Anuja Pawar	b066fe9519	fix: insufficient permission for dunning error (#26092 )	2021-06-18 11:29:07 +05:30
Saqib	5633834ef7	Merge branch 'develop' into export-round-off-fix	2021-06-18 11:25:21 +05:30
Saqib	cceabff6e1	Merge branch 'develop' into pr-item-gl-fix	2021-06-18 11:24:54 +05:30
Rohit Waghchaure	7fc50ba460	fix: timeout while cancelling stock reconciliation	2021-06-18 10:45:53 +05:30
Deepesh Garg	a58b571ccb	fix: Billing address not fetched in Purchase Invoice	2021-06-18 10:45:35 +05:30
rohitwaghchaure	3bb9f4a742	Merge pull request #26098 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco fix: timeout while cancelling stock reconciliation	2021-06-18 10:44:59 +05:30
Rohit Waghchaure	ef97269386	fix: timeout while cancelling stock reconciliation	2021-06-18 10:11:53 +05:30
GangaManoj	94dfd0e318	fix(Asset): Add function to clear old depreciation schedule	2021-06-18 09:59:45 +05:30
GangaManoj	354116142a	fix(Asset Repair): Create GL Entries for each item in Stock Items	2021-06-18 09:53:18 +05:30
Suraj Shetty	6894cc2832	Merge pull request #26088 from surajshetty3416/refactor-website-routing	2021-06-17 20:43:23 +05:30
Deepesh Garg	59e2e4989b	fix: Incorrect billed qty in Sales Order analytics	2021-06-17 19:58:16 +05:30
Eben van Deventer	ddef85ae97	fix: Correct South Africa VAT Rate (#25894 ) On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.	2021-06-17 18:43:30 +05:30
Deepesh Garg	ceb9d9e870	Merge branch 'develop' into patch-3	2021-06-17 18:26:42 +05:30
Alan	f9390f596d	fix: auto unlink warehouse from item on delete (#26073 ) * fix: auto unlink warehouse from item on delete * fix: sider * refactor: use delete_doc * test: add test for unlinking warehouse from item * refactor: add msgprint to inform user of unlink * refactor: cleanup and reuse extant functions * fix: don't delete row, update table	2021-06-17 18:13:23 +05:30
Deepesh Garg	d3ccb024f8	Merge pull request #26078 from nemesis189/fixed-label-rate-for-purchase-invoice-item-v13 fix: removed extra space from label rate	2021-06-17 17:19:17 +05:30
Saqib Ansari	61675f1a43	fix: purchase receipt gl entries with same item code	2021-06-17 13:05:43 +05:30
GangaManoj	05c70ac584	fix(Asset): Replace asset_value with value_after_depreciation in Finance Books	2021-06-17 13:02:02 +05:30
Deepesh Garg	510077b3d4	fix(minor): Translation and linting issues	2021-06-17 11:21:21 +05:30
Deepesh Garg	b8442816ca	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension	2021-06-17 11:19:12 +05:30
Suraj Shetty	00332d1834	Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing	2021-06-17 09:47:16 +05:30
GangaManoj	66d4e2ba51	fix(Asset Repair): Display value_after_depreciation in Finance Books	2021-06-17 08:28:19 +05:30
Deepesh Garg	913e92c29f	Merge pull request #26044 from GangaManoj/account-multiselect-gl feat(General Ledger): Implement multi-account selection	2021-06-16 22:33:50 +05:30
Deepesh Garg	5c19a9251f	fix: Accouting Dimensions for payroll entry accrual Journal Entry	2021-06-16 22:14:29 +05:30
Subin Tom	6f9de8c86f	fix: removed extra space from label rate	2021-06-16 20:01:29 +05:30
Subin Tom	c03a947e98	fix: removed extra space from label rate	2021-06-16 19:47:55 +05:30
Saqib Ansari	2be7e90e78	fix(e-invoicing): IRN generation for export invoices with round off	2021-06-16 19:00:34 +05:30
GangaManoj	41b7c1aec0	fix(General Ledger): Improve account filter	2021-06-16 14:40:14 +05:30
Afshan	3b1b4684ba	fix: check for duplicate payment terms in Payment Term Template (#26003 )	2021-06-16 14:30:45 +05:30
Afshan	8c73f6f19e	fix(pos): pos loyalty card alignment (#26051 )	2021-06-16 14:28:26 +05:30
Afshan	d5c172590f	fix(pos): pos loyalty card alignment (#26050 )	2021-06-16 14:28:03 +05:30
Saqib	60ce00531d	fix: label for enabling ledger posting of change amount (#26070 )	2021-06-16 14:25:55 +05:30
GangaManoj	86f689e54a	fix(General Ledger): Get account_currency accurately	2021-06-16 14:23:02 +05:30
Anurag Mishra	b1c72da7d7	fix: Training event	2021-06-16 14:08:32 +05:30
Saqib	1fd80992d7	fix(pos): 'NoneType' object is not iterable (#26066 )	2021-06-16 13:27:34 +05:30
Ankush	fd84847f2b	fix: syntax fixes for native class (#26064 )	2021-06-16 11:14:40 +05:30
Deepesh Garg	d70c6996f2	Merge pull request #25951 from nextchamp-saqib/invoice-opening-pnl-validation fix: opening invoices can alter profit and loss of a closed year	2021-06-16 10:52:40 +05:30
GangaManoj	34997789cd	fix(Asset Repair): Filter Warehouse by Company	2021-06-16 10:48:07 +05:30
GangaManoj	6d6aee29e8	fix(Asset Repair): Fix GL Entry creation	2021-06-16 10:42:37 +05:30
GangaManoj	491763fa27	fix(Asset Repair): Fix Sider issues	2021-06-16 08:45:54 +05:30
GangaManoj	a33e751b0f	fix(Asset Repair): Make Cost Center non-mandatory	2021-06-16 08:35:50 +05:30
GangaManoj	abb0c769a4	fix(Asset Repair): Uncheck allow_on_submit for all fields	2021-06-16 08:33:05 +05:30
GangaManoj	c61bbc5915	fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account	2021-06-16 08:26:02 +05:30
GangaManoj	94ac52c47d	fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice	2021-06-16 08:18:45 +05:30
GangaManoj	71c60f75d7	fix(Asset Repair): Filter Cost Center and Project by Company	2021-06-16 08:13:36 +05:30
GangaManoj	9e07b7d4a7	fix(Asset Repair): Add Company field	2021-06-16 08:07:06 +05:30
GangaManoj	bf52f55870	fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked	2021-06-16 07:56:40 +05:30
GangaManoj	695cd70994	fix(Asset Repair): Add title to error messages	2021-06-16 07:50:03 +05:30
GangaManoj	14ea9ebcb7	fix(Asset Repair): Display fields according to the state of the doc	2021-06-16 07:03:32 +05:30
GangaManoj	53a9ac4466	fix(General Ledger): Condense account_conditions	2021-06-16 04:10:29 +05:30
GangaManoj	79dc0f0afc	fix: Remove console.log()	2021-06-16 03:37:11 +05:30
Deepesh Garg	fb9cb78980	Merge pull request #26045 from GangaManoj/filter-cc-project fix(General Ledger): Filter Cost Center and Project drop-down lists by Company	2021-06-15 21:18:49 +05:30
Nabin Hait	0950481253	fix: merge conflict	2021-06-15 20:18:06 +05:30
Nabin Hait	24a88f6cf6	bumped to version 13.5.0	2021-06-15 20:18:40 +05:50
Nabin Hait	1e2df2c109	fix(pos): 'NoneType' object is not iterable	2021-06-15 19:53:57 +05:30
Nabin Hait	b2f2d0e749	chore: Added change log for v13.5.0	2021-06-15 19:44:06 +05:30
Noah Jacob	b5a1491176	fix: escaped warehouse value for sql query (#26049 )	2021-06-15 12:44:04 +05:30
Deepesh Garg	95bc141531	Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13 fix(India): Taxable value for invoices with additional discount	2021-06-15 12:05:16 +05:30
GangaManoj	285bc60684	fix(Asset Repair): Set asset_name as title	2021-06-15 12:02:07 +05:30
GangaManoj	d4acf87feb	fix(Asset Repair): Make Accounting Dimensions section collapsible	2021-06-15 11:37:17 +05:30
Deepesh Garg	433815daba	fix: Update einvoice json test	2021-06-14 20:43:51 +05:30
Deepesh Garg	4afda3c89c	fix(India): Taxable value for invoices with additional discount	2021-06-14 20:43:42 +05:30
Deepesh Garg	5149101045	Merge pull request #26037 from deepeshgarg007/payment_entry_auto_tax_fixes fix: Auto tax calculations in Payment Entry	2021-06-14 20:39:41 +05:30
Deepesh Garg	bbf6121bb5	fix: Revert unintended changes	2021-06-14 20:09:31 +05:30
Deepesh Garg	ac52daa14f	fix: Import throw	2021-06-14 20:09:23 +05:30
Deepesh Garg	5ef9a62917	fix: Add separate function to validate payment entry taxes	2021-06-14 20:09:17 +05:30
Deepesh Garg	302855e160	fix: Auto tax calculations in Payment Entry	2021-06-14 20:09:10 +05:30
Deepesh Garg	4cd0f6ce23	fix: Revert unintended changes	2021-06-14 20:01:04 +05:30
Saqib	80077d215f	fix: patch for adding doctype to sla (#26053 )	2021-06-14 19:34:25 +05:30
Himanshu	ec25d5938b	feat(SLA): Apply SLA to any document (#22449 )	2021-06-14 19:05:52 +05:30
Deepesh Garg	cf1fc40b06	Merge pull request #25906 from deepeshgarg007/gst_taxtable_value_with_discount fix(India): Taxable value for invoices with additional discount	2021-06-14 17:11:08 +05:30
Marica	ff1360a8e6	Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop	2021-06-14 16:48:57 +05:30
GangaManoj	75b30efb05	fix(General Ledger): Filter Project drop-down list by Company	2021-06-14 16:42:27 +05:30
GangaManoj	27ec51f021	fix(General Ledger): Filter Cost Center drop-down list by Company	2021-06-14 16:41:56 +05:30
marination	5d082b05a9	fix: Flaky test for Report Subcontracted Raw materials to be transferred	2021-06-14 16:31:45 +05:30
marination	3b070d1b05	fix: Flaky test for Report Subcontracted Raw materials to be transferred	2021-06-14 14:51:33 +05:30
Deepesh Garg	9eac4d0af6	fix: Import throw	2021-06-14 14:44:19 +05:30
Deepesh Garg	8718013c96	fix: Add separate function to validate payment entry taxes	2021-06-14 14:34:44 +05:30
GangaManoj	0511ffcf30	fix(General Ledger): Implement multi-account selection	2021-06-14 13:22:44 +05:30
Nabin Hait	580b4d50b5	Merge pull request #26027 from ruchamahabal/add-inactive-status-to-employee feat: add Inactive status to Employee	2021-06-14 12:34:33 +05:30
Nabin Hait	ad58182395	Merge pull request #26030 from ruchamahabal/add-inactive-status-to-employee-v13 feat: add Inactive status to Employee	2021-06-14 12:33:28 +05:30
Suraj Shetty	d1902dfadb	Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing	2021-06-14 12:25:49 +05:30
Deepesh Garg	856484aeb0	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount	2021-06-14 11:29:41 +05:30
Deepesh Garg	580346360f	fix: Auto tax calculations in Payment Entry	2021-06-14 11:16:39 +05:30
Marica	d37912fff1	Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop	2021-06-12 16:00:14 +05:30
Anoop	28cdff10cf	fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25926 )	2021-06-12 14:17:04 +05:30
Rucha Mahabal	cf349aadf9	fix: unable to enter score in Assessment Result details grid (#25945 ) (#26031 )	2021-06-12 14:05:12 +05:30
Rucha Mahabal	0ed33aa4e8	fix: unable to enter score in Assessment Result details grid (#25945 )	2021-06-12 13:40:58 +05:30
Rucha Mahabal	17550fb4bf	feat: add Inactive status to Employee	2021-06-12 13:36:47 +05:30
Rucha Mahabal	efd7d584b2	feat: add Inactive status to Employee	2021-06-12 13:34:20 +05:30
Rucha Mahabal	a38147a8ba	feat: add Inactive status to Employee	2021-06-12 13:33:21 +05:30
Anupam Kumar	400205cc8a	fix: payroll entry employee detail issue (#25968 ) * fix: payroll entry employee detail issue * fix: review changes	2021-06-12 12:30:53 +05:30
Ankush Menat	348f04ca82	fix: syntax error in serial/batch selector (#26024 )	2021-06-11 21:01:30 +05:30
Ankush Menat	9891780f5a	perf(minor): remove unnecessary comprehensions (port #25645 )	2021-06-11 18:40:22 +05:30
Marica	19d36be624	Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop	2021-06-11 17:50:43 +05:30
Marica	d7d5c4c329	Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report fix: Report Subcontracted Raw Materials to be Transferred	2021-06-11 17:50:30 +05:30
marination	ea3e61d3b0	fix: Test	2021-06-11 17:29:55 +05:30
marination	c4d851e45f	fix: Test	2021-06-11 17:27:43 +05:30
Ankush Menat	a424c0c023	test(perf): eliminate repeat creation of HSN codes (bp #25947 )	2021-06-11 16:49:39 +05:30
Ankush Menat	a9c84f749a	perf(minor): remove unnecessary comprehensions (#25645 )	2021-06-11 16:00:48 +05:30
Ankush Menat	5bb89b0ead	test(perf): eliminate repeat creation of HSN codes (#25947 )	2021-06-11 15:57:01 +05:30
marination	a4ed6a3519	fix: Sider	2021-06-11 12:51:36 +05:30
marination	c5da51dd7a	fix: Report Raw Materials to be Transferred	2021-06-11 12:51:10 +05:30
marination	ec4a3723cc	fix: Sider	2021-06-11 12:47:06 +05:30
rohitwaghchaure	387de3f3fa	Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop fix: timeout error in the repost item valuation	2021-06-11 12:18:13 +05:30
rohitwaghchaure	da28db3698	Merge pull request #26016 from rohitwaghchaure/fixed-conversion-factor-issue-develop fix: custom conversion factor field not mapped from job card to stock entry	2021-06-11 12:17:54 +05:30
rohitwaghchaure	49f3e5bbd5	Merge pull request #26017 from rohitwaghchaure/donot-copy-difference-account-develop fix: on click of duplicate button system has not copied the difference account	2021-06-11 12:17:36 +05:30
Rohit Waghchaure	17408c6388	fix: on click of duplicate button system copy the difference account from first row	2021-06-11 10:58:00 +05:30
Rohit Waghchaure	9cfd3adad9	fix: custom conversion factor field not mapped from job card to stock entry	2021-06-11 10:56:44 +05:30
Rohit Waghchaure	b103b24ae1	fix: timeout error in the repost item valuation	2021-06-11 10:55:05 +05:30
Rohit Waghchaure	f310501d7d	fix: filter type for item query	2021-06-11 10:53:07 +05:30
marination	687ad9b942	fix: Report Raw Materials to be Transferred	2021-06-10 21:18:19 +05:30
Nabin Hait	42d72b55b8	Merge branch 'version-13-hotfix' into version-13-pre-release	2021-06-10 20:26:31 +05:30
Nabin Hait	d17217c4e2	Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 feat: Tax deduction against advance payments	2021-06-10 20:25:30 +05:30
gavin	46cc089f8b	Merge branch 'develop' into payroll-emp-detail	2021-06-10 20:15:28 +05:30
Nabin Hait	27299cfcc5	Merge branch 'version-13-hotfix' into version-13-pre-release	2021-06-10 19:45:38 +05:30
Anupam	32ebb1001e	fix: review chnages	2021-06-10 19:32:00 +05:30
Deepesh Garg	48f2839079	fix: Sort account balances by account name	2021-06-10 19:00:50 +05:30
Deepesh Garg	3b34fc4cce	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-10 18:57:31 +05:30
Deepesh Garg	5434dd048b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates	2021-06-10 18:56:39 +05:30
Deepesh Garg	0d49b6c211	Merge pull request #26004 from gavindsouza/patch-tests-v13 ci: Update Patch tests (backport)	2021-06-10 18:52:27 +05:30
Saqib	9a67141bfb	fix(einvoicing): service item check (#26010 )	2021-06-10 18:48:55 +05:30
Deepesh Garg	9a243ed469	fix: Sort account balances by account name	2021-06-10 18:16:46 +05:30
Deepesh Garg	a5c3427293	fix: Sort account balances by account name	2021-06-10 18:09:49 +05:30
Deepesh Garg	88176e65e4	fix: Check for gst_hsn_code	2021-06-10 17:31:28 +05:30
walstanb	8f5ae0470d	fix: syntax error in stock entry	2021-06-10 16:35:27 +05:30
Gavin D'souza	137d08a9d7	fix: Manually link_fields from flags before rename_doc	2021-06-10 15:09:17 +05:30
Gavin D'souza	96f8ebc308	fix(patch): Handle NULL values from fieldtype change	2021-06-10 15:08:55 +05:30
Gavin D'souza	3dfbfe87e9	chore: Drop < v10 patches from list v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer There are older version patches still left since they're being used in later ERPNext versions too.	2021-06-10 15:07:56 +05:30
Gavin D'souza	aedf25ba46	chore: Drop old patches v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer	2021-06-10 15:07:39 +05:30
rohitwaghchaure	8975c5241e	Merge pull request #25988 from rohitwaghchaure/donot-copy-difference-account fix: on click of duplicate button system has not copied the difference account	2021-06-10 14:39:56 +05:30
rohitwaghchaure	64cc60f97a	Merge pull request #25946 from gavindsouza/patch-tests ci: Update Patch tests	2021-06-10 14:11:08 +05:30
Deepesh Garg	882913ca4e	Merge pull request #26000 from GangaManoj/gst-settings-card fix: Only display GST card in Accounting Workspace if it's in India	2021-06-10 12:46:15 +05:30
Deepesh Garg	d063f9a5d1	fix: GL Entry ordering	2021-06-10 12:26:21 +05:30
GangaManoj	076bd5eaab	fix: Only display GST card in Accounting Workspace if it's in India	2021-06-10 12:08:44 +05:30
Deepesh Garg	701cba7f03	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount	2021-06-10 12:04:38 +05:30
Deepesh Garg	edecd5b0c6	fix: Update einvoice json test	2021-06-10 12:04:30 +05:30
Deepesh Garg	0b5fe1b5eb	fix: Failing test case	2021-06-10 10:34:49 +05:30
Deepesh Garg	911818a9e2	fix: Add multiple fixes	2021-06-09 22:55:10 +05:30
Saqib	42557c4ad3	feat: cost-center wise period closing entry (#25766 )	2021-06-09 19:48:31 +05:30
Saqib	26f0609390	feat: enable/disable gl entry posting for change given in pos (#25822 )	2021-06-09 19:47:28 +05:30
Deepesh Garg	9e648183db	fix: Test case	2021-06-09 18:26:16 +05:30
Deepesh Garg	7dabb6be30	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-09 18:10:55 +05:30
Deepesh Garg	b57ebba3fd	fix: Validate negative allocated amount in Payment Entry (#25799 )	2021-06-09 17:56:41 +05:30
Deepesh Garg	4c1dad8207	fix: Debug tests	2021-06-09 14:18:23 +05:30
Deepesh Garg	8090965162	fix: Debug test	2021-06-09 13:45:42 +05:30
Deepesh Garg	758db793be	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-09 13:39:07 +05:30
Deepesh Garg	bf5f87c2fe	Merge pull request #25969 from deepeshgarg007/inernal_transfer_invoices_ignore fix: Ignore internal transfer invoices from GST Reports	2021-06-09 13:32:52 +05:30
Deepesh Garg	be631d1caf	Merge pull request #25986 from nextchamp-saqib/einvoicing-service-item-check fix(e-invoicing): service item check	2021-06-09 13:00:43 +05:30
Anupam Kumar	21b8e2f0d8	fix: hiding Rounding Adjustment field (#25380 ) * fix: hiding Rounding Adjustment field * fix: updating purchase_invoice.json	2021-06-09 12:57:21 +05:30
Deepesh Garg	9a282aa593	Merge pull request #25858 from alyf-de/item-tax-templates feat: Item Tax Templates for Germany	2021-06-09 12:50:27 +05:30
Rohit Waghchaure	99b583f688	fix: on click of duplicate button system copy the difference account from first row	2021-06-09 00:06:35 +05:30
Saqib Ansari	18eed58fc5	fix(e-invoicing): service item check	2021-06-08 20:52:14 +05:30
Jannat Patel	6b8c123fd9	fix: Quiz timer (#25983 ) * fix: quiz timer * fix: pass time bound parameter * fix: sider	2021-06-08 18:57:49 +05:30
Rucha Mahabal	5ed2ef493a	Merge pull request #25984 from pateljannat/quiz-fixes-v13 fix: Quiz fixes v13	2021-06-08 18:57:24 +05:30
pateljannat	7ace06ac21	fix: sider	2021-06-08 18:26:23 +05:30
walstanb	646f0c3b53	fix: variable declaration	2021-06-08 17:54:34 +05:30
Saqib	6eeaf9b933	Merge branch 'version-13-hotfix' into asset-repair-refactor	2021-06-08 17:26:50 +05:30
Ganga Manoj	0ea4d850e1	fix: Allow all System Managers to delete company transactions (#25834 )	2021-06-08 17:23:44 +05:30
pateljannat	bbf07d9214	fix: quiz timer issues	2021-06-08 17:05:44 +05:30
Deepesh Garg	e4fcc5562f	refactor: Advance taxes and charges calculation	2021-06-08 16:35:47 +05:30
Sagar Vora	062e247353	test: remove unused imports	2021-06-08 14:43:28 +05:30
Sagar Vora	ca205be5ac	fix: tests	2021-06-08 14:43:28 +05:30
Sagar Vora	0e5e1350b2	perf: use frappe.get_value with wildcard instead of another frappe.get_doc call	2021-06-08 14:43:28 +05:30
Sagar Vora	74818c7b62	fix: improve filter for `from_date`; validation for joining and relieving date	2021-06-08 14:43:28 +05:30
Sagar Vora	447c978757	fix: choose correct Salary Structure Assignment when getting data for formula eval	2021-06-08 14:43:28 +05:30
Sagar Vora	5b1e7a61b8	test: remove unused imports	2021-06-07 19:34:02 +05:30
Sagar Vora	7f5378d98a	fix: tests	2021-06-07 18:40:54 +05:30
Anuja Pawar	d4398fd84a	fix: update cost center from pos (#25971 )	2021-06-07 16:20:21 +05:30
rohitwaghchaure	cf7baeab16	Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue fix: custom conversion factor field not mapped from job card to stock entry	2021-06-07 11:45:44 +05:30
Deepesh Garg	6f2dacc60c	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-06 19:31:50 +05:30
Deepesh Garg	7a20c3b92a	fix: Ignore internal transfer inoices from GST Reports	2021-06-06 19:23:21 +05:30
Deepesh Garg	18be767f75	fix: Remove invalid test	2021-06-06 13:25:34 +05:30
Anupam	bf0528413d	fix: payroll entry employee detail issue	2021-06-06 13:12:13 +05:30
Saqib	d689068d82	Merge pull request #25928 from nextchamp-saqib/pos-fixes-8 fix(pos): multiple pos issues	2021-06-06 11:25:29 +05:30
Saqib Ansari	3f32969bee	fix(pos): broken image in item details section	2021-06-06 11:18:20 +05:30
Saqib Ansari	bc46a9772d	fix(pos): cash shortcuts not working	2021-06-06 11:11:07 +05:30
Saqib Ansari	a85c2c16b4	fix(pos): item rate precision in item selector	2021-06-06 11:07:20 +05:30
Deepesh Garg	3646c301ed	fix: Linting issues	2021-06-05 13:21:03 +05:30
Deepesh Garg	e8a78bd43d	fix: Add test cases	2021-06-05 13:16:39 +05:30
Deepesh Garg	8a7e283926	feat: Item Taxes based on net rate	2021-06-04 22:53:26 +05:30
barredterra	572b6df0f2	Merge branch 'version-13-hotfix' into item-tax-templates	2021-06-04 16:55:11 +02:00
gavin	203a363cd6	Merge branch 'develop' into patch-tests	2021-06-04 20:13:15 +05:30
Gavin D'souza	102afe7de1	fix: Manually link_fields from flags before rename_doc	2021-06-04 20:11:34 +05:30
Gavin D'souza	ac99c719bc	Revert "fix(patch): Reload linked doctypes before renaming dt" This reverts commit `4e2e8daca9` because although it fixed it locally, didn't seem to do anything for erpnext CI	2021-06-04 20:10:26 +05:30
Gavin D'souza	4e2e8daca9	fix(patch): Reload linked doctypes before renaming dt	2021-06-04 17:56:28 +05:30
Gavin D'souza	0b7da52ef1	fix(patch): Handle NULL values from fieldtype change	2021-06-04 17:07:45 +05:30
Sagar Vora	bd92b4339c	perf: use frappe.get_value with wildcard instead of another frappe.get_doc call	2021-06-04 16:09:00 +05:30
Sagar Vora	5657fddb7a	fix: improve filter for `from_date`; validation for joining and relieving date	2021-06-04 16:09:00 +05:30
Sagar Vora	e80902be8e	fix: choose correct Salary Structure Assignment when getting data for formula eval	2021-06-04 16:09:00 +05:30
Ankush Menat	215516f819	fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902 ) (#25957 ) * fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing bench update --patch --reset * fix(minor): use .get instead of getattr Co-authored-by: D Tim Cummings <tim@triptera.com.au>	2021-06-04 13:09:14 +05:30
D Tim Cummings	fb3ec7ccb8	fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902 ) * fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing bench update --patch --reset * fix(minor): use .get instead of getattr	2021-06-04 11:58:45 +05:30
Gavin D'souza	8697e89441	chore: Drop < v10 patches from list v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer There are older version patches still left since they're being used in later ERPNext versions too.	2021-06-04 11:49:56 +05:30
Gavin D'souza	5bf5775b43	chore: Drop old patches v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer	2021-06-04 11:49:56 +05:30
Rucha Mahabal	3f45901f25	fix: invalid 'depends_on' expression in opportunity (#25955 )	2021-06-04 11:16:38 +05:30
Rucha Mahabal	3e92089200	fix: invalid 'depends_on' expression in opportunity (#25953 )	2021-06-04 11:15:38 +05:30
Rohit Waghchaure	af4794b2d1	fix: custom conversion factor field not mapped from job card to stock entry	2021-06-04 10:53:44 +05:30
Saqib	c6e016e545	fix: wrong round off gl entry posted in case of purchase invoice (#25775 )	2021-06-04 10:08:22 +05:30
Saqib Ansari	4a1e270072	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos-fixes-8	2021-06-04 10:04:09 +05:30
Saqib Ansari	48036b4bab	fix: invoices can alter profit and loss of a closed year	2021-06-04 09:54:34 +05:30
GangaManoj	12d9e3b1e6	fix(Asset Repair): Add tests	2021-06-03 22:41:57 +05:30
GangaManoj	b55649f2ec	fix(Asset): Add depreciation schedule details in create_asset()	2021-06-03 22:28:30 +05:30
rohitwaghchaure	25b953ad16	Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation fix: timeout error in the repost item valuation	2021-06-03 22:14:22 +05:30
rohitwaghchaure	cd503ce01d	Merge pull request #25938 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-v13-pre fix: timeout error in the repost item valuation	2021-06-03 22:14:01 +05:30
GangaManoj	aa9bbe51bd	fix(Asset Repair): Add Company in GL Entries	2021-06-03 21:28:58 +05:30
GangaManoj	034f7bde33	fix(Asset Repair): Remove unnecessary condition	2021-06-03 21:12:43 +05:30
rohitwaghchaure	c59371ab0c	fix: filter type for item query (#25942 )	2021-06-03 20:02:58 +05:30
Rohit Waghchaure	8449a47048	fix: filter type for item query	2021-06-03 18:32:28 +05:30
barredterra	c99eaf106e	Merge branch 'version-13-hotfix' into item-tax-templates	2021-06-03 14:17:43 +02:00
Rohit Waghchaure	4e10ce1632	fix: timeout error in the repost item valuation	2021-06-03 16:35:59 +05:30
Rohit Waghchaure	10558344b0	fix: timeout error in the repost item valuation	2021-06-03 16:34:31 +05:30
Marica	7437748a1d	Merge pull request #25805 from ankush/refactor_item refactor: item doctype	2021-06-03 14:23:18 +05:30
Saqib Ansari	81b9a5ee47	fix(pos): cannot cancel consolidated sales invoice	2021-06-03 12:59:09 +05:30
Saqib Ansari	311b378328	fix(pos): searching items with barcode or serial no	2021-06-03 12:58:53 +05:30
rohitwaghchaure	40b90e5b6e	Merge pull request #25478 from noahjacob/prod_plan_feat feat: Added check box to combine items with same BOM	2021-06-03 12:37:02 +05:30
Anoop	f899b3a633	fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25921 )	2021-06-03 09:24:31 +05:30
GangaManoj	9fb47795c4	fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked	2021-06-03 04:55:49 +05:30
GangaManoj	2ceeb8138d	fix(Asset Repair): Set company when creating Stock Entry	2021-06-03 01:54:44 +05:30
GangaManoj	960840dc3a	fix(Asset Repair): Set completion_date	2021-06-03 01:53:13 +05:30
Marica	e7d9200e0f	Merge pull request #25221 from Alchez/dev-quality-inspection-accounts feat: create Quality Inspections from account and stock documents	2021-06-03 01:39:05 +05:30
Nabin Hait	811f607c85	Merge branch 'version-13' into develop	2021-06-02 22:14:20 +05:30
Nabin Hait	8821d71094	bumped to version 13.4.1	2021-06-02 22:34:19 +05:50
barredterra	9affcd8f54	Merge branch 'version-13-hotfix' into item-tax-templates	2021-06-02 17:54:02 +02:00
Nabin Hait	88d94dbf0a	Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item fix: not able to select the item code in work order	2021-06-02 19:00:34 +05:30
Raffael Meyer	f6627550d1	fix: remove wrong tax_category	2021-06-02 15:17:00 +02:00
barredterra	3c748efae3	feat: add Item Tax Templates for german COAs "SKR03" and "SKR04"	2021-06-02 13:27:15 +02:00
barredterra	b6f27a4cae	feat: set is_default for german tax templates	2021-06-02 13:20:33 +02:00
barredterra	f259bf48aa	refactor: make tax category	2021-06-02 13:20:03 +02:00
barredterra	e3557ff131	Merge branch 'version-13-hotfix' into item-tax-templates	2021-06-02 12:17:27 +02:00
Rohan Bansal	a06ec03efc	test: add test for new QI function	2021-06-02 14:55:31 +05:30
Rohit Waghchaure	5dd92934ae	fix: not able to select the item code in work order	2021-06-02 14:27:24 +05:30

... 7 8 9 10 11 ...

28019 Commits