Skip to content

Commit b5f289b

Browse files
tuantrantgtuantrantg
committed
[UPD] base_wamas_ubl: Update grammars of ARTEAN, WEAK, WEAP and related tests
1 parent ba48bda commit b5f289b

13 files changed

+30
-23
lines changed

‎base_wamas_ubl/lib/wamas/const.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@
145145

146146
DICT_TUPLE_KEY_RECEPTION = {
147147
("WEAKQ", "WEAPQ"): (
148-
"ubl_template/reception_wea.xml",
148+
"ubl_template/reception.xml",
149149
("WEAKQ", "IvWevk_WevId_WevNr"),
150150
("WEAPQ", "IvWevp_WevId_WevNr"),
151151
),
152152
("KRETKQ", "KRETPQ"): (
153-
"ubl_template/reception_kret.xml",
153+
"ubl_template/return.xml",
154154
("KRETKQ", "IvKretk_KretId_KretNr"),
155155
("KRETPQ", "IvKretp_KretId_KretNr"),
156156
),
@@ -174,7 +174,12 @@
174174
# CONVERT UNIT CODE
175175
##
176176

177-
LST_FIELD_UNIT_CODE = ["HostEinheit"]
177+
LST_FIELD_UNIT_CODE = [
178+
"HostEinheit",
179+
"Art_Anzeige_Einheit",
180+
"Arte_Einheit",
181+
"ArtEan_EST_Einheit",
182+
]
178183

179184

180185
MAPPING_UNITCODE_WAMAS_TO_UBL = {

‎base_wamas_ubl/lib/wamas/ubl_template/reception_wea.xml ‎base_wamas_ubl/lib/wamas/ubl_template/reception.xml

File renamed without changes.

‎base_wamas_ubl/lib/wamas/ubl_template/reception_kret.xml ‎base_wamas_ubl/lib/wamas/ubl_template/return.xml

File renamed without changes.

‎base_wamas_ubl/lib/wamas/wamas_grammar/artean.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"type": "str",
7676
"length": 5,
7777
"dp": False,
78-
"dict_key": False,
78+
"dict_key": "product_uom",
7979
"df_val": False,
8080
"df_func": False,
8181
},

‎base_wamas_ubl/lib/wamas/wamas_grammar/weak.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
"length": 5,
6464
"dp": False,
6565
"ubl_path": False,
66-
"df_val": "HOST",
67-
"df_func": False,
66+
"df_val": False,
67+
"df_func": "get_source",
6868
},
6969
"RxWeak_ExtRef": {
7070
"type": "str",

‎base_wamas_ubl/lib/wamas/wamas_grammar/weap.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
"length": 5,
6464
"dp": False,
6565
"ubl_path": False,
66-
"df_val": "HOST",
67-
"df_func": False,
66+
"df_val": False,
67+
"df_func": "get_source",
6868
},
6969
"RxWeap_ExtRef": {
7070
"type": "str",

‎base_wamas_ubl/tests/samples/CHECKWAMAS-SAMPLE_OUTPUT-EXCEPTION-2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Error: Length of line does not match expected length
1+
- Error: Length of line does not match expected length

‎base_wamas_ubl/tests/samples/CHECKWAMAS-SAMPLE_OUTPUT-EXCEPTION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Error: Invalid telegram type: XYZ
1+
- Error: Invalid telegram type: XYZ

‎base_wamas_ubl/tests/samples/TELEGRAM-SAMPLE-ARTEAN_INPUT.dict

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"barcode": "256256256",
33
"product": "113 113 113",
4+
"product_uom": "C62",
45
"game_identifier": "N",
56
}

‎base_wamas_ubl/tests/samples/TELEGRAM-SAMPLE-ARTEAN_OUTPUT.wamas

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ODOO WAMAS 00000120231221051251ARTEAN001000113 113 113 00000256256256 N
1+
ODOO WAMAS 00000120231221051251ARTEAN001000113 113 113 00000256256256 BOUT N

