@axelor/aos-mobile-manufacturing 9.1.4 → 9.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/features/operationOrderSlice.js +1 -1
- package/lib/features/operationOrderSlice.js.map +1 -1
- package/lib/screens/manufactoringOrder/ManufacturingOrderDetailsScreen.d.ts +1 -4
- package/lib/screens/manufactoringOrder/ManufacturingOrderDetailsScreen.js +3 -1
- package/lib/screens/manufactoringOrder/ManufacturingOrderDetailsScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/index.d.ts +1 -4
- package/lib/screens/operationOrder/OperationOrderDetailsScreen.d.ts +1 -4
- package/lib/screens/operationOrder/OperationOrderDetailsScreen.js +5 -3
- package/lib/screens/operationOrder/OperationOrderDetailsScreen.js.map +1 -1
- package/package.json +4 -4
|
@@ -59,7 +59,7 @@ export const updateOperationOrder = createAsyncThunk('OperationOrder/updateOpera
|
|
|
59
59
|
action: 'Manufacturing_SliceAction_UpdateOperationOrderStatus',
|
|
60
60
|
getState: getState,
|
|
61
61
|
responseOptions: { showToast: false, returnResponseMessage: true },
|
|
62
|
-
errorOptions: { showErrorToast:
|
|
62
|
+
errorOptions: { showErrorToast: true },
|
|
63
63
|
}))
|
|
64
64
|
.then(async (res) => {
|
|
65
65
|
const _data = await handlerApiCall({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operationOrderSlice.js","sourceRoot":"","sources":["../../src/features/operationOrderSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,4BAA4B,EAC5B,cAAc,EACd,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAClD,qCAAqC,EACrC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,0BAA0B;QACzC,IAAI;QACJ,MAAM,EAAE,gDAAgD;QACxD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,gBAAgB,CACxD,2CAA2C,EAC3C,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,wBAAwB;QACvC,IAAI;QACJ,MAAM,EAAE,uDAAuD;QAC/D,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,gBAAgB,CACrD,oCAAoC,EACpC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,mDAAmD;QAC3D,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAClD,2CAA2C,EAC3C,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,mDAAmD;QAC3D,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC;SACC,IAAI,CAAC,GAAG,CAAC,EAAE,CACV,cAAc,CAAC;QACb,aAAa,EAAE,0BAA0B;QACzC,IAAI,EAAE,EAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAC;QACtC,MAAM,EAAE,sDAAsD;QAC9D,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,EAAC,SAAS,EAAE,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAC;QAChE,YAAY,EAAE,EAAC,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"operationOrderSlice.js","sourceRoot":"","sources":["../../src/features/operationOrderSlice.js"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
declare const ManufacturingOrderDetailsScreen: ({ route, navigation }:
|
|
3
|
-
route: any;
|
|
4
|
-
navigation: any;
|
|
5
|
-
}) => React.JSX.Element;
|
|
2
|
+
declare const ManufacturingOrderDetailsScreen: ({ route, navigation }: any) => React.JSX.Element;
|
|
6
3
|
export default ManufacturingOrderDetailsScreen;
|
|
@@ -26,7 +26,7 @@ import { fetchOperationOrders } from '../../features/operationOrderSlice';
|
|
|
26
26
|
import { fetchHazardPhrases } from '../../features/hazardPhraseSlice';
|
|
27
27
|
const MODELS = { ManufOrder: 'com.axelor.apps.production.db.ManufOrder' };
|
|
28
28
|
const ManufacturingOrderDetailsScreen = ({ route, navigation }) => {
|
|
29
|
-
const { manufacturingOrderId: manufOrderId } = route
|
|
29
|
+
const { manufacturingOrderId: manufOrderId } = route?.params ?? {};
|
|
30
30
|
const I18n = useTranslator();
|
|
31
31
|
const dispatch = useDispatch();
|
|
32
32
|
useContextRegister({ models: [{ model: MODELS.ManufOrder, id: manufOrderId }] });
|
|
@@ -65,6 +65,8 @@ const ManufacturingOrderDetailsScreen = ({ route, navigation }) => {
|
|
|
65
65
|
if (hazardPhraseEnabled)
|
|
66
66
|
setAlertVisible(true);
|
|
67
67
|
}, [hazardPhraseEnabled]);
|
|
68
|
+
if (manufOrder?.id !== manufOrderId)
|
|
69
|
+
return null;
|
|
68
70
|
return (<Screen removeSpaceOnTop={true} fixedItems={<ManufacturingOrderButtons onStart={handleStart}/>}>
|
|
69
71
|
<HeaderContainer fixedItems={<ManufacturingOrderHeader parentMO={manufOrder.parentMO} reference={manufOrder.manufOrderSeq} status={manufOrder.statusSelect} priority={manufOrder.prioritySelect}/>} expandableFilter={false}/>
|
|
70
72
|
<KeyboardAvoidingScrollView style={styles.scroll} refresh={{ loading: loadingOrder, fetcher: fetchManufOrderAndOperation }}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManufacturingOrderDetailsScreen.js","sourceRoot":"","sources":["../../../src/screens/manufactoringOrder/ManufacturingOrderDetailsScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,MAAM,EACN,0BAA0B,EAC1B,eAAe,EACf,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,yBAAyB,EACzB,wCAAwC,EACxC,kCAAkC,EAClC,mCAAmC,EACnC,+BAA+B,EAC/B,2BAA2B,EAC3B,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,eAAe,EAAC,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAC,kBAAkB,EAAC,MAAM,kCAAkC,CAAC;AAEpE,MAAM,MAAM,GAAG,EAAC,UAAU,EAAE,0CAA0C,EAAC,CAAC;AAExE,MAAM,+BAA+B,GAAG,CAAC,EAAC,KAAK,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"ManufacturingOrderDetailsScreen.js","sourceRoot":"","sources":["../../../src/screens/manufactoringOrder/ManufacturingOrderDetailsScreen.tsx"],"names":[],"mappings":"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"}
|
|
@@ -133,10 +133,7 @@ declare const _default: {
|
|
|
133
133
|
};
|
|
134
134
|
ManufacturingOrderDetailsScreen: {
|
|
135
135
|
title: string;
|
|
136
|
-
component: ({ route, navigation }:
|
|
137
|
-
route: any;
|
|
138
|
-
navigation: any;
|
|
139
|
-
}) => import("react").JSX.Element;
|
|
136
|
+
component: ({ route, navigation }: any) => import("react").JSX.Element;
|
|
140
137
|
actionID: string;
|
|
141
138
|
options: {
|
|
142
139
|
shadedHeader: boolean;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
declare function OperationOrderDetailsScreen({ route, navigation }:
|
|
3
|
-
route: any;
|
|
4
|
-
navigation: any;
|
|
5
|
-
}): React.JSX.Element;
|
|
2
|
+
declare function OperationOrderDetailsScreen({ route, navigation }: any): React.JSX.Element;
|
|
6
3
|
export default OperationOrderDetailsScreen;
|
|
@@ -26,7 +26,7 @@ const MODELS = {
|
|
|
26
26
|
Machine: 'com.axelor.apps.production.db.Machine',
|
|
27
27
|
};
|
|
28
28
|
function OperationOrderDetailsScreen({ route, navigation }) {
|
|
29
|
-
const { operationOrderId } = route
|
|
29
|
+
const { operationOrderId } = route?.params ?? {};
|
|
30
30
|
const I18n = useTranslator();
|
|
31
31
|
const dispatch = useDispatch();
|
|
32
32
|
const { base: baseConfig } = useSelector(state => state.appConfig);
|
|
@@ -52,13 +52,15 @@ function OperationOrderDetailsScreen({ route, navigation }) {
|
|
|
52
52
|
const handleOpenConsumedProducts = useCallback(() => {
|
|
53
53
|
navigation.navigate('ConsumedProductListScreen', {
|
|
54
54
|
operationOrderId: operationOrderId,
|
|
55
|
-
manufOrder: operationOrder
|
|
55
|
+
manufOrder: operationOrder?.manufOrder,
|
|
56
56
|
});
|
|
57
|
-
}, [navigation, operationOrder
|
|
57
|
+
}, [navigation, operationOrder?.manufOrder, operationOrderId]);
|
|
58
58
|
const handleStart = useCallback(() => {
|
|
59
59
|
if (hazardPhraseEnabled)
|
|
60
60
|
setAlertVisible(true);
|
|
61
61
|
}, [hazardPhraseEnabled]);
|
|
62
|
+
if (operationOrder?.id !== operationOrderId)
|
|
63
|
+
return null;
|
|
62
64
|
return (<Screen removeSpaceOnTop={true}>
|
|
63
65
|
<HeaderContainer fixedItems={<OperationOrderHeader manufOrderRef={operationOrder?.manufOrder?.manufOrderSeq} name={operationOrder?.operationName} status={operationOrder?.statusSelect} priority={operationOrder?.priority}/>} expandableFilter={false}/>
|
|
64
66
|
<ScrollView refresh={{ loading: loadingOrder, fetcher: getOperationOrder }}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperationOrderDetailsScreen.js","sourceRoot":"","sources":["../../../src/screens/operationOrder/OperationOrderDetailsScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,aAAa,EACb,eAAe,EACf,MAAM,EACN,UAAU,GACX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,2BAA2B,EAC3B,uBAAuB,GACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,uBAAuB,EAAC,MAAM,oCAAoC,CAAC;AAE3E,MAAM,MAAM,GAAG;IACb,SAAS,EAAE,8CAA8C;IACzD,OAAO,EAAE,uCAAuC;CACjD,CAAC;AAEF,SAAS,2BAA2B,CAAC,EAAC,KAAK,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"OperationOrderDetailsScreen.js","sourceRoot":"","sources":["../../../src/screens/operationOrder/OperationOrderDetailsScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,aAAa,EACb,eAAe,EACf,MAAM,EACN,UAAU,GACX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,2BAA2B,EAC3B,uBAAuB,GACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,uBAAuB,EAAC,MAAM,oCAAoC,CAAC;AAE3E,MAAM,MAAM,GAAG;IACb,SAAS,EAAE,8CAA8C;IACzD,OAAO,EAAE,uCAAuC;CACjD,CAAC;AAEF,SAAS,2BAA2B,CAAC,EAAC,KAAK,EAAE,UAAU,EAAM;IAC3D,MAAM,EAAC,gBAAgB,EAAC,GAAG,KAAK,EAAE,MAAM,IAAI,EAAE,CAAC;IAC/C,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,EAAC,IAAI,EAAE,UAAU,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,EAAC,YAAY,EAAE,cAAc,EAAC,GAAG,WAAW,CAChD,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAC9B,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,kBAAkB,CAAC;QACjB,MAAM,EAAE;YACN,EAAC,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAC;YACjD,EAAC,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,EAAC;SACzD;KACF,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,QAAQ,CAAE,uBAA+B,CAAC,EAAC,gBAAgB,EAAC,CAAC,CAAC,CAAC;IACjE,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEjC,SAAS,CAAC,GAAG,EAAE;QACb,iBAAiB,EAAE,CAAC;IACtB,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExB,MAAM,eAAe,GAAG,OAAO,CAC7B,GAAG,EAAE,CAAC,cAAc,EAAE,eAAe,EAAE,eAAe,EACtD,CAAC,cAAc,EAAE,eAAe,EAAE,eAAe,CAAC,CACnD,CAAC;IAEF,MAAM,mBAAmB,GAAG,OAAO,CACjC,GAAG,EAAE,CACH,UAAU,EAAE,oBAAoB;QAChC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;QAC9B,eAAe,CAAC,MAAM,GAAG,CAAC,EAC5B,CAAC,UAAU,EAAE,oBAAoB,EAAE,eAAe,CAAC,CACpD,CAAC;IAEF,MAAM,oBAAoB,GAAG,OAAO,CAClC,GAAG,EAAE,CAAC,cAAc,EAAE,UAAU,EAAE,oBAAoB,EACtD,CAAC,cAAc,EAAE,UAAU,EAAE,oBAAoB,CAAC,CACnD,CAAC;IAEF,MAAM,0BAA0B,GAAG,WAAW,CAAC,GAAG,EAAE;QAClD,UAAU,CAAC,QAAQ,CAAC,2BAA2B,EAAE;YAC/C,gBAAgB,EAAE,gBAAgB;YAClC,UAAU,EAAE,cAAc,EAAE,UAAU;SACvC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE/D,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,IAAI,mBAAmB;YAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE1B,IAAI,cAAc,EAAE,EAAE,KAAK,gBAAgB;QAAE,OAAO,IAAI,CAAC;IAEzD,OAAO,CACL,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAC7B;MAAA,CAAC,eAAe,CACd,UAAU,CAAC,CACT,CAAC,oBAAoB,CACnB,aAAa,CAAC,CAAC,cAAc,EAAE,UAAU,EAAE,aAAa,CAAC,CACzD,IAAI,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,CACpC,MAAM,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CACrC,QAAQ,CAAC,CAAC,cAAc,EAAE,QAAQ,CAAC,EAEvC,CAAC,CACD,gBAAgB,CAAC,CAAC,KAAK,CAAC,EAE1B;MAAA,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAC,CAAC,CACvE;QAAA,CAAC,uBAAuB,CAAC,AAAD,EACxB;QAAA,CAAC,2BAA2B,CAAC,AAAD,EAC5B;QAAA,CAAC,oBAAoB,IAAI,CACvB,CAAC,aAAa,CACZ,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CACzB,QAAQ,CAAC,OAAO,CAChB,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAC/C,OAAO,CAAC,CAAC,0BAA0B,CAAC,EACpC,CACH,CACD;QAAA,CAAC,mBAAmB,IAAI,CACtB,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,EAAG,CACpD,CACD;QAAA,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,EAC/C;MAAA,EAAE,UAAU,CACZ;MAAA,CAAC,iBAAiB,CAChB,SAAS,CAAC,CAAC,YAAY,CAAC,CACxB,IAAI,CAAC,CAAC,CAAC,EAAC,eAAe,EAAC,CAAC,CAAC,CAC1B,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAE9C;IAAA,EAAE,MAAM,CAAC,CACV,CAAC;AACJ,CAAC;AAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,UAAU,EAAE;QACV,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,CAAC;KACf;CACF,CAAC,CAAC;AAEH,eAAe,2BAA2B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-manufacturing",
|
|
3
|
-
"version": "9.1.
|
|
3
|
+
"version": "9.1.6",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"repository": {
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"react-native": "0.83.9"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@axelor/aos-mobile-core": "9.1.
|
|
36
|
-
"@axelor/aos-mobile-stock": "9.1.
|
|
37
|
-
"@axelor/aos-mobile-ui": "9.1.
|
|
35
|
+
"@axelor/aos-mobile-core": "9.1.6",
|
|
36
|
+
"@axelor/aos-mobile-stock": "9.1.6",
|
|
37
|
+
"@axelor/aos-mobile-ui": "9.1.6",
|
|
38
38
|
"@reduxjs/toolkit": "2.11.2"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|