提交 ee5ef232 authored 作者: 贺阳's avatar 贺阳

导出报关数据的单位标题修改

完成节点判断优化
上级 b9208183
...@@ -60,7 +60,7 @@ class ExportBlAndPackageXlsx(http.Controller): ...@@ -60,7 +60,7 @@ class ExportBlAndPackageXlsx(http.Controller):
sheet1.write(good_index, 26, good_item.item_name_en or '') # ITEM DESCRIPTION sheet1.write(good_index, 26, good_item.item_name_en or '') # ITEM DESCRIPTION
sheet1.write(good_index, 27, good_item.export_hs_code or '') # ITEM HS CODE sheet1.write(good_index, 27, good_item.export_hs_code or '') # ITEM HS CODE
sheet1.write(good_index, 28, good_item.quantity) # ITEM QUANTITY sheet1.write(good_index, 28, good_item.quantity) # ITEM QUANTITY
sheet1.write(good_index, 29, good_item.quantity_unit or '') # UNIT VALUE sheet1.write(good_index, 29, good_item.quantity_unit or '') # UNITS
sheet1.write(good_index, 30, good_item.item_total_price) # TOTAL VALUE sheet1.write(good_index, 30, good_item.item_total_price) # TOTAL VALUE
sheet1.write(good_index, 31, good_item.item_vat or '') # VAT sheet1.write(good_index, 31, good_item.item_vat or '') # VAT
sheet1.write(good_index, 32, '') # SKU NUMBER sheet1.write(good_index, 32, '') # SKU NUMBER
...@@ -112,7 +112,7 @@ class ExportBlAndPackageXlsx(http.Controller): ...@@ -112,7 +112,7 @@ class ExportBlAndPackageXlsx(http.Controller):
sheet1.write(index, 26, u'ITEM DESCRIPTION', font_style) # ITEM DESCRIPTION sheet1.write(index, 26, u'ITEM DESCRIPTION', font_style) # ITEM DESCRIPTION
sheet1.write(index, 27, u'ITEM HS CODE', font_style) # ITEM HS CODE sheet1.write(index, 27, u'ITEM HS CODE', font_style) # ITEM HS CODE
sheet1.write(index, 28, u'ITEM QUANTITY', font_style) # ITEM QUANTITY sheet1.write(index, 28, u'ITEM QUANTITY', font_style) # ITEM QUANTITY
sheet1.write(index, 29, u'UNIT VALUE', font_style) # UNIT VALUE sheet1.write(index, 29, u'UNITS', font_style) # UNITS
sheet1.write(index, 30, u'TOTAL VALUE', font_style) # TOTAL VALUE sheet1.write(index, 30, u'TOTAL VALUE', font_style) # TOTAL VALUE
sheet1.write(index, 31, u'VAT', font_style) # VAT sheet1.write(index, 31, u'VAT', font_style) # VAT
sheet1.write(index, 32, u'ONLINE SELLING PLACE', font_style) # ONLINE SELLING PLACE sheet1.write(index, 32, u'ONLINE SELLING PLACE', font_style) # ONLINE SELLING PLACE
......
...@@ -2,7 +2,6 @@ import aiohttp ...@@ -2,7 +2,6 @@ import aiohttp
import asyncio import asyncio
import base64 import base64
import certifi import certifi
import json
import logging import logging
import pytz import pytz
import ssl import ssl
...@@ -10,7 +9,6 @@ from datetime import datetime ...@@ -10,7 +9,6 @@ from datetime import datetime
from datetime import timedelta, datetime from datetime import timedelta, datetime
from lxml import etree from lxml import etree
from odoo import models, fields, api, tools, _ from odoo import models, fields, api, tools, _
from odoo.exceptions import ValidationError, Warning
def get_rfc339_time(utc_time=None): def get_rfc339_time(utc_time=None):
...@@ -475,7 +473,7 @@ class CcBl(models.Model): ...@@ -475,7 +473,7 @@ class CcBl(models.Model):
lambda line: line.state.tk_code == 'cb_imcustoms_start'): lambda line: line.state.tk_code == 'cb_imcustoms_start'):
self.ccing_func() self.ccing_func()
# 如果提单所有小包的清关节点变成“是完成节点”,则该提单状态变成已完成 # 如果提单所有小包的清关节点变成“是完成节点”,则该提单状态变成已完成
if all(line.state.is_done for line in self.ship_package_ids): if all(line.state.is_done for line in self.ship_package_ids) and self.unsync_package_count <= 0:
self.done_func() self.done_func()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论