refs #6681 - PR3 - Resolve conflicts #166

alexm · 2024-01-29T07:16:24Z

alexm commented

2024-01-29 07:16:24 +00:00

No description provided.

alexm added 85 commits 2024-01-29 07:16:26 +00:00

a2c96d276e Supplier Basic data, Billing data and Fiscal data

5e9006bf33 Fix travel summary cards

edb1c1c71a Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SupplierSubmodules

4d0d051c8a supplier log submodule

aa1f8c4f3b Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SupplierSubmodules-2

473e96ffb4 wip

865a13aafa Submodulos de suppliers: Accounts, Contacts y Addresses

c21afccf75 Se crea el formulario para agregar nuevas observaciones en la tablade morosos

725bd7a180 Merge pull request 'feature/SupplierSubmodules' (#61 ) from feature/SupplierSubmodules into dev

Reviewed-on: hyervoni/salix-front-mindshore#61

dd8373ea22 Se hacen mejoras al momento de hacer las peticiones y se refresca la data actualizada

dab2fa9d90 Merge pull request 'Se crea el formulario para agregar nuevas observaciones en la tablade morosos' (#62 ) from features/ms_116_add_new_observations into dev

Reviewed-on: hyervoni/salix-front-mindshore#62

091446178b Se crea tarjeta de data fiscal

5511e365aa WIP

dfb716eb04 Mejora solicitada

8e11320593 Merge pull request 'Se crea tarjeta de data fiscal' (#63 ) from features/ms_117_fiscal_data_card into dev

Reviewed-on: hyervoni/salix-front-mindshore#63

9bc60ff3c3 Se crea tarjeta de formas de pago

50492151d8 Merge pull request 'Se crea tarjeta de formas de pago' (#64 ) from features/ms_117_billing_data_card into dev

Reviewed-on: hyervoni/salix-front-mindshore#64

53a832ae6a supplier consumption submodule

9aeba37140 Autocomplete postcodes

19d793a939 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

d2ee8a98eb Se crea la tarjeta que muestra el listado de consignatarios existentes y la tarjeta de creacion

627226d3cd Entry list

2b6faf8186 merge with dev

f9cbf03991 Se corrige el componente por comentario en pr

3905dd05df Merge pull request 'feature/SupplierSubmodules-2' (#66 ) from feature/SupplierSubmodules-2 into dev

Reviewed-on: hyervoni/salix-front-mindshore#66

bf19ce630d Nueva correccion por comentario

2d49beab63 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-95-postcode-autocomplete

4bf16da814 Improve autocompletion

207a5a5908 changes

3d98bf578e Create route list

7432f754f5 Merge branch 'dev' into features/ms_118_consignees_cart

6e04de47a4 Merge pull request 'Se crea la tarjeta que muestra el listado de consignatarios existentes y la tarjeta de creacion' (#65 ) from features/ms_118_consignees_cart into dev

Reviewed-on: hyervoni/salix-front-mindshore#65

f64ac5c70d Entry summary

b41da81f3e Merge pull request 'feature/ms-95-postcode-autocomplete' (#67 ) from feature/ms-95-postcode-autocomplete into dev

Reviewed-on: hyervoni/salix-front-mindshore#67

129cacb88b Merge pull request 'feature/ms-115-EntryListView' (#68 ) from feature/ms-115-EntryListView into dev

Reviewed-on: hyervoni/salix-front-mindshore#68

91f675ec99 small table visual change in entry summary

c471a4febc Se crea el formulario para la creacion de un agente de aduanas

46c9244f1b Merge pull request 'Se crea el formulario para la creacion de un agente de aduanas' (#69 ) from features/ms_118_new_customs_agent into dev

Reviewed-on: hyervoni/salix-front-mindshore#69

3e272537aa Merge branch 'dev' into bugfix/travel-cards

619427e7f9 Merge pull request 'Fix travel summary cards' (#55 ) from bugfix/travel-cards into dev

Reviewed-on: hyervoni/salix-front-mindshore#55

29418d22bb Se crea formulario de actualización de un agente de aduanas y observaciones

596904c4f8 Entry submodules: Log, Basic data, Buys (WIP)

64a4a800f7 Entry buys import

5d9e48c979 Merge branch 'feature/EntrySubmodules' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-141-EntrySubmoduleNotes

27f9d5a7b2 Se crea tarjeta de notas, lectura y creacion

e6c59866d1 Entry notes submodule

e1ac98cf3e Add route list filter

a41fd4c487 Merge pull request 'feature/EntrySubmodules' (#71 ) from feature/EntrySubmodules into dev

Reviewed-on: hyervoni/salix-front-mindshore#71

a68f53d9f7 Add route form

3671a7b449 Entry descriptor

7753c365e4 Apply Entry descriptor to extra community table

ecea050b77 Add route list actions

9cd1f542aa WIP

a06f9a279e Se hacen correcciones solicitadas

4838549748 Merge branch 'dev' into features/ms_118_update_customs_agent

904cef8860 Merge pull request 'Se crea formulario de actualización de un agente de aduanas y observaciones' (#70 ) from features/ms_118_update_customs_agent into dev

Reviewed-on: hyervoni/salix-front-mindshore#70

91e36e6404 Se crea la tarjeta de creditos, listado y creacion

903b02a66f Correccion solicitada

039a9332a9 Merge pull request 'Se crea la tarjeta de creditos, listado y creacion' (#75 ) from features/ms_119_credits_card into dev

Reviewed-on: hyervoni/salix-front-mindshore#75

13de9a4b23 Merge pull request 'feature/ms-138-EntryDescriptor' (#72 ) from feature/ms-138-EntryDescriptor into dev

Reviewed-on: hyervoni/salix-front-mindshore#72

d818dd745a merge with dev and resolve conflicts

4b69c69253 Merge pull request 'feature/ms-141-EntrySubmoduleNotes' (#74 ) from feature/ms-141-EntrySubmoduleNotes into dev

Reviewed-on: hyervoni/salix-front-mindshore#74

8f47a0bc2b Update router list

161bfab443 Add subfilter to entry list view and entry descriptor improvements

553dfceca8 Merge pull request 'feature/ApplyFilterSectionToEntryList' (#76 ) from feature/ApplyFilterSectionToEntryList into dev

Reviewed-on: hyervoni/salix-front-mindshore#76

661e9d4368 Create route summary

f66af0e663 Merge pull request 'Create Route module' (#73 ) from feature/routes into dev

Reviewed-on: hyervoni/salix-front-mindshore#73

9588ffb54b remove log

862dc20bcd Add translation to SupplierCard search-bar

c7b9f4ce5b Change entry buys plural translation logic

cae42486c8 apply nowrap to QTooltip

5d0290f585 Fix QFile label translation in entry buys

a888472ad2 Fix tooltip label in supplier agency term

533435c7ba Remove pre tag in WorkerCreate component

2400eca1e3 Se hace correccion solicitada en issuecomment-39495

9c2267e116 Se hace correccion solicitada en issuecomment-39487

9d4d3bf84d Se hace correccion solicitada en issuecomment-39488

30c90e534c Se hace correccion solicitada en issuecomment-39493

def175bee2 move QList element and classes inside VnFilterPanel

29dac7c372 Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-3

4731bdbabd Make card-list a global class

23210600ac Se hace correccion solicitada en issuecomment-39539

3fc1bff213 Se hace correccion solicitada en issuecomment-39650

9a23bb2ed2 Se corrige comentario 39968

f8e7ba4dac Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-PR-3

alexm changed title from ~~hyervoni-PR-3~~ to refs #6681 - PR3 - Resolve conflicts

2024-01-29 07:17:16 +00:00

alexm requested review from jsegarra 2024-01-29 07:18:08 +00:00

jsegarra approved these changes 2024-01-29 07:18:56 +00:00

Dismissed

pablone approved these changes 2024-01-29 07:23:35 +00:00

Dismissed

alexm requested review from jorgep 2024-01-29 07:25:33 +00:00

jorgep approved these changes 2024-01-29 07:28:26 +00:00

Dismissed

alexm added 1 commit 2024-01-29 07:31:00 +00:00

30ff6e52cc Empty commit

alexm added 1 commit 2024-01-29 07:39:04 +00:00

70e912fc92 refs #6681 try fix jenkins

alexm dismissed jsegarra’s review 2024-01-29 07:39:04 +00:00

Reason:

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

alexm dismissed pablone’s review 2024-01-29 07:39:04 +00:00

Reason:

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

alexm dismissed jorgep’s review 2024-01-29 07:39:04 +00:00

Reason:

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

alexm added 1 commit 2024-01-29 07:41:48 +00:00

gitea/salix-front/pipeline/pr-dev This commit looks good Details

935211a71f refs #6681 try fix jenkins

jsegarra approved these changes 2024-01-29 07:44:33 +00:00

jorgep approved these changes 2024-01-29 08:21:54 +00:00

alexm merged commit f715c615d2 into dev

2024-01-29 08:29:45 +00:00

alexm deleted branch hyervoni-PR-3

2024-01-29 08:29:46 +00:00

alexm referenced this issue from a commit

2024-01-29 08:29:48 +00:00

Merge pull request 'refs #6681 - PR3 - Resolve conflicts' (!166) from hyervoni-PR-3 into dev

alexm referenced this pull request

2024-01-29 08:34:03 +00:00

PR-3 #160

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

4 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#166