Merge branch 'v2.6.0-RC' of https://github.com/msupply-foundation/open-msupply into v2.6.0-RC

Author: roxy-dao

client/packages/config/src/config.ts

@@ -3,6 +3,7 @@ declare const FEATURE_EXAMPLE: boolean;
 // Used to load plugins via server during dev rather then from local dir, to test remote loading
 // `yarn start -- -- -env LOAD_REMOTE_PLUGINS=true`
 declare const LOAD_REMOTE_PLUGINS: boolean;
+declare const FEATURE_PRINTER_SETTINGS: boolean;
 
 // For production, API is on the same domain/ip and port as web app, available through sub-route
 // i.e. web app is on https://my.openmsupply.com/, then graphql will be available https://my.openmsupply.com/graphql
@@ -48,6 +49,10 @@ export const Environment = {
     typeof FEATURE_EXAMPLE === 'undefined' ? false : FEATURE_EXAMPLE,
   LOAD_REMOTE_PLUGINS:
     typeof LOAD_REMOTE_PLUGINS === 'undefined' ? false : LOAD_REMOTE_PLUGINS,
+  FEATURE_PRINTER_SETTINGS:
+    typeof FEATURE_PRINTER_SETTINGS === 'undefined'
+      ? false
+      : FEATURE_PRINTER_SETTINGS,
 };
 
 export default Environment;

client/packages/host/src/Admin/Settings.tsx

@@ -24,6 +24,7 @@ import { LabelPrinterSettings } from './LabelPrinterSettings';
 import { Printers } from './Printers';
 import { ConfigurationSettings } from './ConfigurationSettings';
 import { ServerInfo } from './ServerInfo';
+import { Environment } from 'packages/config/src';
 
 export const Settings: React.FC = () => {
   const { data: initStatus } = useInitialisationStatus();
@@ -74,15 +75,17 @@ export const Settings: React.FC = () => {
         <LabelPrinterSettings />
         <ElectronSettings />
       </SettingsSection>
-      <SettingsSection
-        Icon={PrinterIcon}
-        titleKey="heading.printers"
-        expanded={activeSection === 4}
-        onChange={toggleSection(4)}
-        visible={true}
-      >
-        <Printers />
-      </SettingsSection>
+      {Environment.FEATURE_PRINTER_SETTINGS && (
+        <SettingsSection
+          Icon={PrinterIcon}
+          titleKey="heading.printers"
+          expanded={activeSection === 4}
+          onChange={toggleSection(4)}
+          visible={true}
+        >
+          <Printers />
+        </SettingsSection>
+      )}
       {isCentralServer && (
         <SettingsSection
           Icon={ListIcon}

client/packages/host/webpack.config.js

@@ -111,6 +111,7 @@ module.exports = env => {
       new ReactRefreshWebpackPlugin(),
       new webpack.DefinePlugin({
         FEATURE_EXAMPLE: env.FEATURE_EXAMPLE,
+        FEATURE_PRINTER_SETTINGS: env.FEATURE_PRINTER_SETTINGS,
         LOAD_REMOTE_PLUGINS: env.LOAD_REMOTE_PLUGINS,
         API_HOST: JSON.stringify(env.API_HOST),
         LOCAL_PLUGINS: JSON.stringify(require('./getLocalPlugins.js')),

server/service/src/vaccine_course/update.rs

@@ -206,7 +206,7 @@ fn generate(
         id: id.clone(),
         name: name.unwrap_or(old_row.name),
         program_id: old_row.program_id,
-        demographic_id: demographic_id.or(old_row.demographic_id),
+        demographic_id: demographic_id,
         coverage_rate,
         is_active,
         wastage_rate,