Downloads Documentation Community Contribute Demo






Show Sidebar
Login | Register
Show
Ignore:
Timestamp:
07/17/08 15:20:10 (6 months ago)
Author:
catullus
Message:

sync-bidrectional: partly merge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • openmrs/branches/data_synchronization_bidirectional

    • Property svn:ignore changed from
      build*
      dist*
      ${env.CATALINA_HOME}
      docs
      .metadata
      setup.inf
      setup.rpt
      to
      build*
      dist*
      ${env.CATALINA_HOME}
      docs
      .metadata
      setup.inf
      setup.rpt
      *.iws
      *.ipr
      *.iml
  • openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml

    r4295 r4969  
    2323                <property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" length="19" /> 
    2424                 
    25                 <property name="voided" type="java.lang.Boolean" column="voided" length="1" not-null="true" /> 
     25                <property name="dateChanged" type="java.util.Date" column="date_changed" length="19" /> 
    2626                 
    27                 <property name="dateVoided" type="java.util.Date" column="date_voided" length="19" /> 
    28  
    29                 <property name="voidReason" type="java.lang.String" column="void_reason" length="255" /> 
     27                <property name="retired" type="java.lang.Boolean" column="retired" length="1" not-null="true" /> 
    3028 
    3129                <many-to-one name="programWorkflow" class="ProgramWorkflow" column="program_workflow_id" not-null="true" /> 
     
    3533                <many-to-one name="creator" class="User" column="creator" not-null="true" /> 
    3634                 
    37                 <many-to-one name="voidedBy" class="User" column="voided_by" /> 
     35                <many-to-one name="changedBy" class="User" column="changed_by" /> 
    3836 
    3937        </class>