Merge remote-tracking branch...
Merge remote-tracking branch 'refs/remotes/origin/dev#77981_675_contractuelst_cloud_enregistrement_de_la_notion_de_cotisation_dans_fiche_lecteur_carte_bloquee' into origin-master Conflicts: tests/db/UpgradeDBTest.php tests/fixtures/KohaFixtures.php
Branches
Tags
Showing
- VERSIONS_WIP/77981 1 addition, 0 deletionsVERSIONS_WIP/77981
- library/Class/WebService/SIGB/Emprunteur.php 32 additions, 1 deletionlibrary/Class/WebService/SIGB/Emprunteur.php
- library/Class/WebService/SIGB/Koha/PatronInfoReader.php 11 additions, 0 deletionslibrary/Class/WebService/SIGB/Koha/PatronInfoReader.php
- library/Class/WebService/SIGB/Orphee/GetInfoUserCarteResponseReader.php 23 additions, 1 deletion...WebService/SIGB/Orphee/GetInfoUserCarteResponseReader.php
- tests/application/modules/admin/controllers/UsersControllerTest.php 11 additions, 0 deletions...ication/modules/admin/controllers/UsersControllerTest.php
- tests/fixtures/KohaFixtures.php 77 additions, 8 deletionstests/fixtures/KohaFixtures.php
- tests/library/Class/WebService/SIGB/KohaTest.php 51 additions, 0 deletionstests/library/Class/WebService/SIGB/KohaTest.php
- tests/library/Class/WebService/SIGB/OrpheeServiceTest.php 12 additions, 0 deletionstests/library/Class/WebService/SIGB/OrpheeServiceTest.php
Please register or sign in to comment