‎base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_KRETK_KRETP.wamas

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ODOO WAMAS 00000120230501020000KRETK0051000130377 HOST STDMAN0001040 MyCompany 1839 Arbor Way California 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230427000000
2-
ODOO WAMAS 00000220230501020000KRETP0046000130377 HOST 0000200001151 0000020001151 00000DISPONIBLE 000001536000BOUT N
3-
ODOO WAMAS 00000320230501020000KRETP0046000130377 HOST 0000300001156 0000030001156 00000DISPONIBLE 000005184000PET N
4-
ODOO WAMAS 00000420230501020000KRETP0046000130377 HOST 0000400001160 0000040001160 00000DISPONIBLE 000003840000BOUT N
5-
ODOO WAMAS 00000520230501020000KRETP0046000130377 HOST 0000500001162 0000050001162 00000DISPONIBLE 000003072000PET N
6-
ODOO WAMAS 00000620230501020000KRETP0046000130377 HOST 0000600001176 0000060001176 00000DISPONIBLE 000003024000PET N
1+
ODOO WAMAS 00000120230501020000KRETK0051000130377 HOST STDMAN0001040 STDMAN0001040 MyCompany 1839 Arbor Way California 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230427020000
2+
ODOO WAMAS 00000220230501020000KRETP0046000130377 HOST 0001 0000020001151 00000DISPONIBLE 000001536000BOUT N
3+
ODOO WAMAS 00000320230501020000KRETP0046000130377 HOST 0002 0000030001156 00000DISPONIBLE 000005184000PET N
4+
ODOO WAMAS 00000420230501020000KRETP0046000130377 HOST 0003 0000040001160 00000DISPONIBLE 000003840000BOUT N
5+
ODOO WAMAS 00000520230501020000KRETP0046000130377 HOST 0004 0000050001162 00000DISPONIBLE 000003072000PET N
6+
ODOO WAMAS 00000620230501020000KRETP0046000130377 HOST 0005 0000060001176 00000DISPONIBLE 000003024000PET N

‎base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ODOO WAMAS 00000120230501020000WEAK00050000130377 HOST STDMAN0001040 MyCompany 1839 Arbor Way California 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230427000000
2-
ODOO WAMAS 00000220230501020000WEAP00045000130377 HOST 0000200001151 0000020001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305010000007910063 NNLG
3-
ODOO WAMAS 00000320230501020000WEAP00045000130377 HOST 0000300001156 0000030001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305010000007910105 NNLG
4-
ODOO WAMAS 00000420230501020000WEAP00045000130377 HOST 0000400001160 0000040001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305010000007910004 NNLG
5-
ODOO WAMAS 00000520230501020000WEAP00045000130377 HOST 0000500001162 0000050001162 00000 NDISPONIBLE 000003072000PET NORMAL 20230501020000 2023050100000012156876 NNLG
6-
ODOO WAMAS 00000620230501020000WEAP00045000130377 HOST 0000600001176 0000060001176 00000 NDISPONIBLE 000003024000PET NORMAL 20230501020000 202305010000007910044 NNLG
1+
ODOO WAMAS 00000120230501020000WEAK00050000130377 ODOO STDMAN0001040 STDMAN0001040 MyCompany 1839 Arbor Way California 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230427020000
2+
ODOO WAMAS 00000220230501020000WEAP00045000130377 ODOO 0001 0000020001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305010200007910063 NNLG
3+
ODOO WAMAS 00000320230501020000WEAP00045000130377 ODOO 0002 0000030001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305010200007910105 NNLG
4+
ODOO WAMAS 00000420230501020000WEAP00045000130377 ODOO 0003 0000040001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305010200007910004 NNLG
5+
ODOO WAMAS 00000520230501020000WEAP00045000130377 ODOO 0004 0000050001162 00000 NDISPONIBLE 000003072000PET NORMAL 20230501020000 2023050102000012156876 NNLG
6+
ODOO WAMAS 00000620230501020000WEAP00045000130377 ODOO 0005 0000060001176 00000 NDISPONIBLE 000003024000PET NORMAL 20230501020000 202305010200007910044 NNLG

‎base_wamas_ubl/tests/test_base_wamas_ubl.py

+1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ def _wamas_ubl_wiz_check(self, input_file, expected_output_file):
114114
wizard.btn_check()
115115
self.assertTrue(self._is_string_similar(wizard.output, str_expected_output))
116116

117+
@freeze_time("2023-12-20 09:11:16")
117118
def _wamas_ubl_wiz_simulate(
118119
self, input_file, expected_output_file, state="success"
119120
):

0 commit comments

Comments
 (0)