提单：快速筛选：未开始/清关中/已完成/今日提单/昨日提单/近7日提单/近10日提单/近30日提单/本周提单/上周提单

ccs_base/i18n/zh_CN.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-10 08:06+0000\n"
-"PO-Revision-Date: 2025-02-10 16:06+0800\n"
+"POT-Creation-Date: 2025-02-12 02:20+0000\n"
+"PO-Revision-Date: 2025-02-12 10:26+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: zh_CN\n"
@@ -657,6 +657,7 @@ msgstr "清关信息"
 
 #. module: ccs_base
 #: model:ir.model.fields.selection,name:ccs_base.selection__cc_bl__state__ccing
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
 msgid "CCing"
 msgstr "清关中"
 
@@ -969,7 +970,7 @@ msgstr "尾程交货时间"
 #. module: ccs_base
 #: model:ir.model.fields,field_description:ccs_base.field_cc_big_package__delivery_user_id
 msgid "Delivery User"
-msgstr "尾程交付人"
+msgstr "尾程交货人"
 
 #. module: ccs_base
 #: model:ir.model.fields,field_description:ccs_base.field_cc_node__desc
@@ -1001,11 +1002,13 @@ msgstr "显示名称"
 
 #. module: ccs_base
 #: model:ir.model.fields.selection,name:ccs_base.selection__cc_bl__state__done
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
 msgid "Done"
 msgstr "完成"
 
 #. module: ccs_base
 #: model:ir.model.fields.selection,name:ccs_base.selection__cc_bl__state__draft
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
 msgid "Draft"
 msgstr "未开始"
 
@@ -1259,6 +1262,7 @@ msgstr "高度"
 #. module: ccs_base
 #: model:ir.model.fields.selection,name:ccs_base.selection__cc_big_package__tally_state__handover_completed
 #: model:ir.model.fields.selection,name:ccs_base.selection__cc_node__tally_state__handover_completed
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_big_package_view
 msgid "Handover Completed"
 msgstr "尾程交接"
 
@@ -1481,11 +1485,41 @@ msgstr "长度"
 msgid "LSPTaxed"
 msgstr ""
 
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_big_package_view
+msgid "Last 10 days big package"
+msgstr "近10日大包"
+
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
+msgid "Last 10 days bill of loading"
+msgstr "近10日提单"
+
 #. module: ccs_base
 #: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_ship_package_view
 msgid "Last 30 days Ship Package"
 msgstr "近30日小包"
 
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_big_package_view
+msgid "Last 30 days big Package"
+msgstr "近30日大包"
+
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
+msgid "Last 30 days bill of loading"
+msgstr "近30日提单"
+
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_big_package_view
+msgid "Last 7 days big package"
+msgstr "近7日大包"
+
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
+msgid "Last 7 days bill of loading"
+msgstr "近7日提单"
+
 #. module: ccs_base
 #: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_ship_package_view
 msgid "Last 7 days ship package"
@@ -1581,6 +1615,16 @@ msgstr "最后更新人"
 msgid "Last Updated on"
 msgstr "最后更新时间"
 
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_big_package_view
+msgid "Last week big package"
+msgstr "上周大包"
+
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
+msgid "Last week bill of loading"
+msgstr "上周提单"
+
 #. module: ccs_base
 #: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_ship_package_view
 msgid "Last week ship package"
@@ -1811,6 +1855,11 @@ msgstr "节点类型"
 msgid "Normal"
 msgstr "正常"
 
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
+msgid "Not Finished Bill of Loading"
+msgstr "未完成提单"
+
 #. module: ccs_base
 #: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
 #: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_ship_package_view
@@ -2642,6 +2691,16 @@ msgstr "托盘号只能输入数字！"
 msgid "The usage date cannot be later than the current date!"
 msgstr "使用日期不能大于当前日期！"
 
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_big_package_view
+msgid "This week big package"
+msgstr "本周大包"
+
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
+msgid "This week bill of loading"
+msgstr "本周提单"
+
 #. module: ccs_base
 #: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_ship_package_view
 msgid "This week ship package"
@@ -2652,6 +2711,16 @@ msgstr "本周小包"
 msgid "Today Deadline"
 msgstr "今天截止"
 
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_big_package_view
+msgid "Today's big package"
+msgstr "今日大包"
+
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
+msgid "Today's bill of loading"
+msgstr "今日提单"
+
 #. module: ccs_base
 #: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_ship_package_view
 msgid "Today's ship package"
