verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 90 Releases Wiki Activity

#4466 invoiceInCorrection #176

Merged
jorgep merged 22 commits from 4666-invoiceInCorrection into dev 2024-02-09 07:46:15 +00:00
Conversation 0 Commits 22 Files Changed 25 +9 -10
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 814c8dc0e2 - Show all commits

19
src/router/modules/invoiceIn.js
View File

@ -114,7 +114,15 @@ export default {
import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
},
{
<<<<<<< HEAD
name: 'InvoiceInLog',
path: 'log',
meta: {
title: 'log',
icon: 'history',
},
component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
},
{
name: 'InvoiceInCorrective',
path: 'corrective',
meta: {
@ -123,15 +131,6 @@ export default {
},
component: () =>
import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
=======
name: 'InvoiceInLog',
path: 'log',
meta: {
title: 'log',
icon: 'history',
},
component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
>>>>>>> 013a00d653a4f2d2c766d8460d56fe62403fe3df
},
],
},