Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,702 Commits 3 Branches 0 Tags 1 GiB
d066eab6cd
Commit Graph

27375 Commits

Author SHA1 Message Date
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
marination
f5fa1ee4b6 fix: Country Link field in 'Add address' website modal auto-clears 2021-06-24 11:03:32 +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
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
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
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
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
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
Deepesh Garg
35e11fbea6 fix: Tests 2021-06-23 13:17:01 +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
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
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
marination
ea2c02738d fix: Include Stock Reco logic in update_qty_in_future_sle 2021-06-22 21:44:50 +05:30
Noah Jacob
c05496a5a7
fix: fixed rounding off ordered percent to 100 in condition (#26152) 2021-06-22 17:53:53 +05:30
Subin Tom
219a87d530
fix: disable sales order cancellation if linked to draft invoice (#26125) 2021-06-22 16:28:58 +05:30
Subin Tom
889140fd8c
fix: sql syntax error in get_project_name method (#26147) 2021-06-22 16:26:19 +05:30
Deepesh Garg
cfdda21dd2 fix: Export invoices not visible in GSTR-1 report 2021-06-22 13:03:22 +05:30
Marica
703c30f5f8
fix: Consistent alert indicators 2021-06-22 11:20:17 +05:30
marination
f97206b3cb fix: Sort website products by weightage mentioned in Item master 2021-06-21 19:38:37 +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
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
rohitwaghchaure
8347eb1dba
Update production_plan.js 2021-06-21 15:38:44 +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
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
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
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097) 2021-06-21 10:49:09 +05:30
Rohit Waghchaure
582f187726 fix: rate not able to change in purchase order 2021-06-21 00:59:02 +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
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
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
81c97c13ce fix: Sanctioned loan amount limit check 2021-06-18 19:57:53 +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
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
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
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
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
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
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
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
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
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
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
Noah Jacob
b5a1491176
fix: escaped warehouse value for sql query (#26049) 2021-06-15 12:44:04 +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
4cd0f6ce23 fix: Revert unintended changes 2021-06-14 20:01:04 +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
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
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
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
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
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
17550fb4bf feat: add Inactive status to Employee 2021-06-12 13:36:47 +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
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
c4d851e45f fix: Test 2021-06-11 17:27:43 +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
ec4a3723cc fix: Sider 2021-06-11 12:47:06 +05:30
marination
687ad9b942 fix: Report Raw Materials to be Transferred 2021-06-10 21:18:19 +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
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
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
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
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
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
Anuja Pawar
d4398fd84a
fix: update cost center from pos (#25971) 2021-06-07 16:20:21 +05:30
18alantom
6f79c4c348 fix: add account filter 2021-06-07 13:58:45 +05:30
18alantom
23b907df1a fix: use stock value diff for calculation 2021-06-07 13:52:26 +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
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
18alantom
672c8bb112 feature: report for cost of goods sold by item group 2021-06-04 16:44:30 +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
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity (#25955) 2021-06-04 11:16: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
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
c59371ab0c
fix: filter type for item query (#25942) 2021-06-03 20:02:58 +05:30
barredterra
c99eaf106e Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-03 14:17:43 +02:00
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
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
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
Rohan Bansal
11aff80dea Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-06-02 14:22:32 +05:30
Rohit Waghchaure
721b4130db fix: not able to select the item code in work order 2021-06-02 14:13:09 +05:30
Deepesh Garg
7c7c084159 fix: Check for tax category 2021-06-02 14:12:28 +05:30
Deepesh Garg
ca34eec2d6 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-02 13:26:27 +05:30
Deepesh Garg
b3ed807b70 fix: Regional settings setup 2021-06-02 13:26:21 +05:30
Deepesh Garg
c6dcc9d94a fix(India): Taxable value for invoices with additional discount 2021-06-01 13:13:04 +05:30
Rohit Waghchaure
6432aaa07a feat: added reports to check incorrect qty and valuation for serialized items 2021-06-01 12:46:43 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error (#25882) 
* fix: chart of accounts importer always error 

chart of accounts importer always error Parent Account Missing

* Update chart_of_accounts_importer.py
 2021-06-01 12:15:58 +05:30
Ankush Menat
2c7fac0e76
fix: reload doc for possible future schema changes (#25904) 2021-06-01 11:56:00 +05:30
Deepesh Garg
2f5885627d fix: Labeling and other fixes 2021-06-01 11:07:18 +05:30
Jannat Patel
1175e0686b
refactor: leave balance report (#25771) 
* refactor: leave balance report

* refactor: sql to orm
 2021-06-01 10:53:00 +05:30
Ganga Manoj
c8b34798fe
fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items (#25840) 2021-06-01 10:44:26 +05:30
rohitwaghchaure
970f00922d
Merge pull request #25898 from anupamvs/stock-reconciliation 
fix: featching serialized items
 2021-05-31 20:00:35 +05:30
Jannat Patel
022b5c973a
fix: wrap dates in getdate for leave application (#25899) 
* fix: wrap dates in getdate for leave application

* fix: translation issue

* fix: replaced today with getdate
 2021-05-31 19:49:53 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles (#25847) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-31 19:49:03 +05:30
Deepesh Garg
0ea6725baa
fix: Rename Loan Management workspace to Loans (#25856) 2021-05-31 19:48:31 +05:30
Anupam
0358b64743 fix: featching serialized items 2021-05-31 15:59:32 +05:30
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup (#25871) 2021-05-31 15:36:20 +05:30
Saqib
89f621baa4
fix(pos): closing entry shows incorrect expected amount (#25868) 2021-05-31 09:56:49 +05:30
Rucha Mahabal
3be28054de
refactor: Vehicle Expenses Report (#25727) 
* refactor: Vehicle Expense Report

* test: Vehicle Expenses Report

* feat: Added Employee filter to report

- fix Vehicle Log form view

* fix: set currency fieldtype for chart data

- added filters for employee and vehicle

* fix: service expenses not getting set
 2021-05-31 09:11:42 +05:30
Marica
42b2ea556f
Merge pull request #25358 from noahjacob/maintenance_feat 
refactor: maintenance schedule and visit enhancements.
 2021-05-30 01:20:30 +05:30
Deepesh Garg
48b1a82fa1 fix: Add accounts and templates for reverse charge 2021-05-29 23:54:51 +05:30
Deepesh Garg
ea4f8102e8
Merge pull request #25869 from nextchamp-saqib/plaid-link-reset 
fix(plaid): cannot reset plaid link for a bank account
 2021-05-29 20:05:25 +05:30
Deepesh Garg
d067e25dad
Merge pull request #25828 from Anuja-pawar/issue-summary-report-fix 
fix: Add Hold status column in the Issue Summary Report
 2021-05-29 19:24:15 +05:30
Deepesh Garg
c3d8115ca1
Merge pull request #25849 from nextchamp-saqib/pos-rate-as-identifier 
fix(pos): cannot add same item with different rates
 2021-05-29 17:33:11 +05:30
Deepesh Garg
5483f21fe7
Merge pull request #25872 from nextchamp-saqib/fix-pos-broken-img 
fix(pos): rendering of broken image on pos
 2021-05-29 17:28:03 +05:30
Ankush Menat
431d3295b4
fix: use dictionary filter instead of list (#25874) 
Item query doesn't support list filter anymore.
 2021-05-28 21:12:25 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address 
fix(India): Show only company addresses for ITC reversal entry
 2021-05-28 18:46:09 +05:30
Saqib Ansari
b72b4c0bf9 fix(pos): rendering of broken image on pos 2021-05-28 17:38:01 +05:30
Noah Jacob
6fb218e033 refactor: suggested changes 2021-05-28 16:15:50 +05:30
Saqib Ansari
05386ff12f chore: remove unwanted method 2021-05-28 12:58:18 +05:30
Deepesh Garg
20be7fb93d fix(India): Show only company addresses for ITC reversal entry 2021-05-28 11:57:38 +05:30
Saqib Ansari
bbce2e91a3 fix: reset plaid link button 2021-05-28 11:56:47 +05:30
Saqib Ansari
d24eccd623 fix(plaid): cannot reset plaid link for a bank account 2021-05-28 11:36:24 +05:30
noahjacob
0b02f1335f refactor: removed redundant links in test case 2021-05-28 11:04:34 +05:30
noahjacob
d071586589 refactor: removed maintenance schedule detail link 2021-05-28 10:54:35 +05:30
noahjacob
7fa045c1c9 refactor: using parent form links of maintenance schedule 2021-05-28 10:54:35 +05:30
noahjacob
3bca90dbe6 refactor: updated mapping for maintenance schedule links in maintenance visit 2021-05-28 10:54:22 +05:30
Suraj Shetty
68b050de97
Merge pull request #25863 from surajshetty3416/website-theme-fixes-version-13-hotfix 2021-05-28 10:48:23 +05:30
Ganga Manoj
17736afab5
fix(POS): Fix stock availability calculation if negative_stock_allowed is checked (#25859) 2021-05-28 10:03:41 +05:30
Ganga Manoj
8a776a63cd
fix(POS): Add Product Bundles to POS item search (#25860) 2021-05-28 09:56:30 +05:30
Suraj Shetty
f4db3139b7 refactor: Use css variables for breakpoint value 2021-05-28 09:22:46 +05:30
prssanna
c4d4be3265 fix: ensure website theme is applied correctly 2021-05-28 09:22:45 +05:30
Suraj Shetty
113a6f3d80 fix: Use frappe.safe_eval instead of eval 2021-05-28 09:10:34 +05:30
Suraj Shetty
96542c3d04 style: Fix sider issues 2021-05-28 09:10:34 +05:30
Suraj Shetty
273589e835 test: Fix a case where test used to fail due to holiday list 
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
 2021-05-28 09:10:33 +05:30
Suraj Shetty
54354a84e1 test: Fix permission error 2021-05-28 09:10:33 +05:30
Suraj Shetty
d48ea663d9 test: Fix test name 
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
 2021-05-28 09:10:33 +05:30
Suraj Shetty
d1a13ec050 test: Fix valuation rate for raw materials 2021-05-28 09:10:33 +05:30
Suraj Shetty
a891d6eed2 fix: allow_zero_valuation_rate for rejected qty 2021-05-28 09:10:33 +05:30
Suraj Shetty
19c5fd72d6 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-28 09:10:33 +05:30
Suraj Shetty
ab8816e11d test: Fix test dependency 2021-05-28 09:09:36 +05:30
Suraj Shetty
175cb27bcb test: Pass ConflictingTaxRule during tax rule test 2021-05-28 09:09:36 +05:30
Suraj Shetty
c26d41acf9 chore: Remove unnecessary print statements 2021-05-28 09:09:36 +05:30
Suraj Shetty
232cd28d67 test: Fix dependencies 2021-05-28 09:07:57 +05:30
Suraj Shetty
7b74985a54 test: Fix test_dependencies 2021-05-28 09:07:57 +05:30
Suraj Shetty
34e620fb5b test: Fix dependency 2021-05-28 09:07:57 +05:30
Deepesh Garg
a150645b57 fix: Remove GL Entry from print 2021-05-27 20:10:50 +05:30
Deepesh Garg
2e83cb77ca fix: Split GL Entry 2021-05-27 20:09:45 +05:30
Deepesh Garg
4311fdc3a1 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-27 17:49:23 +05:30
barredterra
50794407b4 feat: Item Tax Templates for Germany 2021-05-27 14:17:53 +02:00
barredterra
86ee3ebb09 feat: create tax category during taxes setup 2021-05-27 14:16:26 +02:00
barredterra
46d39d27aa fix: validate company in taxes setup 2021-05-27 14:16:01 +02:00
anushka19
04dfaf3b2a fix: Broken help links fixed 2021-05-27 17:45:37 +05:30
Deepesh Garg
740c68d075 fix: Debug Test 2021-05-27 17:43:53 +05:30
noahjacob
fbc8694291 refactor: added maintenance schedule links to parent form 2021-05-27 17:37:57 +05:30