@@ -2864,6 +2933,16 @@ msgstr "是否分大包导出"
 msgid "YES"
 msgstr "是"
 
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_big_package_view
+msgid "Yesterday's big package"
+msgstr "昨日大包"
+
+#. module: ccs_base
+#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_bl_view
+msgid "Yesterday's bill of loading"
+msgstr "昨日提单"
+
 #. module: ccs_base
 #: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_ship_package_view
 msgid "Yesterday's ship package"
@@ -2937,6 +3016,11 @@ msgstr "【小包】 还没有！点击左上角的“创建”按钮，沙发
 msgid "base_info"
 msgstr "基本信息"
 
+#. module: ccs_base
+#: model:ir.model.fields,help:ccs_base.field_add_exception_info_wizard__action_type
+msgid "ship package/big package"
+msgstr ""
+
 #. module: ccs_base
 #: model:mail.template,subject:ccs_base.email_template_exception_notification_en
 msgid ""

ccs_base/views/cc_big_package_view.xml

@@ -17,8 +17,9 @@
                 <field name="tally_state" optional="show"/>
                 <field name="tally_user_id" optional="show"/>
                 <field name="tally_time" optional="show"/>
-                 <field name="delivery_user_id" optional="show"/>
+                <field name="delivery_user_id" optional="show"/>
                 <field name="delivery_time" optional="show"/>
+                <field optional="show" name="create_date"/>
             </tree>
         </field>
     </record>
@@ -98,6 +99,36 @@
                 <field name="big_package_no" string="Search"
                        filter_domain="['|', ('big_package_no', 'ilike', self), ('bl_id', 'ilike', self)]"/>
                 <separator/>
