forked from verdnatura/salix-front
Merge branch 'master' into test
This commit is contained in:
commit
c5903e29e8
|
@ -285,6 +285,11 @@ defineExpose({
|
|||
:params="params"
|
||||
:columns="splittedColumns.columns"
|
||||
/>
|
||||
<slot
|
||||
name="moreFilterPanel"
|
||||
:params="params"
|
||||
:columns="splittedColumns.columns"
|
||||
/>
|
||||
</template>
|
||||
</VnFilterPanel>
|
||||
</QScrollArea>
|
||||
|
|
|
@ -246,6 +246,7 @@ globals:
|
|||
mailForwarding: Mail forwarding
|
||||
mailAlias: Mail alias
|
||||
privileges: Privileges
|
||||
labeler: Labeler
|
||||
created: Created
|
||||
worker: Worker
|
||||
now: Now
|
||||
|
|
|
@ -248,6 +248,7 @@ globals:
|
|||
components: Componentes
|
||||
pictures: Fotos
|
||||
packages: Bultos
|
||||
labeler: Etiquetas
|
||||
created: Fecha creación
|
||||
worker: Trabajador
|
||||
now: Ahora
|
||||
|
|
|
@ -98,7 +98,6 @@ const printBuys = (rowId) => {
|
|||
ref="myEntriesRef"
|
||||
data-key="myEntriesList"
|
||||
url="Entries/filter"
|
||||
:order="['landed DESC', 'id DESC']"
|
||||
:columns="columns"
|
||||
default-mode="card"
|
||||
auto-load
|
||||
|
|
Loading…
Reference in New Issue