!9664 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Merge pull request !9664 from 李鹏宇/dev_wang

yuthon_report/views/cumulative_arrears_report.xml

@@ -35,7 +35,7 @@
             name="累计欠收"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_cumulative_arrears_report"
-            sequence="17"
+            sequence="240"
         />
     </data>
 </odoo>

yuthon_report/views/cumulative_income_report.xml

@@ -26,7 +26,7 @@
             name="累加收入"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_cumulative_income_report"
-            sequence="8"
+            sequence="290"
         />
     </data>
 </odoo>

yuthon_report/views/current_receivable_rent_report.xml

@@ -35,7 +35,7 @@
             name="当期应收"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_current_receivable_rent_report"
-            sequence="19"
+            sequence="260"
         />
     </data>
 </odoo>

yuthon_report/views/menu.xml

@@ -11,7 +11,7 @@
 
         <!-- 经营收入 -->
         <menuitem id="yuthon_property_income_menu"
-                  sequence="7"
+                  sequence="110"
                   name="经营收入"
                   parent="yuthon_property_approval.property_approval_report_menu"/>
         <menuitem id="yuthon_property_income_pre_arrears2_menu"
@@ -52,7 +52,7 @@
 
         <!-- 其他收入 -->
         <menuitem id="yuthon_property_other_income_menu"
-                  sequence="8"
+                  sequence="120"
                   name="其他收入"
                   parent="yuthon_property_approval.property_approval_report_menu"/>
         <menuitem id="yuthon_property_penalty_menu"
@@ -115,7 +115,7 @@
 
         <!-- 押金 -->
         <menuitem id="yuthon_property_deposit_menu"
-                  sequence="9"
+                  sequence="130"
                   name="押金"
                   parent="yuthon_property_approval.property_approval_report_menu"/>
         <menuitem id="yuthon_property_deposit_month_receivable_menu"

yuthon_report/views/monthly_expense_total_report.xml

@@ -30,7 +30,7 @@
             name="本月支出-合计"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_monthly_expense_total_report"
-            sequence="32"
+            sequence="390"
         />
     </data>
 </odoo>

yuthon_report/views/monthly_maintenance_fee_report.xml

@@ -30,7 +30,7 @@
             name="本月支出-维修费"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_monthly_maintenance_fee_report"
-            sequence="35"
+            sequence="410"
         />
     </data>
 </odoo>

yuthon_report/views/monthly_management_fee_report.xml

@@ -30,7 +30,7 @@
             name="本月支出-管理费"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_monthly_management_fee_report"
-            sequence="31"
+            sequence="380"
         />
     </data>
 </odoo>

yuthon_report/views/monthly_other_expense_report.xml

@@ -30,7 +30,7 @@
             name="本月支出-其他"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_monthly_other_expense_report"
-            sequence="34"
+            sequence="400"
         />
     </data>
 </odoo>

yuthon_report/views/overdue_amount_report.xml

@@ -32,7 +32,7 @@
             name="欠费明细"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_overdue_amount_report"
-            sequence="10"
+            sequence="200"
         />
     </data>
 </odoo>

yuthon_report/views/parking_fee_current_month_receivable.xml

@@ -29,7 +29,7 @@
             name="停车费本月应收"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_parking_fee_current_month_receivable"
-            sequence="22"
+            sequence="300"
         />
     </data>
 </odoo>

yuthon_report/views/parking_fee_current_month_report.xml

@@ -29,7 +29,7 @@
             name="停车费本月实收"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_parking_fee_current_month_report"
-            sequence="21"
+            sequence="280"
         />
     </data>
 </odoo>

yuthon_report/views/parking_fee_yearly_report.xml

@@ -29,7 +29,7 @@
             name="停车费本年累计"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_parking_fee_yearly_report"
-            sequence="18"
+            sequence="250"
         />
     </data>
 </odoo>

yuthon_report/views/penalty_detail_report.xml

@@ -38,7 +38,7 @@
             name="违约金明细报表"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_penalty_detail_report"
-            sequence="13"
+            sequence="210"
         />
     </data>
 </odoo>

yuthon_report/views/receivable_detail_report.xml

@@ -29,7 +29,7 @@
             name="合同应收"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_receivable_detail_report"
-            sequence="15"
+            sequence="220"
         />
     </data>
 </odoo>

yuthon_report/views/receivable_report_views.xml

@@ -47,7 +47,7 @@
             name="应收账单"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="yuthon_property_approval.property_accounts_receivable_action"
-            sequence="5"
+            sequence="100"
         />
     </data>
 </odoo>

yuthon_report/views/receivables_message_report_views.xml

@@ -31,7 +31,7 @@
             name="收款信息表"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_property_receipt_ledger_report"
-            sequence="7"
+            sequence="270"
         />
     </data>
 </odoo>

yuthon_report/views/rentable_area_report.xml

@@ -30,7 +30,7 @@
             name="可租面积"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_rentable_area_report"
-            sequence="16"
+            sequence="230"
         />
     </data>
 </odoo>

yuthon_report/views/rented_area_report.xml

@@ -31,7 +31,7 @@
             name="已租面积"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_rented_area_report"
-            sequence="25"
+            sequence="320"
         />
     </data>
 </odoo>

yuthon_report/views/staff_position_report.xml

@@ -32,7 +32,7 @@
             name="人员岗位报表"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_staff_position_report"
-            sequence="36"
+            sequence="420"
         />
     </data>
 </odoo>

yuthon_report/views/yearly_assessment_fee_report.xml

@@ -30,7 +30,7 @@
             name="本年累计-评估费用"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_yearly_assessment_fee_report"
-            sequence="28"
+            sequence="350"
         />
     </data>
 </odoo>

yuthon_report/views/yearly_expense_report.xml

@@ -29,7 +29,7 @@
             name="支出本年-合计"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_yearly_expense_report"
-            sequence="27"
+            sequence="340"
         />
     </data>
 </odoo>

yuthon_report/views/yearly_maintenance_fee_report.xml

@@ -30,7 +30,7 @@
             name="本年累计-维修费"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_yearly_maintenance_fee_report"
-            sequence="30"
+            sequence="370"
         />
     </data>
 </odoo>

yuthon_report/views/yearly_management_fee_report.xml

@@ -30,7 +30,7 @@
             name="本年累计-管理费"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_yearly_management_fee_report"
-            sequence="26"
+            sequence="330"
         />
     </data>
 </odoo>

yuthon_report/views/yearly_other_fee_report.xml

@@ -30,7 +30,7 @@
             name="本年累计-其他费用"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_yearly_other_fee_report"
-            sequence="29"
+            sequence="360"
         />
     </data>
 </odoo>

yuthon_report/views/yearly_penalty_report.xml

@@ -29,7 +29,7 @@
             name="违约金本年累计"
             parent="yuthon_property_approval.property_approval_report_menu"
             action="action_yearly_penalty_report"
-            sequence="23"
+            sequence="310"
         />
     </data>
 </odoo>