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
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
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
Subin Tom
a446d61e10
fix: Changed profitability analysis report width
2021-06-22 16:51:15 +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
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
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
Dany Robert
884dd9764b
Merge branch 'develop' into patch-4
2021-06-22 11:18:17 +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
rohitwaghchaure
6a07869e55
Update production_plan.js
2021-06-21 15:41:30 +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
rohitwaghchaure
8347eb1dba
Update production_plan.js
2021-06-21 15:38:44 +05:30
Rohit Waghchaure
01faa9ca11
fix: rate not able to change in purchase order
2021-06-21 14:56:38 +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
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
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
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
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
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
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
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
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
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
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
