提交 214a798c authored 作者: 贺阳's avatar 贺阳

小包和推送日志 近7日,本周,上周筛选的优化

上级 f3de60bd
......@@ -16,6 +16,7 @@
<field optional="hide" name="customer_ref" string="Customer Ref"/>
<field optional="hide" name="company_code" string="Company Code"/>
<field optional="hide" name="internal_account_number" string="Internal Account Number"/>
<field optional="hide" name="create_date"/>
<field optional="show" name="logistic_order_no" string="Logistic Order No"/>
<field optional="hide" name="buyer_region" string="Package Sell Country Code"/>
<field optional="show" name="big_package_no" string="Big Package No"/>
......@@ -213,20 +214,20 @@
domain="[('create_date','&gt;=', (context_today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d 00:00:00')),('create_date','&lt;=', (context_today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d 24:00:00'))]"
name="last_24h"/>
<filter string="Last 7 days ship package"
domain="[('create_date','&lt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d 24:00:00'))]"
domain="[('create_date','&gt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d 00:00:00')), ('create_date','&lt;=', time.strftime('%Y-%m-%d 24:00:00'))]"
name="last_7d"/>
<filter string="This week ship package" name="this_week_ship"
domain="[('create_date', '&gt;=', ((datetime.date.today() - datetime.timedelta(days=datetime.date.today().weekday()))).strftime('%Y-%m-%d')),
('create_date', '&lt;=', ((datetime.date.today() + datetime.timedelta(days=6-datetime.date.today().weekday()))).strftime('%Y-%m-%d'))]"/>
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 ship package" name="last_week_ship"
domain="[('create_date', '&gt;=', ((datetime.date.today() - datetime.timedelta(days=7+datetime.date.today().weekday()))).strftime('%Y-%m-%d')),
('create_date', '&lt;=', ((datetime.date.today() - datetime.timedelta(days=datetime.date.today().weekday()+1))).strftime('%Y-%m-%d'))]"/>
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" name="this_month_ship"
domain="[('create_date','&gt;=', time.strftime('%Y-%m-1 00:00:00')),('create_date','&lt;',(context_today() + relativedelta(months=1)).strftime('%Y-%m-1 00:00:00'))]"/>
<filter string="Last month ship package" name="last_month_ship"
domain="[('create_date','&lt;', time.strftime('%Y-%m-1 00:00:00')),('create_date','&gt;=',(context_today() - relativedelta(months=1)).strftime('%Y-%m-1 00:00:00'))]"/>
<filter string="Last 30 days Ship Package" name="last_30d"
domain="[('create_date','&gt;=', (context_today() - datetime.timedelta(days=30)).strftime('%Y-%m-%d 00:00:00'))]"/>
domain="[('create_date', '&lt;=',time.strftime('%%Y-%%m-%%d 24:00:00')),('create_date','&gt;=', (context_today() - datetime.timedelta(days=30)).strftime('%Y-%m-%d 00:00:00'))]"/>
<separator/>
<field name="tracking_no" string="Tracking No."/>
<field name="trade_no" string="Trade No"/>
......
......@@ -53,20 +53,20 @@
domain="[('create_date','&gt;=', (context_today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d 00:00:00')),('create_date','&lt;=', (context_today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d 24:00:00'))]"
name="last_24h"/>
<filter string="近7日日志"
domain="[('create_date','&lt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d 24:00:00'))]"
domain="[('create_date','&gt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d 00:00:00')), ('create_date','&lt;=', time.strftime('%Y-%m-%d 24:00:00'))]"
name="last_7d"/>
<filter string="本周日志" name="this_week_log"
domain="[('create_date', '&gt;=', ((datetime.date.today() - datetime.timedelta(days=datetime.date.today().weekday()))).strftime('%Y-%m-%d')),
('create_date', '&lt;=', ((datetime.date.today() + datetime.timedelta(days=6-datetime.date.today().weekday()))).strftime('%Y-%m-%d'))]"/>
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="上周日志" name="last_week_log"
domain="[('create_date', '&gt;=', ((datetime.date.today() - datetime.timedelta(days=7+datetime.date.today().weekday()))).strftime('%Y-%m-%d')),
('create_date', '&lt;=', ((datetime.date.today() - datetime.timedelta(days=datetime.date.today().weekday()+1))).strftime('%Y-%m-%d'))]"/>
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="本月日志" name="this_month_log"
domain="[('create_date','&gt;=', time.strftime('%Y-%m-1 00:00:00')),('create_date','&lt;',(context_today() + relativedelta(months=1)).strftime('%Y-%m-1 00:00:00'))]"/>
<filter string="上月日志" name="last_month_log"
domain="[('create_date','&lt;', time.strftime('%Y-%m-1 00:00:00')),('create_date','&gt;=',(context_today() - relativedelta(months=1)).strftime('%Y-%m-1 00:00:00'))]"/>
<filter string="近30日日志" name="last_30d"
domain="[('create_date','&gt;=', (context_today() - datetime.timedelta(days=30)).strftime('%Y-%m-%d 00:00:00'))]"/>
domain="[('create_date', '&lt;=',time.strftime('%%Y-%%m-%%d 24:00:00')),('create_date','&gt;=', (context_today() - datetime.timedelta(days=30)).strftime('%Y-%m-%d 00:00:00'))]"/>
<separator/>
<field name="big_bag_no"/>
<field name="data_text"/>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论