Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@jva-odoo
jva-odoo committed Nov 8, 2023
1 parent d189097 commit 95024e9
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 99 deletions.
14 changes: 8 additions & 6 deletions car_rental/data/ir_actions_server.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
<field name="state">code</field>
<field name="base_automation_id" ref="car_rental.create_the_product_f7fc4954-df76-46f6-84ea-ff726e6648b4"/>
<field name="code">
record.write({
'product_type': 'product',
'name' : record.display_name,
'rent_ok' : True,
})
<![CDATA[
record.write({
'product_type': 'product',
'name' : record.display_name,
'rent_ok' : True,
})
]]>
</field>
</record>
</odoo>
</odoo>
90 changes: 38 additions & 52 deletions car_rental/data/ir_ui_view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
<field name="priority">160</field>
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='vendor_id']" position="after">
<field name="x_studio_vehicle_status" string="Vehicle Status"/>
</xpath>
</data>
<xpath expr="//field[@name='vendor_id']" position="after">
<field name="x_studio_vehicle_status" string="Vehicle Status"/>
</xpath>
</field>
</record>
<record id="car_rental.odoo_studio_fleet_ve_a2831b47-fc83-4120-a7f1-7e0ba38d7874" model="ir.ui.view">
Expand All @@ -23,11 +21,9 @@
<field name="priority">160</field>
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='location']" position="after">
<field name="x_studio_product_name_fleet" string="Product Name" invisible="1"/>
</xpath>
</data>
<xpath expr="//field[@name='location']" position="after">
<field name="x_studio_product_name_fleet" string="Product Name" invisible="1"/>
</xpath>
</field>
</record>
<record id="car_rental.odoo_studio_product__d497eee1-f0c6-460d-ab22-af75533b6a03" model="ir.ui.view">
Expand All @@ -38,11 +34,9 @@
<field name="priority">160</field>
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='uom_po_id']" position="after">
<field name="x_studio_vehicle_no" string="Vehicle No."/>
</xpath>
</data>
<xpath expr="//field[@name='uom_po_id']" position="after">
<field name="x_studio_vehicle_no" string="Vehicle No."/>
</xpath>
</field>
</record>
<record id="car_rental.odoo_studio_project__11cc2179-021b-4057-88b3-78d47a16ca34" model="ir.ui.view">
Expand All @@ -53,20 +47,18 @@
<field name="priority">1000</field>
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='tag_ids']" position="after">
<field name="x_studio_vendor" string="Vendor"/>
</xpath>
<xpath expr="//field[@name='timesheet_ids']//tree//field[@name='name']" position="after">
<field optional="show" name="x_studio_out_odometer" string="Out Odometer"/>
<field optional="show" name="x_studio_in_odometer" string="In Odometer"/>
<field optional="show" name="x_studio_total_km" string="Total KM"/>
</xpath>
<xpath expr="//field[@name='timesheet_ids']//tree//field[@name='unit_amount']" position="attributes">
<attribute name="readonly">readonly_timesheet != False</attribute>
<attribute name="invisible">1</attribute>
</xpath>
</data>
<xpath expr="//field[@name='tag_ids']" position="after">
<field name="x_studio_vendor" string="Vendor"/>
</xpath>
<xpath expr="//field[@name='timesheet_ids']//tree//field[@name='name']" position="after">
<field optional="show" name="x_studio_out_odometer" string="Out Odometer"/>
<field optional="show" name="x_studio_in_odometer" string="In Odometer"/>
<field optional="show" name="x_studio_total_km" string="Total KM"/>
</xpath>
<xpath expr="//field[@name='timesheet_ids']//tree//field[@name='unit_amount']" position="attributes">
<attribute name="readonly">readonly_timesheet != False</attribute>
<attribute name="invisible">1</attribute>
</xpath>
</field>
</record>
<record id="car_rental.odoo_studio_purchase_02d7e16d-b81b-46a1-8dc1-145c6226e4d9" model="ir.ui.view">
Expand All @@ -77,11 +69,9 @@
<field name="priority">160</field>
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//form[1]/sheet[1]/notebook[1]/page[@name='products']/field[@name='order_line']/tree[1]/field[@name='name']" position="after">
<field optional="show" name="x_studio_task" string="Task"/>
</xpath>
</data>
<xpath expr="//form[1]/sheet[1]/notebook[1]/page[@name='products']/field[@name='order_line']/tree[1]/field[@name='name']" position="after">
<field optional="show" name="x_studio_task" string="Task"/>
</xpath>
</field>
</record>
<record id="car_rental.odoo_studio_rental_o_ed1928d3-6ede-47c8-864e-f4fd1a7e1729" model="ir.ui.view">
Expand All @@ -92,19 +82,17 @@
<field name="priority">160</field>
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='partner_id']" position="after">
<field name="x_studio_licence_no" string="Licence No."/>
</xpath>
<xpath expr="//group[@name='order_details']" position="inside">
<field name="x_studio_security_deposit" string="Security Deposit" widget="monetary"/>
</xpath>
<xpath expr="//form[1]/sheet[1]/notebook[1]/page[@name='order_lines']/field[@name='order_line']/tree[1]/field[@name='name']" position="after">
<field optional="show" name="x_studio_car" string="Car" invisible="1" attrs="{'readonly': True}"/>
<field optional="show" name="x_studio_car_status" string="Car Status"/>
<field optional="show" name="x_studio_rental_status" string="Rental Status"/>
</xpath>
</data>
<xpath expr="//field[@name='partner_id']" position="after">
<field name="x_studio_licence_no" string="Licence No."/>
</xpath>
<xpath expr="//group[@name='order_details']" position="inside">
<field name="x_studio_security_deposit" string="Security Deposit" widget="monetary"/>
</xpath>
<xpath expr="//form[1]/sheet[1]/notebook[1]/page[@name='order_lines']/field[@name='order_line']/tree[1]/field[@name='name']" position="after">
<field optional="show" name="x_studio_car" string="Car" invisible="1" attrs="{'readonly': True}"/>
<field optional="show" name="x_studio_car_status" string="Car Status"/>
<field optional="show" name="x_studio_rental_status" string="Rental Status"/>
</xpath>
</field>
</record>
<record id="car_rental.odoo_studio_res_part_fad9bf29-eb91-4862-8582-0c7cd0f70921" model="ir.ui.view">
Expand All @@ -115,11 +103,9 @@
<field name="priority">360</field>
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//form[1]/sheet[1]/group[1]/group[1]/div[1]" position="after">
<field name="x_studio_licence_no" string="Licence No. "/>
</xpath>
</data>
<xpath expr="//form[1]/sheet[1]/group[1]/group[1]/div[1]" position="after">
<field name="x_studio_licence_no" string="Licence No. "/>
</xpath>
</field>
</record>
</odoo>
8 changes: 4 additions & 4 deletions car_rental/data/knowledge_article.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
<odoo>
<record id="car_rental.knowledge_article_4" model="knowledge.article">
<field name="name">Car Rental</field>
<field name="internal_permission">write</field>
<field name="icon">🚗</field>
<field name="is_published" eval="True"/>
<field name="is_locked" eval="True"/>
<field name="internal_permission">write</field>
<field name="cover_image_id" ref="car_rental.knowledge_cover_2"/>
<field name="body">
<![CDATA[
<h1>
Expand Down Expand Up @@ -136,8 +139,5 @@
]]>
</field>
<field name="icon">🚗</field>
<field name="cover_image_id" ref="car_rental.knowledge_cover_2"/>
<field name="is_locked" eval="True"/>
</record>
</odoo>
57 changes: 24 additions & 33 deletions car_rental/demo/purchase_order.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,62 @@
<odoo noupdate="1">
<record id="car_rental.purchase_order_1" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_8"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-08-18 10:48:21</field>
<field name="date_order">2023-08-18 10:46:25</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_2" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_9"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-08-20 16:59:34</field>
<field name="date_order">2023-08-20 16:58:55</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_3" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_10"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-08-20 17:00:40</field>
<field name="date_order">2023-08-20 17:00:11</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_4" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_11"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-08-20 17:01:30</field>
<field name="date_order">2023-08-20 17:01:07</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_5" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_12"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-08-20 17:04:14</field>
<field name="date_order">2023-08-20 17:03:50</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_6" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_15"/>
<field name="date_approve">2023-08-21 11:19:20</field>
<field name="date_order">2023-08-21 11:18:45</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_7" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_10"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-08-21 11:22:09</field>
<field name="date_order">2023-08-21 11:21:41</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_8" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_12"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-10-09 05:37:00</field>
<field name="date_order">2023-10-09 05:35:27</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_9" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_13"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-10-09 05:41:23</field>
<field name="date_order">2023-10-09 05:41:03</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_10" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_14"/>
<field name="date_approve">2023-10-09 05:53:26</field>
<field name="date_order">2023-10-09 05:53:00</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_11" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_13"/>
<field name="receipt_status">full</field>
<field name="date_approve">2023-10-09 06:15:30</field>
<field name="date_order">2023-10-09 06:15:08</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
<record id="car_rental.purchase_order_12" model="purchase.order">
<field name="partner_id" ref="car_rental.res_partner_14"/>
<field name="date_approve">2023-10-09 06:23:48</field>
<field name="date_order">2023-10-09 06:23:22</field>
<field name="date_approve" eval="datetime.now()"/>
<field name="date_order" eval="datetime.now()"/>
</record>
</odoo>
3 changes: 2 additions & 1 deletion car_rental/demo/purchase_order_line_post.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<odoo>
<?xml version='1.0' encoding='UTF-8'?>
<odoo noupdate="1">
<record id="car_rental.purchase_order_line_12" model="purchase.order.line">
<field name="x_studio_task" model="project.task" eval= "obj().env.ref('car_rental.sale_order_line_12').task_id.id"/>
</record>
Expand Down
2 changes: 1 addition & 1 deletion car_rental/demo/res_config_settings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<odoo noupdate="1">
<odoo>

<record model="res.config.settings" id="res_config_settings_enable">
<field name="group_discount_per_so_line" eval="1"/>
Expand Down
3 changes: 1 addition & 2 deletions car_rental/demo/website_theme_apply.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@
]).id"/>
<value eval="{'name': 'Booking'}"/>
</function>

</odoo>
</odoo>

0 comments on commit 95024e9

Please sign in to comment.