+                <filter string="Today's big package"
+                        domain="[('create_date', '&gt;=', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))
+                        , ('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc() + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="today_ship"/>
+                <filter string="Yesterday's big package"
+                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today() - datetime.timedelta(days=1), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')), ('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="yesterday_ship"/>
+                <filter string="Last 7 days big package"
+                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today() - datetime.timedelta(days=7), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc() + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="last_7d"/>
+                <filter string="Last 10 days big package"
+                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today() - datetime.timedelta(days=10), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc() + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="last_10d"/>
+                <filter string="This week big package" name="this_week_ship"
+                        domain="[('create_date', '&gt;=', (datetime.datetime.combine(context_today() + relativedelta(weeks=-1,days=1,weekday=0), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),
+                        ('create_date', '&lt;', (datetime.datetime.combine(context_today() + relativedelta(days=1,weekday=0), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"/>
+                <filter string="Last week big package" name="last_week_ship"
+                        domain="[('create_date', '&gt;=', (datetime.datetime.combine(context_today() + relativedelta(weeks=-2,days=1,weekday=0), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),
+                ('create_date', '&lt;', (datetime.datetime.combine(context_today() + relativedelta(weeks=-1,days=1,weekday=0), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"/>
+                <!--                <filter string="This month ship package"-->
+                <!--                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-01 00:00:00'))]"-->
+                <!--                        name="this_month_ship"/>-->
+                <!--                <filter string=" Last month ship package"-->
+                <!--                        domain="[('create_date','&lt;', (context_today().replace(day=1)).strftime('%Y-%m-%d 00:00:00')),('create_date','&gt;=',(context_today() -relativedelta(months=1)).replace(day=1).strftime('%Y-%m-%d 00:00:00'))]"-->
+                <!--                        name="last_month_ship"/>-->
+                <filter string="Last 30 days big Package"
+                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today() - datetime.timedelta(days=30), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc() + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="last_30d"/>
+
+                <separator/>
                 <field name="big_package_no" string="Big Package No."/>
                 <field name="bl_id" string="Bill of Loading"/>
                 <field name="next_provider_name" string="Next Provider Name"/>
@@ -106,6 +137,8 @@
                         domain="[('tally_state', '=', 'unprocessed_goods')]"/>
                 <filter string="Checked goods" name="filter_checked_goods"
                         domain="[('tally_state', '=', 'checked_goods')]"/>
+                <filter string="Handover Completed" name="filter_handover_completed"
+                        domain="[('tally_state', '=', 'handover_completed')]"/>
                 <separator/>
                 <group expand="0" string="Group By">
                     <filter domain="[]" name="groupby_bl_id" string="Bill of Loading" context="{'group_by': 'bl_id'}"/>
@@ -121,7 +154,7 @@
         <field name="res_model">cc.big.package</field>
         <field name="view_mode">tree,form,pivot,graph</field>
         <field name="domain">[]</field>
-        <field name="context">{}</field>
+        <field name="context">{'search_default_last_30d':1}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 [Big Package] Not yet! Click the Create button in the top left corner and the sofa is yours!

ccs_base/views/cc_bl_view.xml

@@ -36,6 +36,7 @@
                 <field optional="show" name="etd" string="ETD"/>
                 <field optional="show" name="is_cancel" string="Is Cancel"/>
                 <field optional="hide" name="cancel_reason" string="Cancel Reason"/>
+                <field optional="show" name="create_date"/>
             </tree>
         </field>
     </record>
@@ -194,7 +195,42 @@
                 <field name="bl_no" string="Search"
                        filter_domain="['|', ('bl_no', 'ilike', self), ('customs_bl_no', 'ilike', self)]"/>
                 <separator/>
+                <filter string="Draft" name="filter_state_draft" domain="[('state','=','draft')]"/>
+                <filter string="CCing" name="filter_state_ccing" domain="[('state','=','ccing')]"/>
+                <filter string="Done" name="filter_state_done" domain="[('state','=','done')]"/>
+                <filter string="Not Finished Bill of Loading" name="filter_state_not_finished"
+                        domain="[('state','in',('ccing','draft'))]"/>
+                <separator/>
+                <filter string="Today's bill of loading"
+                        domain="[('create_date', '&gt;=', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))
+                        , ('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc() + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="today_ship"/>
+                <filter string="Yesterday's bill of loading"
+                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today() - datetime.timedelta(days=1), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')), ('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="yesterday_ship"/>
+                <filter string="Last 7 days bill of loading"
+                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today() - datetime.timedelta(days=7), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc() + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="last_7d"/>
+                <filter string="Last 10 days bill of loading"
+                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today() - datetime.timedelta(days=10), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc() + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="last_10d"/>
+                <filter string="This week bill of loading" name="this_week_ship"
+                        domain="[('create_date', '&gt;=', (datetime.datetime.combine(context_today() + relativedelta(weeks=-1,days=1,weekday=0), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),
+                        ('create_date', '&lt;', (datetime.datetime.combine(context_today() + relativedelta(days=1,weekday=0), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"/>
+                <filter string="Last week bill of loading" name="last_week_ship"
+                        domain="[('create_date', '&gt;=', (datetime.datetime.combine(context_today() + relativedelta(weeks=-2,days=1,weekday=0), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),
+                ('create_date', '&lt;', (datetime.datetime.combine(context_today() + relativedelta(weeks=-1,days=1,weekday=0), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"/>
+                <!--                <filter string="This month ship package"-->
+                <!--                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-01 00:00:00'))]"-->
+                <!--                        name="this_month_ship"/>-->
+                <!--                <filter string=" Last month ship package"-->
+                <!--                        domain="[('create_date','&lt;', (context_today().replace(day=1)).strftime('%Y-%m-%d 00:00:00')),('create_date','&gt;=',(context_today() -relativedelta(months=1)).replace(day=1).strftime('%Y-%m-%d 00:00:00'))]"-->
+                <!--                        name="last_month_ship"/>-->
+                <filter string="Last 30 days bill of loading"
+                        domain="[('create_date', '>=', (datetime.datetime.combine(context_today() - datetime.timedelta(days=30), datetime.time(0, 0, 0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0, 0, 0)).to_utc() + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"
+                        name="last_30d"/>
 
+                <separator/>
                 <field name="bl_no" string="Bill of Loading No."/>
                 <field name="bl_date" string="B/L Date"/>
                 <field name="customer_id" string="Customer"/>
@@ -259,7 +295,7 @@
         <field name="res_model">cc.bl</field>
         <field name="view_mode">tree,form,pivot,graph,calendar</field>
         <field name="domain">[]</field>
-        <field name="context">{}</field>
+        <field name="context">{'search_default_filter_state_not_finished':1}</field>
         <field name="help" type="html">
             <p>
             </p>

ccs_base/wizard/add_exception_info_wizard.py

@@ -25,7 +25,7 @@ class AddExceptionInfoWizard(models.TransientModel):
         logging.info('lang:%s' % lang)
         return lang
 
-    action_type = fields.Char(string='Action Type', hemp='ship package/big package')
+    action_type = fields.Char(string='Action Type', help='ship package/big package')
     big_package_ids = fields.Many2many('cc.big.package', 'exception_wizard_big_package_rel', string='Big Packages')
     ship_package_ids = fields.Many2many('cc.ship.package', 'exception_wizard_ship_package_rel', string='Ship Packages')
     exception_ids = fields.Many2many('cc.exception.info', 'big_package_add_exception_info_rel',