refs #6595 - PR2 - Resolve conflicts #144

Merged
alexm merged 250 commits from hyervoni-branch-PR-2 into dev 2024-01-11 12:22:28 +00:00
Member
No description provided.
alexm added 203 commits 2024-01-03 13:20:20 +00:00
8e0ee45901 Create Shelving list module
Adds shelving list, preview and update
c0f6906119 Merge branch 'dev' into feature/order
# Conflicts:
#	src/i18n/en/index.js
#	src/router/modules/index.js
gitea/salix-front/pipeline/head This commit looks good Details
b62a317a66
refs #6595 fix: customerExtendedListFilter
alexm added 42 commits 2024-01-09 06:47:33 +00:00
733baa1310 Merge branch 'dev' into feature/order
# Conflicts:
#	src/i18n/en/index.js
8a6e78a143 Merge branch 'dev' into feature/order-catalog-filter
# Conflicts:
#	src/components/ui/VnFilterPanel.vue
#	src/pages/Order/Card/OrderCatalogFilter.vue
#	src/pages/Order/OrderCatalog.vue
alexm changed title from PR2 - Resolve conflicts to refs #6595 - PR2 - Resolve conflicts 2024-01-09 14:21:34 +00:00
alexm added 1 commit 2024-01-11 11:05:14 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
c362b31fb8
refs #6595 fix: VnSelectFilter fix: invoiceIn
alexm added 1 commit 2024-01-11 11:08:52 +00:00
alexm added 1 commit 2024-01-11 11:13:13 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
7b974a2f32
refs #6595 fix: remove duplicated
alexm requested review from jsegarra 2024-01-11 11:18:10 +00:00
jsegarra approved these changes 2024-01-11 12:10:38 +00:00
Dismissed
alexm added 1 commit 2024-01-11 12:12:30 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
489ea94d3f
refs #6595 fix invoiceInBasicData
alexm dismissed jsegarra’s review 2024-01-11 12:12:30 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

alexm added 1 commit 2024-01-11 12:13:05 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
b3f412a6f7
Merge branch 'dev' into hyervoni-branch-PR-2
jsegarra approved these changes 2024-01-11 12:16:55 +00:00
alexm requested review from carlossa 2024-01-11 12:20:52 +00:00
carlossa approved these changes 2024-01-11 12:21:22 +00:00
alexm merged commit 969cec9bd3 into dev 2024-01-11 12:22:28 +00:00
alexm deleted branch hyervoni-branch-PR-2 2024-01-11 12:22:28 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#144
No description provided.