Skip to content

Commit f491d38

Browse files
OCA-git-botOCA-git-bot
committed
Merge PR #954 into 16.0
Signed-off-by hbrunn
2 parents 68fb5d9 + 240f25c commit f491d38

6 files changed

+10
-15
lines changed

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
xmlns="urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2"
66
>
77
<cbc:UBLVersionID>2.2</cbc:UBLVersionID>
8-
<cbc:ID><t t-raw="record.IvWevk_WevId_WevNr" /></cbc:ID>
8+
<cbc:ID><t t-raw="record.lines[0].IvWevp_WEAP_WeaId_WeaNr" /></cbc:ID>
99
<cbc:IssueDate><t t-raw="get_current_date()" /></cbc:IssueDate>
1010
<cac:OrderReference>
11-
<cbc:ID><t t-raw="record.lines[0].IvWevp_WEAP_WeaId_WeaNr" /></cbc:ID>
12-
<cbc:IssueDate><t t-raw="get_current_date()" /></cbc:IssueDate>
11+
<cbc:ID><t t-raw="record.lines[0].IvWeap_ExtRef" /></cbc:ID>
1312
</cac:OrderReference>
1413
<cac:DespatchSupplierParty>
1514
<cbc:CustomerAssignedAccountID><t

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

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<cbc:IssueDate><t t-raw="get_current_date()" /></cbc:IssueDate>
1010
<cac:OrderReference>
1111
<cbc:ID><t t-raw="record.IvKretk_ExtRef" /></cbc:ID>
12-
<cbc:IssueDate><t t-raw="get_current_date()" /></cbc:IssueDate>
1312
</cac:OrderReference>
1413
<cac:DespatchSupplierParty>
1514
<cbc:CustomerAssignedAccountID><t

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"type": "str",
7171
"length": 20,
7272
"dp": False,
73-
"ubl_path": False,
73+
"ubl_path": "DespatchAdvice.cac:OrderReference.cbc:ID",
7474
"df_val": False,
7575
"df_func": False,
7676
},

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ODOO WAMAS 00000120230501020000WEAK00050000WH/IN/000377 ODOO PO001040 STDMAN0001040 MyCompany Department StreetName AdditionalStreetName 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230501160000
2-
ODOO WAMAS 00000220230501020000WEAP00045000WH/IN/000377 ODOO 0000010001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305010200007910063 NNLG
3-
ODOO WAMAS 00000320230501020000WEAP00045000WH/IN/000377 ODOO 0000020001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305010200007910105 NNLG
4-
ODOO WAMAS 00000420230501020000WEAP00045000WH/IN/000377 ODOO 0000030001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305010200007910004 NNLG
5-
ODOO WAMAS 00000520230501020000WEAP00045000WH/IN/000377 ODOO 0000040001162 00000 NDISPONIBLE 000003072000PET NORMAL 20230501020000 2023050102000012156876 NNLG
6-
ODOO WAMAS 00000620230501020000WEAP00045000WH/IN/000377 ODOO 0000050001176 00000 NDISPONIBLE 000003024000XBO NORMAL 20230501020000 202305010200007910044 NNLG
2+
ODOO WAMAS 00000220230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000010001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305010200007910063 NNLG
3+
ODOO WAMAS 00000320230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000020001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305010200007910105 NNLG
4+
ODOO WAMAS 00000420230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000030001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305010200007910004 NNLG
5+
ODOO WAMAS 00000520230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000040001162 00000 NDISPONIBLE 000003072000PET NORMAL 20230501020000 2023050102000012156876 NNLG
6+
ODOO WAMAS 00000620230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000050001176 00000 NDISPONIBLE 000003024000XBO NORMAL 20230501020000 202305010200007910044 NNLG

‎base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_KRETKQ_KRETPQ-DESPATCH_ADVICE.xml

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<cbc:IssueDate>2023-05-01</cbc:IssueDate>
55
<cac:OrderReference>
66
<cbc:ID>1712149</cbc:ID>
7-
<cbc:IssueDate>2023-05-01</cbc:IssueDate>
87
</cac:OrderReference>
98
<cac:DespatchSupplierParty>
109
<cbc:CustomerAssignedAccountID>4026234</cbc:CustomerAssignedAccountID>
@@ -128,7 +127,6 @@
128127
<cbc:IssueDate>2023-05-01</cbc:IssueDate>
129128
<cac:OrderReference>
130129
<cbc:ID>1711980</cbc:ID>
131-
<cbc:IssueDate>2023-05-01</cbc:IssueDate>
132130
</cac:OrderReference>
133131
<cac:DespatchSupplierParty>
134132
<cbc:CustomerAssignedAccountID>4007720</cbc:CustomerAssignedAccountID>

‎base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_WEAKQ_WEAPQ-DESPATCH_ADVICE.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<DespatchAdvice xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2">
22
<cbc:UBLVersionID>2.2</cbc:UBLVersionID>
3-
<cbc:ID>196241</cbc:ID>
3+
<cbc:ID>130377</cbc:ID>
44
<cbc:IssueDate>2023-05-01</cbc:IssueDate>
55
<cac:OrderReference>
6-
<cbc:ID>130377</cbc:ID>
7-
<cbc:IssueDate>2023-05-01</cbc:IssueDate>
6+
<cbc:ID/>
87
</cac:OrderReference>
98
<cac:DespatchSupplierParty>
109
<cbc:CustomerAssignedAccountID>1040</cbc:CustomerAssignedAccountID>

0 commit comments

Comments
 (0)