Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OP-1833: resolve conflicts #62

Draft
wants to merge 55 commits into
base: develop
Choose a base branch
from
Draft

OP-1833: resolve conflicts #62

wants to merge 55 commits into from

Commits on Jul 11, 2022

  1. Merge branch 'develop' of github.com:mngoe/openimis-fe-medical_js int… 

    …o develop
    @mngoe
    mngoe committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    e94c9a8 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. modification ServiceType

    @mngoe
    mngoe committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    515c61a View commit details
    Browse the repository at this point in the history

  2. ajustement Traduction FR

    @mngoe
    mngoe committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    44486a3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from mngoe/develop-cs 

    ajustement Traduction FR
    @mngoe
    mngoe authored Jul 12, 2022
    Configuration menu
    Copy the full SHA
    f997762 View commit details
    Browse the repository at this point in the history

  4. Ajout Traduction FR

    @mngoe
    mngoe committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    7e735b1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2 from mngoe/develop-cs 

    Ajout Traduction FR
    @mngoe
    mngoe authored Jul 12, 2022
    Configuration menu
    Copy the full SHA
    08ac63f View commit details
    Browse the repository at this point in the history

  6. ajout message_fr

    @mngoe
    mngoe committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    39c1f3b View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2022

  1. Ajout de l'affichage conditionnel Manual

    @mngoe
    mngoe committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    6d409af View commit details
    Browse the repository at this point in the history

  2. ajustement Show Manual

    @mngoe
    mngoe committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    ef1afee View commit details
    Browse the repository at this point in the history

  3. correction index.js et package.json pour correction nom module

    @mngoe
    mngoe committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    4b6f6dd View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from mngoe/develop-cs 

    Rename Develop module
    @mngoe
    mngoe authored Jul 13, 2022
    Configuration menu
    Copy the full SHA
    8453ca3 View commit details
    Browse the repository at this point in the history

  5. ajustement ReadOnly et Required

    @mngoe
    mngoe committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    65cff58 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. ajustement ClaimChildPanel

    @mngoe
    mngoe committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4605af3 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. ajustement fe-medical pour ajout de la selection de service unitaire … 

    …dans la gestion des produits package
    @mngoe
    mngoe committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    02e0ff0 View commit details
    Browse the repository at this point in the history

  2. ajustement MedicalChildPanel

    @mngoe
    mngoe committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    b4c6ebc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from mngoe/develop-cs 

    Develop cs
    @mngoe
    mngoe authored Jul 21, 2022
    Configuration menu
    Copy the full SHA
    4b7d720 View commit details
    Browse the repository at this point in the history

  4. justement terms Ceiling

    @mngoe
    mngoe committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    22dd310 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. justement traduction

    @mngoe
    mngoe committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    4812e7a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop-cs' into develop

    @mngoe
    mngoe committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    f022749 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:mngoe/openimis-fe-medical_js int… 

    …o develop
    @mngoe
    mngoe committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    47db2d4 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. ajustement des services filtres

    @mngoe
    mngoe committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    523bb02 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into develop-cs

    @mngoe
    mngoe committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    67e9b95 View commit details
    Browse the repository at this point in the history

  3. ajout de selection Item sur Service Package

    @mngoe
    mngoe committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    263c84d View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. ajustement translations

    @mngoe
    mngoe committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    0928151 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. Calcul MedicalService

    @mngoe
    mngoe committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    00c4f2a View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. edit

    @vaneck237
    vaneck237 committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    645e8e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. ajustement divers pour gestion des montants total + ajout colonne tab… 

    …leau
    @mngoe
    mngoe committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    22c4960 View commit details
    Browse the repository at this point in the history

  2. fix PackageType list + Check save Simple Product

    @mngoe
    mngoe committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    068d510 View commit details
    Browse the repository at this point in the history

  3. edited price fix

    @mngoe
    mngoe committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    aa8b71f View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2022

  1. ajustement du formulaire d'enregistrement pour traitement CanSave et … 

    …gestion du manual
    @mngoe
    mngoe committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    9712f2b View commit details
    Browse the repository at this point in the history

  2. Fix Package Save

    @mngoe
    mngoe committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    1f09b54 View commit details
    Browse the repository at this point in the history

  3. Fix Loading Manual Value + Price ReadOnly Change

    @mngoe
    mngoe committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    e6d05e0 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. correction pour affichage par defaut des valeurs deja existantes

    @mngoe
    mngoe committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    c69b8cb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop-cs' of github.com:mngoe/openimis-fe-medical_js … 

    …into develop-cs
    @mngoe
    mngoe committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    81a2830 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2022

  1. Fix MedicalService for Deleteion

    @mngoe
    mngoe committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    e39b5ef View commit details
    Browse the repository at this point in the history

  2. ajustement transaction Colonne Supplementaire

    @mngoe
    mngoe committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    94f1976 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. ajustement Medical Service Master Panel

    @mngoe
    mngoe committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    0009f2e View commit details
    Browse the repository at this point in the history

  2. ajustement ChildPanel Hide for Atomic elemt

    @mngoe
    mngoe committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    a5b2a69 View commit details
    Browse the repository at this point in the history

  3. edit medical picker

    @vaneck237
    vaneck237 committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    05a5eb0 View commit details
    Browse the repository at this point in the history

  4. Fix double ligne on add Services / items for Service Package

    @mngoe
    mngoe committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    801c697 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. resolve merge conflict

    @vaneck237
    vaneck237 committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    e5b51b6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from mngoe/develop-jb 

    Develop jb
    @mngoe
    mngoe authored Aug 10, 2022
    Configuration menu
    Copy the full SHA
    b7ef00b View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. ajustement index.js

    @mngoe
    mngoe committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    38b82e0 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2022

  1. ajustement MedicalService

    @mngoe
    mngoe committed Aug 14, 2022
    Configuration menu
    Copy the full SHA
    5c16b32 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2022

  1. Merge branch 'develop' of github.com:openimis/openimis-fe-medical_js … 

    …into openimis-develop
    @mngoe
    mngoe committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    ec3fd28 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'openimis-develop' into develop-cs

    @mngoe
    mngoe committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    7b6f243 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. ajustement Action.js pour gestion du champ "ManualPrice" au cas ou il… 

    … n'est pas definit dans l'objet Itemm
    @mngoe
    mngoe committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    101287e View commit details
    Browse the repository at this point in the history

  2. ajutement Update Product

    @mngoe
    mngoe committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    f24b515 View commit details
    Browse the repository at this point in the history

  3. ajustement MedicalServiceForm pour gestion des prix à 0

    @mngoe
    mngoe committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    3d87c4a View commit details
    Browse the repository at this point in the history

  4. ajustement on MedicalItem for price at 0

    @mngoe
    mngoe committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    2418393 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. update with openimis develop branch

    jobil committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    7c08815 View commit details
    Browse the repository at this point in the history

  2. edit package.json

    jobil committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    fd495cb View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. OP-1833: resolve conflicts

    @olewandowski1
    olewandowski1 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    e7df094 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. OP-1833: initial clean up and refactor

    @olewandowski1
    olewandowski1 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    59bb4a7 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. OP-1833: be adjustmnets

    @olewandowski1
    olewandowski1 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    00fa350 View commit details
    Browse the repository at this point in the history