Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

clivi
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

7720cb5b

Commit 7720cb5b authored 10 years ago by goujonpa

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.utc.fr/nf17-camp-p14/clivi

Conflicts:
	class/boolfield.php
	class/field.php

parents a3b603d7 53dd7cdb

No related branches found

No related tags found

Loading

Changes 21

Hide whitespace changes

Inline Side-by-side

Showing

class/animal.php 29 additions, 15 deletions

class/animal.php
class/boolfield.php 6 additions, 4 deletions

class/boolfield.php
class/employe.php 6 additions, 2 deletions

class/employe.php
class/espece.php 16 additions, 5 deletions

class/espece.php
class/facture.php 27 additions, 20 deletions

class/facture.php
class/field.php 17 additions, 7 deletions

class/field.php
class/foreignfield.php 51 additions, 0 deletions

class/foreignfield.php
class/form.php 3 additions, 2 deletions

class/form.php
class/ligneOrdonnance.php 5 additions, 5 deletions

class/ligneOrdonnance.php
class/objet.php 20 additions, 9 deletions

class/objet.php
class/ordonnance.php 12 additions, 5 deletions

class/ordonnance.php
class/produit.php 9 additions, 5 deletions

class/produit.php
class/race.php 20 additions, 5 deletions

class/race.php
class/rdv.php 12 additions, 5 deletions

class/rdv.php
controller/animal.php 46 additions, 6 deletions

controller/animal.php
controller/fact.php 6 additions, 8 deletions

controller/fact.php
controller/ord.php 25 additions, 3 deletions

controller/ord.php
controller/rdv.php 25 additions, 3 deletions

controller/rdv.php
template/header.php 2 additions, 5 deletions

template/header.php
template/menu.php 21 additions, 2 deletions

template/menu.php

with 358 additions and 116 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment