From da7002bca3d551d9e7d475596994588e1662824b Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 21 Jun 2023 13:48:58 +0200 Subject: [PATCH 001/147] sync --- snippets/account.md | 28 ++++ ...ort_invoice_document.x_hide_on_invoice.xml | 8 + snippets/ir_model.md | 25 ++- ...el.product_template.x_hide_on_delivery.xml | 2 +- ...del.product_template.x_hide_on_invoice.xml | 16 ++ snippets/product.md | 20 ++- ...plate_only_form_view.x_hide_on_invoice.xml | 12 ++ ...te_only_form_view.x_hide_on_sale_order.xml | 2 +- snippets/sale.md | 15 ++ ...e.view_order_form.product_id_no_create.xml | 8 + snippets/stock.md | 152 ++++++++++++------ ...elivery_document.append_signature_text.xml | 49 ++++-- ...y_document.backorder_signature_section.xml | 6 +- ...ort_delivery_document.description_sale.xml | 13 -- ...very_document.replace_description_sale.xml | 13 ++ ...delivery_document.replace_informations.xml | 19 ++- ...livery_document.replace_sale_line_name.xml | 13 ++ ...rt_delivery_document.show_default_code.xml | 22 +-- ....report_delivery_document.show_lot_ids.xml | 10 +- 19 files changed, 330 insertions(+), 103 deletions(-) create mode 100644 snippets/account.report_invoice_document.x_hide_on_invoice.xml create mode 100644 snippets/ir_model.product_template.x_hide_on_invoice.xml create mode 100644 snippets/product.product_template_only_form_view.x_hide_on_invoice.xml create mode 100644 snippets/sale.view_order_form.product_id_no_create.xml delete mode 100644 snippets/stock.report_delivery_document.description_sale.xml create mode 100644 snippets/stock.report_delivery_document.replace_description_sale.xml create mode 100644 snippets/stock.report_delivery_document.replace_sale_line_name.xml diff --git a/snippets/account.md b/snippets/account.md index ef65dbbc..f5559943 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -2132,6 +2132,20 @@ ID: `mint_system.account.report_invoice_document.unit_precision` ``` Source: [snippets/account.report_invoice_document.unit_precision.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.unit_precision.xml) +### X Hide On Invoice +ID: `mint_system.account.report_invoice_document.x_hide_on_invoice` +```xml + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.x_hide_on_invoice.xml) + ### X Picking List ID: `mint_system.account.report_invoice_document.x_picking_list` ```xml @@ -4311,6 +4325,20 @@ ID: `mint_system.account.report_invoice_document.unit_precision` ``` Source: [snippets/account.report_invoice_document.unit_precision.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.unit_precision.xml) +### X Hide On Invoice +ID: `mint_system.account.report_invoice_document.x_hide_on_invoice` +```xml + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.x_hide_on_invoice.xml) + ### X Picking List ID: `mint_system.account.report_invoice_document.x_picking_list` ```xml diff --git a/snippets/account.report_invoice_document.x_hide_on_invoice.xml b/snippets/account.report_invoice_document.x_hide_on_invoice.xml new file mode 100644 index 00000000..a1c497ea --- /dev/null +++ b/snippets/account.report_invoice_document.x_hide_on_invoice.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/ir_model.md b/snippets/ir_model.md index e0444f6a..f3fcff68 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -1134,7 +1134,7 @@ ID: `mint_system.ir_model.product_template.x_hide_on_delivery` x_hide_on_delivery - + boolean @@ -1143,6 +1143,29 @@ ID: `mint_system.ir_model.product_template.x_hide_on_delivery` ``` Source: [snippets/ir_model.product_template.x_hide_on_delivery.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.product_template.x_hide_on_delivery.xml) +### X Hide On Invoice +ID: `mint_system.ir_model.product_template.x_hide_on_invoice` +```xml + + + + + [] + Auf Rechnung ausblenden + product.template + + x_hide_on_invoice + + + + boolean + + + + +``` +Source: [snippets/ir_model.product_template.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.product_template.x_hide_on_invoice.xml) + ### X Hide On Sale Order ID: `mint_system.ir_model.product_template.x_hide_on_sale_order` ```xml diff --git a/snippets/ir_model.product_template.x_hide_on_delivery.xml b/snippets/ir_model.product_template.x_hide_on_delivery.xml index 479181a3..ef1b77c6 100644 --- a/snippets/ir_model.product_template.x_hide_on_delivery.xml +++ b/snippets/ir_model.product_template.x_hide_on_delivery.xml @@ -9,7 +9,7 @@ x_hide_on_delivery - + boolean diff --git a/snippets/ir_model.product_template.x_hide_on_invoice.xml b/snippets/ir_model.product_template.x_hide_on_invoice.xml new file mode 100644 index 00000000..5b8317ca --- /dev/null +++ b/snippets/ir_model.product_template.x_hide_on_invoice.xml @@ -0,0 +1,16 @@ + + + + + [] + Auf Rechnung ausblenden + product.template + + x_hide_on_invoice + + + + boolean + + + diff --git a/snippets/product.md b/snippets/product.md index e0cac0b3..ae37643a 100644 --- a/snippets/product.md +++ b/snippets/product.md @@ -531,6 +531,24 @@ ID: `mint_system.product.product_template_only_form_view.x_hide_on_delivery` ``` Source: [snippets/product.product_template_only_form_view.x_hide_on_delivery.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/product.product_template_only_form_view.x_hide_on_delivery.xml) +### X Hide On Invoice +ID: `mint_system.product.product_template_only_form_view.x_hide_on_invoice` +```xml + + + + + + + + + + + + +``` +Source: [snippets/product.product_template_only_form_view.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml) + ### X Hide On Sale Order ID: `mint_system.product.product_template_only_form_view.x_hide_on_sale_order` ```xml @@ -538,7 +556,7 @@ ID: `mint_system.product.product_template_only_form_view.x_hide_on_sale_order` - + diff --git a/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml b/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml new file mode 100644 index 00000000..c83d4fc9 --- /dev/null +++ b/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml b/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml index 784c5d18..cc1fa3be 100644 --- a/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml +++ b/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/snippets/sale.md b/snippets/sale.md index 21670b3f..138e5c19 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -3272,6 +3272,21 @@ ID: `mint_system.sale.view_order_form.no_create_edit` ``` Source: [snippets/sale.view_order_form.no_create_edit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.no_create_edit.xml) +### Product Id No Create +ID: `mint_system.sale.view_order_form.product_id_no_create` +```xml + + + + + {'no_open': True, 'no_create': True} + + + + +``` +Source: [snippets/sale.view_order_form.product_id_no_create.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.product_id_no_create.xml) + ### Project Domain ID: `mint_system.sale.view_order_form.project_domain` ```xml diff --git a/snippets/sale.view_order_form.product_id_no_create.xml b/snippets/sale.view_order_form.product_id_no_create.xml new file mode 100644 index 00000000..ea086fc8 --- /dev/null +++ b/snippets/sale.view_order_form.product_id_no_create.xml @@ -0,0 +1,8 @@ + + + + + {'no_open': True, 'no_create': True} + + + diff --git a/snippets/stock.md b/snippets/stock.md index f8da4fb7..a181fe24 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -1442,25 +1442,47 @@ ID: `mint_system.stock.report_delivery_document.append_signature_text` + + +
+

Hiermit bestätigen wir den Erhalt der Ware gemäss Lieferung.

+
+
+
+
+

Ort/Datum: __________________________________

+
+
+

Unterschrift Kunde: __________________________________

+
+
+
+ +
-

Gebinde geliefert: _____

-

Gebinde zurück: _____

-
-

Unterschrift Transport: _______________

+

Gebinde geliefert: _____

+

Gebinde zurück: _____

+
+

Unterschrift Transport: _______________

-

Produkte einwandfrei erhalten.

-
-

Unterschrift Kunde: _______________

+

Produkte einwandfrei erhalten.

+
+

Unterschrift Kunde: _______________

- ``` Source: [snippets/stock.report_delivery_document.append_signature_text.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.append_signature_text.xml) @@ -1472,9 +1494,9 @@ ID: `mint_system.stock.report_delivery_document.backorder_signature_section`

Retouren:

- KEG:             ___________  Anzahl

- Harassen:  ___________  Anzahl

- Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________ + KEG: ___________ Anzahl

+ Harassen: ___________ Anzahl

+ Waren erhalten: Datum: ______________________ Unterschrift: _________________________________

@@ -1498,26 +1520,6 @@ ID: `mint_system.stock.report_delivery_document.barcode_customer_reference` ``` Source: [snippets/stock.report_delivery_document.barcode_customer_reference.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.barcode_customer_reference.xml) -### Description Sale -ID: `mint_system.stock.report_delivery_document.description_sale` -```xml - - - - - - - - - - - - - - -``` -Source: [snippets/stock.report_delivery_document.description_sale.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.description_sale.xml) - ### Disable Stock Move Line Table ID: `mint_system.stock.report_delivery_document.disable_stock_move_line_table` ```xml @@ -2088,6 +2090,25 @@ ID: `mint_system.stock.report_delivery_document.remove_informations` ``` Source: [snippets/stock.report_delivery_document.remove_informations.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.remove_informations.xml) +### Replace Description Sale +ID: `mint_system.stock.report_delivery_document.replace_description_sale` +```xml + + + + + + + + + + + + + +``` +Source: [snippets/stock.report_delivery_document.replace_description_sale.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_description_sale.xml) + ### Replace Header ID: `mint_system.stock.report_delivery_document.replace_header` ```xml @@ -2143,25 +2164,32 @@ ID: `mint_system.stock.report_delivery_document.replace_informations` +
- Shipping Date: + Versanddatum: -

+ -

+

+ Unser Kontakt: + - Customer Reference: -

+ Ihr Kontakt: +

 Unsere Referenz: -

+ +

+ + Ihre Referenz: +
@@ -2437,6 +2465,25 @@ ID: `mint_system.stock.report_delivery_document.replace_product_uom_qty` ``` Source: [snippets/stock.report_delivery_document.replace_product_uom_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_product_uom_qty.xml) +### Replace Sale Line Name +ID: `mint_system.stock.report_delivery_document.replace_sale_line_name` +```xml + + + + + + + + + + + + + +``` +Source: [snippets/stock.report_delivery_document.replace_sale_line_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_sale_line_name.xml) + ### Replace Table ID: `mint_system.stock.report_delivery_document.replace_table` ```xml @@ -2760,23 +2807,26 @@ ID: `mint_system.stock.report_delivery_document.show_default_code` - + + + Referenz + + + + + + + + ``` Source: [snippets/stock.report_delivery_document.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.show_default_code.xml) @@ -2786,16 +2836,18 @@ ID: `mint_system.stock.report_delivery_document.show_lot_ids` - + Seriennummer - + -
    -
  • +
      + +
    • +
    diff --git a/snippets/stock.report_delivery_document.append_signature_text.xml b/snippets/stock.report_delivery_document.append_signature_text.xml index d3707b77..63a230b5 100644 --- a/snippets/stock.report_delivery_document.append_signature_text.xml +++ b/snippets/stock.report_delivery_document.append_signature_text.xml @@ -2,20 +2,43 @@ -
    -
    -

    Gebinde geliefert: _____

    -

    Gebinde zurück: _____

    -
    -

    Unterschrift Transport: _______________

    -
    -
    -
    -

    Produkte einwandfrei erhalten.

    -
    -

    Unterschrift Kunde: _______________

    + +
    +

    Hiermit bestätigen wir den Erhalt der Ware gemäss Lieferung.

    +
    +
    +
    +
    +

    Ort/Datum: __________________________________

    +
    +
    +

    Unterschrift Kunde: __________________________________

    +
    - + +
    +
    +

    Gebinde geliefert: _____

    +

    Gebinde zurück: _____

    +
    +

    Unterschrift Transport: _______________

    +
    +
    +
    +

    Produkte einwandfrei erhalten.

    +
    +

    Unterschrift Kunde: _______________

    +
    +
    + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.backorder_signature_section.xml b/snippets/stock.report_delivery_document.backorder_signature_section.xml index 275aad52..2ff331b5 100644 --- a/snippets/stock.report_delivery_document.backorder_signature_section.xml +++ b/snippets/stock.report_delivery_document.backorder_signature_section.xml @@ -3,9 +3,9 @@

    Retouren:

    - KEG:             ___________  Anzahl

    - Harassen:  ___________  Anzahl

    - Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________ + KEG: ___________ Anzahl

    + Harassen: ___________ Anzahl

    + Waren erhalten: Datum: ______________________ Unterschrift: _________________________________

    diff --git a/snippets/stock.report_delivery_document.description_sale.xml b/snippets/stock.report_delivery_document.description_sale.xml deleted file mode 100644 index 3b7502a9..00000000 --- a/snippets/stock.report_delivery_document.description_sale.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/snippets/stock.report_delivery_document.replace_description_sale.xml b/snippets/stock.report_delivery_document.replace_description_sale.xml new file mode 100644 index 00000000..b61ca4f6 --- /dev/null +++ b/snippets/stock.report_delivery_document.replace_description_sale.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.replace_informations.xml b/snippets/stock.report_delivery_document.replace_informations.xml index d9b15804..539cef58 100644 --- a/snippets/stock.report_delivery_document.replace_informations.xml +++ b/snippets/stock.report_delivery_document.replace_informations.xml @@ -15,25 +15,32 @@ +
    - Shipping Date: + Versanddatum: -

    + -

    +

    		+ Unser Kontakt: + - Customer Reference: -

    + Ihr Kontakt: +

     Unsere Referenz: -

    + +

    		+ + Ihre Referenz: +
    diff --git a/snippets/stock.report_delivery_document.replace_sale_line_name.xml b/snippets/stock.report_delivery_document.replace_sale_line_name.xml new file mode 100644 index 00000000..4eb490c6 --- /dev/null +++ b/snippets/stock.report_delivery_document.replace_sale_line_name.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.show_default_code.xml b/snippets/stock.report_delivery_document.show_default_code.xml index b08d510f..967b7a2f 100644 --- a/snippets/stock.report_delivery_document.show_default_code.xml +++ b/snippets/stock.report_delivery_document.show_default_code.xml @@ -1,20 +1,22 @@ - + + + Referenz + + + + + + + - \ No newline at end of file + diff --git a/snippets/stock.report_delivery_document.show_lot_ids.xml b/snippets/stock.report_delivery_document.show_lot_ids.xml index 9bde9287..d7a96f25 100644 --- a/snippets/stock.report_delivery_document.show_lot_ids.xml +++ b/snippets/stock.report_delivery_document.show_lot_ids.xml @@ -1,16 +1,18 @@ - + Seriennummer - + -
      -
    • +
        + +
      • +
      From c9ef377b5e5a6cc9f42a0367a1dfd8018f8b76de Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 21 Jun 2023 17:50:00 +0200 Subject: [PATCH 002/147] ref --- addons/odoo_apps_partner | 2 +- addons/sale_workflow | 2 +- oca/maintenance | 1 + oca/reporting-engine | 2 +- oca/sale-workflow | 2 +- oca/server-ux | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) create mode 160000 oca/maintenance diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner index 71f3ab67..3f221d84 160000 --- a/addons/odoo_apps_partner +++ b/addons/odoo_apps_partner @@ -1 +1 @@ -Subproject commit 71f3ab67d80fe5a5bb63f2108d53f698fd3fd73e +Subproject commit 3f221d8429c87fc384f2d54a0f49c75f7a2e4eda diff --git a/addons/sale_workflow b/addons/sale_workflow index fc3f7a75..2778c59d 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit fc3f7a75c649bc57547c04ba088ae294fbc1d3b5 +Subproject commit 2778c59ddfcd558f71b98d3813b29849375f5a4d diff --git a/oca/maintenance b/oca/maintenance new file mode 160000 index 00000000..43d86421 --- /dev/null +++ b/oca/maintenance @@ -0,0 +1 @@ +Subproject commit 43d8642130713d9ffe0b851386bbf976d4df2aa9 diff --git a/oca/reporting-engine b/oca/reporting-engine index a32ae6f1..889cc4bb 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit a32ae6f1913b7f613b61c63e8932a68655a80685 +Subproject commit 889cc4bb3d4cb70ab011ab881391352d12631412 diff --git a/oca/sale-workflow b/oca/sale-workflow index 9bfedca7..7ebf9632 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 9bfedca79d801493a66bb5ee7ae047e62d75a361 +Subproject commit 7ebf963257aaeb3b932dd949bc0cadf9842ef43a diff --git a/oca/server-ux b/oca/server-ux index a3de5198..6fd31e01 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit a3de5198df014210f7f7050798ea0fdcc41d6c8b +Subproject commit 6fd31e01da970b8a018d0e82acdb17f7f8ffa80e From 0cc4042e1c3116ffc7d87d1d6ae332ebd3958097 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 22 Jun 2023 11:05:41 +0200 Subject: [PATCH 003/147] update snippets --- .../stock.report_delivery_document.format_qty.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/snippets/stock.report_delivery_document.format_qty.xml b/snippets/stock.report_delivery_document.format_qty.xml index 3c6ebad1..4e42e895 100644 --- a/snippets/stock.report_delivery_document.format_qty.xml +++ b/snippets/stock.report_delivery_document.format_qty.xml @@ -1,12 +1,12 @@ - - "integer" - + + "integer" + - - "integer" - + + "integer" + - + \ No newline at end of file From 025bda82b65e4a913c9b8bee437b5461ccd1153e Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 23 Jun 2023 18:02:45 +0200 Subject: [PATCH 004/147] ref + snippets --- addons/vertical_saas | 2 +- enterprise | 2 +- oca/account-closing | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/bank-payment | 2 +- oca/connector | 2 +- oca/crm | 2 +- oca/hr | 2 +- oca/knowledge | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-backend | 2 +- oca/server-env | 2 +- oca/server-ux | 2 +- oca/stock-logistics-workflow | 2 +- oca/web | 2 +- odoo | 2 +- ...imesheet.hr_timesheet_line_search.filter_validated.xml | 8 ++++++++ 25 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml diff --git a/addons/vertical_saas b/addons/vertical_saas index eb42976d..19037b4d 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit eb42976d03ed37f6189122862dcb54730d65b641 +Subproject commit 19037b4d23f67a27934d845f2e85cc0fad8343c0 diff --git a/enterprise b/enterprise index 2540ef93..6e6ef3fb 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 2540ef93b92e04c46f5731bd382ca2bf031efca2 +Subproject commit 6e6ef3fba03b0a8d395ce20770264710a6ba6ac2 diff --git a/oca/account-closing b/oca/account-closing index 128f44fd..d6992b8b 160000 --- a/oca/account-closing +++ b/oca/account-closing @@ -1 +1 @@ -Subproject commit 128f44fd568c34dd7f019953555950a73b274aeb +Subproject commit d6992b8b55c03f3fc1ca91028f584409594688c2 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index 855e061e..ad6f4412 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit 855e061e5c3e939d87adb5a9ab220d8f27c65f7d +Subproject commit ad6f4412b87e6db1ce9f748d85af16ef348037e8 diff --git a/oca/account-invoicing b/oca/account-invoicing index fc53efde..a7d1ea3e 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit fc53efde622bd0372aa06d9ab94032a0504d1a10 +Subproject commit a7d1ea3ee2a851d779c0fc1cfd4594f4a5409432 diff --git a/oca/bank-payment b/oca/bank-payment index bd092012..5c9cf261 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit bd0920127571554e53c9820e3ca94ad08d2b1513 +Subproject commit 5c9cf261e5ad81848df55c4f19ff865bd32d61f3 diff --git a/oca/connector b/oca/connector index f83b233b..6ee1fe0e 160000 --- a/oca/connector +++ b/oca/connector @@ -1 +1 @@ -Subproject commit f83b233bb02683e674c2fa2c360524dcfa5ddb7f +Subproject commit 6ee1fe0eec8dd23ce1cd2079e214883b07971ad6 diff --git a/oca/crm b/oca/crm index e2f6fdf7..f6af95d3 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit e2f6fdf736b682d4dfff682a3a309076b1f4ffdf +Subproject commit f6af95d30cd2aa1e204d7fa8a66c7d787cb91730 diff --git a/oca/hr b/oca/hr index 9b4ed10a..79f87cca 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit 9b4ed10a473bf7b9398adfd2e09c1254ebba1c2f +Subproject commit 79f87cca69c0e28c2650afb3ec9d5cd42b514a18 diff --git a/oca/knowledge b/oca/knowledge index cb2f10d8..4284f6f1 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit cb2f10d8ce4080965ce6a1421ca21eb214a63171 +Subproject commit 4284f6f14c17b3465e78cadc7c39ec960e6395c7 diff --git a/oca/manufacture b/oca/manufacture index fe33b288..fd14862d 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit fe33b288b2a9d31524c935b280cd3ae5119f32e8 +Subproject commit fd14862dd8cc42fb977efd9ef150c738d42f94e5 diff --git a/oca/partner-contact b/oca/partner-contact index b45d89cc..32511d22 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit b45d89ccd20781acfa9af3ba15aaa910762f4166 +Subproject commit 32511d2244349841bb230aa23b15bb74ac153876 diff --git a/oca/product-attribute b/oca/product-attribute index aedd5ecb..34c9da4a 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit aedd5ecbaa060ef556b5ddb85afef725e1572508 +Subproject commit 34c9da4aca7dfb44e4bf25734f9dd5b021477cf1 diff --git a/oca/project b/oca/project index 61db201e..d62b9052 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 61db201e0b7715dbee43272cc553db7ac7e39372 +Subproject commit d62b905255061c9b5f447e05c8b20ddcd7797b54 diff --git a/oca/reporting-engine b/oca/reporting-engine index 889cc4bb..198e9679 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 889cc4bb3d4cb70ab011ab881391352d12631412 +Subproject commit 198e96796bfd565eb4d3248342a6b4f2a82e8505 diff --git a/oca/rest-framework b/oca/rest-framework index e0d438cc..c63e21d0 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit e0d438cc6247ae5e8d8d595a0bcca476b9c365c7 +Subproject commit c63e21d0e62a503ad78efc3af06675ec425ed05e diff --git a/oca/sale-workflow b/oca/sale-workflow index 7ebf9632..44643035 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 7ebf963257aaeb3b932dd949bc0cadf9842ef43a +Subproject commit 446430359c542b6041f1c6635a91e241c1bc64b5 diff --git a/oca/server-auth b/oca/server-auth index 474ee205..8b7505ca 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit 474ee20533596d30ce5fab65f85a0368838e629e +Subproject commit 8b7505cae46f269ea342d06195d1a746382ca120 diff --git a/oca/server-backend b/oca/server-backend index 73e42f7e..a0895d3b 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 73e42f7e3f3bbd745f6cbbe7699501f79d5f18d9 +Subproject commit a0895d3be472da97683f7e92e8dfbfdad7bf39f2 diff --git a/oca/server-env b/oca/server-env index a652e169..edc914e4 160000 --- a/oca/server-env +++ b/oca/server-env @@ -1 +1 @@ -Subproject commit a652e1690e05d239edf8b3d772894c2d34786ad2 +Subproject commit edc914e469c0459c8d501a96d503a265fb61a4f1 diff --git a/oca/server-ux b/oca/server-ux index 6fd31e01..28077094 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit 6fd31e01da970b8a018d0e82acdb17f7f8ffa80e +Subproject commit 28077094aedbfc13caabf6ab80c0506d80431db0 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index a39fa273..f056e030 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit a39fa27335656aac19b6a882f8d9b1ad3b23c20a +Subproject commit f056e0309873bb8c57747cc810de499d296d8837 diff --git a/oca/web b/oca/web index 2441ebfc..dfadd419 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 2441ebfc68878bb0eef374817258184aa60887e4 +Subproject commit dfadd419a421bf07e493327a804c0b4d1cd75c0e diff --git a/odoo b/odoo index 3619f77c..eb022e38 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 3619f77c73092e800aab10f0df09ca5775545da3 +Subproject commit eb022e388b62856020d95e063ec0dfd4b786c4a9 diff --git a/snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml b/snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml new file mode 100644 index 00000000..7f670f13 --- /dev/null +++ b/snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml @@ -0,0 +1,8 @@ + + + + + + + + From 880ebccf27e91c814b9894e23f13f1ee63b1964a Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 26 Jun 2023 10:13:29 +0200 Subject: [PATCH 005/147] update submodule list --- .gitmodules | 4 ++++ addons/odoo_apps_partner | 2 +- addons/social | 1 + config/odoo-native.conf | 2 +- config/odoo.conf | 2 +- enterprise | 2 +- oca/project | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) create mode 160000 addons/social diff --git a/.gitmodules b/.gitmodules index 1ccb13c5..c4f68e49 100644 --- a/.gitmodules +++ b/.gitmodules @@ -206,3 +206,7 @@ path = addons/vertical_saas url = git@github.com:Mint-System/Odoo-Apps-SaaS.git branch = 16.0 +[submodule "addons/social"] + path = addons/social + url = git@github.com:Mint-System/Odoo-Apps-Social.git + branch = 16.0 diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner index 3f221d84..e65ce856 160000 --- a/addons/odoo_apps_partner +++ b/addons/odoo_apps_partner @@ -1 +1 @@ -Subproject commit 3f221d8429c87fc384f2d54a0f49c75f7a2e4eda +Subproject commit e65ce85634569191343a639ad8ac289f58074caf diff --git a/addons/social b/addons/social new file mode 160000 index 00000000..f50f3f3c --- /dev/null +++ b/addons/social @@ -0,0 +1 @@ +Subproject commit f50f3f3ccfb5515f1c45a945743b8c22847a3754 diff --git a/config/odoo-native.conf b/config/odoo-native.conf index 7554621c..6a4b79e0 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas +addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social ; admin_passwd = admin admin_passwd = $pbkdf2-sha512$25000$rlUqpfTe2ztn7P2fcw7BOA$J9DDQN5WeT/.hyYeLNtJTOS6PhOsEbCeIN4iFaynjEY1PjW5zZwYVdR19qOEFVPOkR4HuHLi1EsV.juSjEc90w limit_time_real = 480 diff --git a/config/odoo.conf b/config/odoo.conf index c20a8ee1..954dd7ed 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas +addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social admin_passwd = admin data_dir = /var/lib/odoo limit_time_real = 480 diff --git a/enterprise b/enterprise index 6e6ef3fb..7cdc7b02 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 6e6ef3fba03b0a8d395ce20770264710a6ba6ac2 +Subproject commit 7cdc7b02a1fe7ca2bb264bfd3f01727ca6168e85 diff --git a/oca/project b/oca/project index d62b9052..d1fb961f 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit d62b905255061c9b5f447e05c8b20ddcd7797b54 +Subproject commit d1fb961f7b49871adc996730ff066db3124e1af2 From 38ed2fd535f0cc332826087eca7555ec74c78d63 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 26 Jun 2023 19:06:03 +0200 Subject: [PATCH 006/147] update snippets --- ....portal_invoice_page.convert_html_note.xml | 17 +++ ...ort_invoice_document.convert_html_note.xml | 16 +++ ...w_move_form.x_has_downpayment_warn_msg.xml | 11 ++ ....account_analytic_line.x_sale_order_id.xml | 1 - ...analytic_line.x_timesheet_invoice_type.xml | 1 - ...count_bank_statement.x_cashbox_end_ids.xml | 1 - ...unt_bank_statement.x_cashbox_start_ids.xml | 1 - .../ir_model.account_move.x_account_codes.xml | 1 - .../ir_model.account_move.x_date_done.xml | 1 - ...r_model.account_move.x_duplicate_found.xml | 1 - ...r_model.account_move.x_has_downpayment.xml | 22 ++++ ...el.account_move.x_hr_expense_sheet_ids.xml | 1 - .../ir_model.account_move.x_picking_list.xml | 1 - ...odel.account_move.x_recurring_inverval.xml | 1 - ...odel.account_move.x_studio_description.xml | 1 - ...odel.account_move_line.x_sale_order_id.xml | 1 - ..._model.agreement_agreement.x_group_ids.xml | 1 - ...r_model.agreement_agreement.x_user_ids.xml | 1 - ....business_requirement.x_estimated_cost.xml | 1 - ...l.business_requirement.x_planned_hours.xml | 1 - ...odel.business_requirement.x_project_id.xml | 1 - ...r_model.business_requirement.x_task_id.xml | 1 - snippets/ir_model.crm_lead.x_date_start.xml | 1 - snippets/ir_model.crm_lead.x_date_stop.xml | 1 - snippets/ir_model.crm_lead.x_mobile.xml | 1 - snippets/ir_model.crm_lead.x_task_id.xml | 1 - ..._model.helpdesk_ticket.x_date_deadline.xml | 1 - snippets/ir_model.hr_applicant.x_gdpr.xml | 1 - snippets/ir_model.hr_contract.x_struct_id.xml | 1 - snippets/ir_model.hr_expense.x_partner_id.xml | 1 - .../ir_model.hr_leave.x_number_of_hours.xml | 1 - ...r_model.hr_leave.x_requires_allocation.xml | 1 - .../ir_model.hr_payslip_line.x_code_name.xml | 1 - snippets/ir_model.md | 103 ------------------ snippets/ir_model.mrp_bom.x_note.xml | 1 - .../ir_model.mrp_bom.x_type_description.xml | 1 - ...r_model.mrp_production.x_date_deadline.xml | 1 - snippets/ir_model.mrp_production.x_note.xml | 1 - ...del.mrp_production.x_quality_check_ids.xml | 1 - ...odel.mrp_workorder.x_reservation_state.xml | 1 - ...model.mrp_workorder.x_type_description.xml | 1 - ...odel.mrp_workorder.x_type_description2.xml | 1 - ...ct_category.x_relevant_for_certificate.xml | 1 - ..._model.product_packaging.x_description.xml | 1 - ...el.product_packaging.x_qty_description.xml | 1 - .../ir_model.product_set_line.x_categ_id.xml | 1 - .../ir_model.product_template.x_calibre.xml | 1 - ...del.product_template.x_expiration_days.xml | 1 - ...el.product_template.x_hide_on_delivery.xml | 1 - ...del.product_template.x_hide_on_invoice.xml | 1 - ....product_template.x_hide_on_sale_order.xml | 1 - ...model.product_template.x_product_label.xml | 1 - ...product_template.x_storage_temperature.xml | 1 - .../ir_model.product_template.x_warranty.xml | 1 - .../ir_model.product_template.x_xml_id.xml | 1 - ...project_task.x_business_requirement_id.xml | 1 - snippets/ir_model.project_task.x_lead_id.xml | 1 - .../ir_model.project_task.x_not_billable.xml | 1 - .../ir_model.project_task.x_systemname.xml | 1 - .../ir_model.project_task.x_user_text.xml | 1 - .../ir_model.project_task.x_vehicle_id.xml | 1 - .../ir_model.purchase_order.x_comment.xml | 1 - ...del.purchase_order_line.x_date_approve.xml | 1 - ...del.purchase_order_line.x_drawing_file.xml | 1 - .../ir_model.purchase_order_line.x_origin.xml | 1 - ...odel.purchase_order_line.x_partner_ref.xml | 1 - .../ir_model.purchase_order_line.x_state.xml | 1 - ...ir_model.purchase_order_line.x_user_id.xml | 1 - snippets/ir_model.quality_check.x_active.xml | 1 - snippets/ir_model.res_partner.x_birthdate.xml | 1 - .../ir_model.res_partner.x_created_on.xml | 1 - .../ir_model.res_partner.x_external_ref.xml | 1 - .../ir_model.res_partner.x_packaging_ref.xml | 1 - .../ir_model.res_partner.x_stock_move_ids.xml | 1 - ...t_order_line.x_product_uom_category_id.xml | 1 - ..._model.sale_order.x_client_project_ref.xml | 1 - ...el.sale_order.x_incoterm_blanket_order.xml | 1 - .../ir_model.sale_order.x_product_uom_qty.xml | 1 - ..._model.sale_order.x_studio_description.xml | 1 - ...del.sale_order_line.x_client_order_ref.xml | 1 - ...odel.sale_order_line.x_commitment_date.xml | 1 - .../ir_model.sale_order_line.x_date_order.xml | 1 - ...r_model.sale_order_line.x_drawing_file.xml | 1 - ...ir_model.sale_order_line.x_industry_id.xml | 1 - ...model.sale_order_line.x_margin_percent.xml | 1 - ...r_model.sale_order_line.x_pricelist_id.xml | 1 - ...model.sale_order_line.x_service_policy.xml | 1 - ...del.sale_order_line.x_service_tracking.xml | 1 - snippets/ir_model.sale_order_line.x_state.xml | 1 - ...r_model.sale_order_line.x_taxed_amount.xml | 1 - ...ale_order_line.x_taxed_amount_invoiced.xml | 1 - ...model.sale_order_line.x_untaxed_amount.xml | 1 - ...del.sale_order_line.x_weight_delivered.xml | 1 - ...odel.stock_location.x_should_be_valued.xml | 1 - .../ir_model.stock_move.x_count_boxes.xml | 1 - .../ir_model.stock_move.x_count_packaging.xml | 1 - .../ir_model.stock_move.x_operation_qty.xml | 1 - ...ir_model.stock_move.x_packaging_uom_id.xml | 1 - ..._model.stock_move.x_picking_partner_id.xml | 1 - ...r_model.stock_move.x_print_parent_only.xml | 1 - ...odel.stock_move.x_print_without_parent.xml | 1 - snippets/ir_model.stock_move.x_scrap_id.xml | 1 - .../ir_model.stock_picking.x_autocomplete.xml | 1 - ...l.stock_production_lot.x_production_id.xml | 1 - ....stock_production_lot.x_production_ids.xml | 1 - ...odel.stock_production_lot.x_weight_uom.xml | 1 - ...stock_quant.x_last_delivery_partner_id.xml | 1 - ...ck_valuation_layer.x_quant_location_id.xml | 1 - snippets/mail.activity.x_reference.xml | 1 - snippets/mail.md | 1 - ..._saleorder_document.add_signature_note.xml | 2 +- 111 files changed, 67 insertions(+), 209 deletions(-) create mode 100644 snippets/account.portal_invoice_page.convert_html_note.xml create mode 100644 snippets/account.report_invoice_document.convert_html_note.xml create mode 100644 snippets/account.view_move_form.x_has_downpayment_warn_msg.xml create mode 100644 snippets/ir_model.account_move.x_has_downpayment.xml diff --git a/snippets/account.portal_invoice_page.convert_html_note.xml b/snippets/account.portal_invoice_page.convert_html_note.xml new file mode 100644 index 00000000..74292388 --- /dev/null +++ b/snippets/account.portal_invoice_page.convert_html_note.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/snippets/account.report_invoice_document.convert_html_note.xml b/snippets/account.report_invoice_document.convert_html_note.xml new file mode 100644 index 00000000..7db2c6d0 --- /dev/null +++ b/snippets/account.report_invoice_document.convert_html_note.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml b/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml new file mode 100644 index 00000000..4df9d20b --- /dev/null +++ b/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml @@ -0,0 +1,11 @@ + + + +
      + + +
      + +       \ No newline at end of file diff --git a/snippets/ir_model.account_analytic_line.x_sale_order_id.xml b/snippets/ir_model.account_analytic_line.x_sale_order_id.xml index 35a6d865..b6b9a4c0 100644 --- a/snippets/ir_model.account_analytic_line.x_sale_order_id.xml +++ b/snippets/ir_model.account_analytic_line.x_sale_order_id.xml @@ -2,7 +2,6 @@ - [] Verkaufsauftrag account.move.line diff --git a/snippets/ir_model.account_analytic_line.x_timesheet_invoice_type.xml b/snippets/ir_model.account_analytic_line.x_timesheet_invoice_type.xml index a83bf530..e88c532f 100644 --- a/snippets/ir_model.account_analytic_line.x_timesheet_invoice_type.xml +++ b/snippets/ir_model.account_analytic_line.x_timesheet_invoice_type.xml @@ -2,7 +2,6 @@ - [] Abrechenbarer Typ account.move.line diff --git a/snippets/ir_model.account_bank_statement.x_cashbox_end_ids.xml b/snippets/ir_model.account_bank_statement.x_cashbox_end_ids.xml index 5fc2d472..9d02088e 100644 --- a/snippets/ir_model.account_bank_statement.x_cashbox_end_ids.xml +++ b/snippets/ir_model.account_bank_statement.x_cashbox_end_ids.xml @@ -2,7 +2,6 @@ - [] Kassenprüfung Endpositionen account.bank.statement diff --git a/snippets/ir_model.account_bank_statement.x_cashbox_start_ids.xml b/snippets/ir_model.account_bank_statement.x_cashbox_start_ids.xml index 4b0569d5..7d1d35a8 100644 --- a/snippets/ir_model.account_bank_statement.x_cashbox_start_ids.xml +++ b/snippets/ir_model.account_bank_statement.x_cashbox_start_ids.xml @@ -2,7 +2,6 @@ - [] Kassenprüfung Startpositionen account.bank.statement diff --git a/snippets/ir_model.account_move.x_account_codes.xml b/snippets/ir_model.account_move.x_account_codes.xml index 7d3e02a5..2a1b095c 100644 --- a/snippets/ir_model.account_move.x_account_codes.xml +++ b/snippets/ir_model.account_move.x_account_codes.xml @@ -2,7 +2,6 @@ - [] Kontos account.move diff --git a/snippets/ir_model.account_move.x_date_done.xml b/snippets/ir_model.account_move.x_date_done.xml index 72502896..5bf916a6 100644 --- a/snippets/ir_model.account_move.x_date_done.xml +++ b/snippets/ir_model.account_move.x_date_done.xml @@ -2,7 +2,6 @@ - [] date_done account.move diff --git a/snippets/ir_model.account_move.x_duplicate_found.xml b/snippets/ir_model.account_move.x_duplicate_found.xml index 5b0c2b3e..a3c690c6 100644 --- a/snippets/ir_model.account_move.x_duplicate_found.xml +++ b/snippets/ir_model.account_move.x_duplicate_found.xml @@ -2,7 +2,6 @@ - [] Duplikat Gefunden account.move diff --git a/snippets/ir_model.account_move.x_has_downpayment.xml b/snippets/ir_model.account_move.x_has_downpayment.xml new file mode 100644 index 00000000..4b655dc9 --- /dev/null +++ b/snippets/ir_model.account_move.x_has_downpayment.xml @@ -0,0 +1,22 @@ + + + + + Hat Anzahlung + account.move + + x_has_downpayment + + + + text + for rec in self: + so_lines_with_downpayment = rec.invoice_line_ids.sale_line_ids.filterd(lambda l: l.is_downpayment) + if so_lines_with_downpayment: + rec['x_has_downpayment'] = true + else: + rec['x_has_downpayment'] = false + + + + diff --git a/snippets/ir_model.account_move.x_hr_expense_sheet_ids.xml b/snippets/ir_model.account_move.x_hr_expense_sheet_ids.xml index 499f9796..b0159470 100644 --- a/snippets/ir_model.account_move.x_hr_expense_sheet_ids.xml +++ b/snippets/ir_model.account_move.x_hr_expense_sheet_ids.xml @@ -2,7 +2,6 @@ - [] Auslagen Abrechnungen account.move diff --git a/snippets/ir_model.account_move.x_picking_list.xml b/snippets/ir_model.account_move.x_picking_list.xml index 0106ae7a..377a6999 100644 --- a/snippets/ir_model.account_move.x_picking_list.xml +++ b/snippets/ir_model.account_move.x_picking_list.xml @@ -2,7 +2,6 @@ - [] Picking List account.move diff --git a/snippets/ir_model.account_move.x_recurring_inverval.xml b/snippets/ir_model.account_move.x_recurring_inverval.xml index 8fb48f7b..f274bcfa 100644 --- a/snippets/ir_model.account_move.x_recurring_inverval.xml +++ b/snippets/ir_model.account_move.x_recurring_inverval.xml @@ -2,7 +2,6 @@ - [] Abrechnungsintervall account.move diff --git a/snippets/ir_model.account_move.x_studio_description.xml b/snippets/ir_model.account_move.x_studio_description.xml index aae77d9a..190f3332 100644 --- a/snippets/ir_model.account_move.x_studio_description.xml +++ b/snippets/ir_model.account_move.x_studio_description.xml @@ -2,7 +2,6 @@ - [] Beschreibung Rechnung account.move diff --git a/snippets/ir_model.account_move_line.x_sale_order_id.xml b/snippets/ir_model.account_move_line.x_sale_order_id.xml index 298d5380..fa02fe01 100644 --- a/snippets/ir_model.account_move_line.x_sale_order_id.xml +++ b/snippets/ir_model.account_move_line.x_sale_order_id.xml @@ -2,7 +2,6 @@ - [] Verkaufsauftrag account.move.line diff --git a/snippets/ir_model.agreement_agreement.x_group_ids.xml b/snippets/ir_model.agreement_agreement.x_group_ids.xml index 03b1266c..db2a64d7 100644 --- a/snippets/ir_model.agreement_agreement.x_group_ids.xml +++ b/snippets/ir_model.agreement_agreement.x_group_ids.xml @@ -2,7 +2,6 @@ - [] Gruppen agreement.agreement diff --git a/snippets/ir_model.agreement_agreement.x_user_ids.xml b/snippets/ir_model.agreement_agreement.x_user_ids.xml index b08a197d..a54cc2d4 100644 --- a/snippets/ir_model.agreement_agreement.x_user_ids.xml +++ b/snippets/ir_model.agreement_agreement.x_user_ids.xml @@ -2,7 +2,6 @@ - [] Benutzer agreement.agreement diff --git a/snippets/ir_model.business_requirement.x_estimated_cost.xml b/snippets/ir_model.business_requirement.x_estimated_cost.xml index 5a7800f8..95480465 100644 --- a/snippets/ir_model.business_requirement.x_estimated_cost.xml +++ b/snippets/ir_model.business_requirement.x_estimated_cost.xml @@ -2,7 +2,6 @@ - [] Estimated Cost business.requirement diff --git a/snippets/ir_model.business_requirement.x_planned_hours.xml b/snippets/ir_model.business_requirement.x_planned_hours.xml index adef2b76..62de4ded 100644 --- a/snippets/ir_model.business_requirement.x_planned_hours.xml +++ b/snippets/ir_model.business_requirement.x_planned_hours.xml @@ -2,7 +2,6 @@ - [] Planned Hours business.requirement diff --git a/snippets/ir_model.business_requirement.x_project_id.xml b/snippets/ir_model.business_requirement.x_project_id.xml index f22d2dda..87b9e030 100644 --- a/snippets/ir_model.business_requirement.x_project_id.xml +++ b/snippets/ir_model.business_requirement.x_project_id.xml @@ -2,7 +2,6 @@ - [] Project business.requirement diff --git a/snippets/ir_model.business_requirement.x_task_id.xml b/snippets/ir_model.business_requirement.x_task_id.xml index c937dd9d..4e95e743 100644 --- a/snippets/ir_model.business_requirement.x_task_id.xml +++ b/snippets/ir_model.business_requirement.x_task_id.xml @@ -2,7 +2,6 @@ - [] Task business.requirement diff --git a/snippets/ir_model.crm_lead.x_date_start.xml b/snippets/ir_model.crm_lead.x_date_start.xml index 76ef4bb5..1833fa0e 100644 --- a/snippets/ir_model.crm_lead.x_date_start.xml +++ b/snippets/ir_model.crm_lead.x_date_start.xml @@ -2,7 +2,6 @@ - [] Date Start crm.lead diff --git a/snippets/ir_model.crm_lead.x_date_stop.xml b/snippets/ir_model.crm_lead.x_date_stop.xml index 953867ce..d5de5201 100644 --- a/snippets/ir_model.crm_lead.x_date_stop.xml +++ b/snippets/ir_model.crm_lead.x_date_stop.xml @@ -2,7 +2,6 @@ - [] Date Stop crm.lead diff --git a/snippets/ir_model.crm_lead.x_mobile.xml b/snippets/ir_model.crm_lead.x_mobile.xml index f395ba57..5f45889c 100644 --- a/snippets/ir_model.crm_lead.x_mobile.xml +++ b/snippets/ir_model.crm_lead.x_mobile.xml @@ -2,7 +2,6 @@ - [] Mobile crm.lead diff --git a/snippets/ir_model.crm_lead.x_task_id.xml b/snippets/ir_model.crm_lead.x_task_id.xml index d5521d69..a6825cc0 100644 --- a/snippets/ir_model.crm_lead.x_task_id.xml +++ b/snippets/ir_model.crm_lead.x_task_id.xml @@ -2,7 +2,6 @@ - [] Aufgabe business.requirement diff --git a/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml b/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml index d9c41df2..cf0acf58 100644 --- a/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml +++ b/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml @@ -2,7 +2,6 @@ - [] Frist helpdesk.ticket diff --git a/snippets/ir_model.hr_applicant.x_gdpr.xml b/snippets/ir_model.hr_applicant.x_gdpr.xml index 03532606..850ae2cd 100644 --- a/snippets/ir_model.hr_applicant.x_gdpr.xml +++ b/snippets/ir_model.hr_applicant.x_gdpr.xml @@ -2,7 +2,6 @@ - [] Datenschutz hr.applicant diff --git a/snippets/ir_model.hr_contract.x_struct_id.xml b/snippets/ir_model.hr_contract.x_struct_id.xml index 1b82381a..91528d0d 100644 --- a/snippets/ir_model.hr_contract.x_struct_id.xml +++ b/snippets/ir_model.hr_contract.x_struct_id.xml @@ -2,7 +2,6 @@ - [] Lohnstruktur hr.applicant diff --git a/snippets/ir_model.hr_expense.x_partner_id.xml b/snippets/ir_model.hr_expense.x_partner_id.xml index fcc8ec61..db6b74df 100644 --- a/snippets/ir_model.hr_expense.x_partner_id.xml +++ b/snippets/ir_model.hr_expense.x_partner_id.xml @@ -2,7 +2,6 @@ - [] Kunde hr.expense diff --git a/snippets/ir_model.hr_leave.x_number_of_hours.xml b/snippets/ir_model.hr_leave.x_number_of_hours.xml index 88655fca..f7b112ea 100644 --- a/snippets/ir_model.hr_leave.x_number_of_hours.xml +++ b/snippets/ir_model.hr_leave.x_number_of_hours.xml @@ -2,7 +2,6 @@ - [] Dauer (Stunden) hr.leave diff --git a/snippets/ir_model.hr_leave.x_requires_allocation.xml b/snippets/ir_model.hr_leave.x_requires_allocation.xml index 2b6e4cc5..a4f951e0 100644 --- a/snippets/ir_model.hr_leave.x_requires_allocation.xml +++ b/snippets/ir_model.hr_leave.x_requires_allocation.xml @@ -2,7 +2,6 @@ - [] Erfordert Zuweisung hr.leave diff --git a/snippets/ir_model.hr_payslip_line.x_code_name.xml b/snippets/ir_model.hr_payslip_line.x_code_name.xml index c305206b..03edb7d0 100644 --- a/snippets/ir_model.hr_payslip_line.x_code_name.xml +++ b/snippets/ir_model.hr_payslip_line.x_code_name.xml @@ -2,7 +2,6 @@ - [] Code mit Name hr.payslip.line diff --git a/snippets/ir_model.md b/snippets/ir_model.md index f3fcff68..3c0f88ce 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -7,7 +7,6 @@ ID: `mint_system.ir_model.account_analytic_line.x_sale_order_id` - [] Verkaufsauftrag account.move.line @@ -33,7 +32,6 @@ ID: `mint_system.ir_model.account_analytic_line.x_timesheet_invoice_type` - [] Abrechenbarer Typ account.move.line @@ -61,7 +59,6 @@ ID: `mint_system.ir_model.account_bank_statement.x_cashbox_end_ids` - [] Kassenprüfung Endpositionen account.bank.statement @@ -87,7 +84,6 @@ ID: `mint_system.ir_model.account_bank_statement.x_cashbox_start_ids` - [] Kassenprüfung Startpositionen account.bank.statement @@ -114,7 +110,6 @@ ID: `mint_system.ir_model.account_move_line.x_sale_order_id` - [] Verkaufsauftrag account.move.line @@ -143,7 +138,6 @@ ID: `mint_system.ir_model.account_move.x_account_codes` - [] Kontos account.move @@ -172,7 +166,6 @@ ID: `mint_system.ir_model.account_move.x_date_done` - [] date_done account.move @@ -196,7 +189,6 @@ ID: `mint_system.ir_model.account_move.x_duplicate_found` - [] Duplikat Gefunden account.move @@ -233,7 +225,6 @@ ID: `mint_system.ir_model.account_move.x_hr_expense_sheet_ids` - [] Auslagen Abrechnungen account.move @@ -281,7 +272,6 @@ ID: `mint_system.ir_model.account_move.x_picking_list` - [] Picking List account.move @@ -311,7 +301,6 @@ ID: `mint_system.ir_model.account_move.x_recurring_inverval` - [] Abrechnungsintervall account.move @@ -340,7 +329,6 @@ ID: `mint_system.ir_model.account_move.x_studio_description` - [] Beschreibung Rechnung account.move @@ -363,7 +351,6 @@ ID: `mint_system.ir_model.agreement_agreement.x_group_ids` - [] Gruppen agreement.agreement @@ -387,7 +374,6 @@ ID: `mint_system.ir_model.agreement_agreement.x_user_ids` - [] Benutzer agreement.agreement @@ -412,7 +398,6 @@ ID: `mint_system.ir_model.business_requirement.x_estimated_cost` - [] Estimated Cost business.requirement @@ -435,7 +420,6 @@ ID: `mint_system.ir_model.business_requirement.x_planned_hours` - [] Planned Hours business.requirement @@ -458,7 +442,6 @@ ID: `mint_system.ir_model.business_requirement.x_project_id` - [] Project business.requirement @@ -482,7 +465,6 @@ ID: `mint_system.ir_model.business_requirement.x_task_id` - [] Task business.requirement @@ -511,7 +493,6 @@ ID: `mint_system.ir_model.crm_lead.x_date_start` - [] Date Start crm.lead @@ -534,7 +515,6 @@ ID: `mint_system.ir_model.crm_lead.x_date_stop` - [] Date Stop crm.lead @@ -561,7 +541,6 @@ ID: `mint_system.ir_model.crm_lead.x_mobile` - [] Mobile crm.lead @@ -586,7 +565,6 @@ ID: `mint_system.ir_model.crm_lead.x_task_id` - [] Aufgabe business.requirement @@ -611,7 +589,6 @@ ID: `mint_system.ir_model.helpdesk_ticket.x_date_deadline` - [] Frist helpdesk.ticket @@ -635,7 +612,6 @@ ID: `mint_system.ir_model.hr_applicant.x_gdpr` - [] Datenschutz hr.applicant @@ -660,7 +636,6 @@ ID: `mint_system.ir_model.hr_contract.x_struct_id` - [] Lohnstruktur hr.applicant @@ -685,7 +660,6 @@ ID: `mint_system.ir_model.hr_expense.x_partner_id` - [] Kunde hr.expense @@ -709,7 +683,6 @@ ID: `mint_system.ir_model.hr_leave.x_number_of_hours` - [] Dauer (Stunden) hr.leave @@ -735,7 +708,6 @@ ID: `mint_system.ir_model.hr_leave.x_requires_allocation` - [] Erfordert Zuweisung hr.leave @@ -760,7 +732,6 @@ ID: `mint_system.ir_model.hr_payslip_line.x_code_name` - [] Code mit Name hr.payslip.line @@ -787,7 +758,6 @@ ID: `mint_system.ir_model.mrp_bom.x_note` - [] Notiz mrp.bom @@ -810,7 +780,6 @@ ID: `mint_system.ir_model.mrp_bom.x_type_description` - [] Typenbezeichnung mrp.bom @@ -836,7 +805,6 @@ ID: `mint_system.ir_model.mrp_production.x_date_deadline` - [] Frist mrp.production @@ -859,7 +827,6 @@ ID: `mint_system.ir_model.mrp_production.x_note` - [] Notiz mrp.production @@ -887,7 +854,6 @@ ID: `mint_system.ir_model.mrp_production.x_quality_check_ids` - [] Qualitätsprüfungen mrp.production @@ -913,7 +879,6 @@ ID: `mint_system.ir_model.mrp_workorder.x_reservation_state` - [] Materialverfügbarkeit mrp.workorder @@ -937,7 +902,6 @@ ID: `mint_system.ir_model.mrp_workorder.x_type_description2` - [] Typenbezeichnung 2 mrp.workorder @@ -960,7 +924,6 @@ ID: `mint_system.ir_model.mrp_workorder.x_type_description` - [] Typenbezeichnung mrp.workorder @@ -984,7 +947,6 @@ ID: `mint_system.ir_model.product_category.x_relevant_for_certificate` - [] Für Werkszeugnis relevant product.category @@ -1008,7 +970,6 @@ ID: `mint_system.ir_model.product_packaging.x_description` - [] Beschreibung product.packaging @@ -1031,7 +992,6 @@ ID: `mint_system.ir_model.product_packaging.x_qty_description` - [] Label Gewicht product.packaging @@ -1055,7 +1015,6 @@ ID: `mint_system.ir_model.product_set_line.x_categ_id` - [] Produktkategorie product.set.line @@ -1081,7 +1040,6 @@ ID: `mint_system.ir_model.product_template.x_calibre` - [] Kaliber product.template @@ -1104,7 +1062,6 @@ ID: `mint_system.ir_model.product_template.x_expiration_days` - [] Haltbarkeit in Tagen product.template @@ -1127,7 +1084,6 @@ ID: `mint_system.ir_model.product_template.x_hide_on_delivery` - [] Auf Lieferschein ausblenden product.template @@ -1150,7 +1106,6 @@ ID: `mint_system.ir_model.product_template.x_hide_on_invoice` - [] Auf Rechnung ausblenden product.template @@ -1173,7 +1128,6 @@ ID: `mint_system.ir_model.product_template.x_hide_on_sale_order` - [] Auf Verkaufsangebot ausblenden product.template @@ -1208,7 +1162,6 @@ ID: `mint_system.ir_model.product_template.x_product_label` ir.actions.report Set NULL - [] @@ -1223,7 +1176,6 @@ ID: `mint_system.ir_model.product_template.x_storage_temperature` - [] Aufbewahrung bei product.template @@ -1246,7 +1198,6 @@ ID: `mint_system.ir_model.product_template.x_warranty` - [] Garantie product.template @@ -1269,7 +1220,6 @@ ID: `mint_system.ir_model.product_template.x_xml_id` - [] External ID product.template @@ -1297,7 +1247,6 @@ ID: `mint_system.ir_model.project_task.x_business_requirement_id` - [] Business Requirement project.task @@ -1324,7 +1273,6 @@ ID: `mint_system.ir_model.project_task.x_lead_id` - [] Lead project.task @@ -1350,7 +1298,6 @@ ID: `mint_system.ir_model.project_task.x_not_billable` - [] Nicht Verrechenbar project.task @@ -1372,7 +1319,6 @@ ID: `mint_system.ir_model.project_task.x_systemname` - [] Benutzer project.task @@ -1395,7 +1341,6 @@ ID: `mint_system.ir_model.project_task.x_user_text` - [] Benutzer project.task @@ -1418,7 +1363,6 @@ ID: `mint_system.ir_model.project_task.x_vehicle_id` - [] Fahrzeug project.task @@ -1442,7 +1386,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_date_approve` - [] Bestätigung am purchase.order.line @@ -1466,7 +1409,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_drawing_file` - [] Zeichnung purchase.order.line @@ -1489,7 +1431,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_origin` - [] Referenzbeleg purchase.order.line @@ -1513,7 +1454,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_partner_ref` - [] Lieferantenreferenz purchase.order.line @@ -1537,7 +1477,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_state` - [] Status Bestellposition purchase.order.line @@ -1561,7 +1500,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_user_id` - [] Einkaufsbeauftragter purchase.order.line @@ -1587,7 +1525,6 @@ ID: `mint_system.ir_model.purchase_order.x_comment` - [] Kommentar purchase.order @@ -1611,7 +1548,6 @@ ID: `mint_system.ir_model.quality_check.x_active` - [] Aktiv quality.check @@ -1641,7 +1577,6 @@ ID: `mint_system.ir_model.res_partner.x_birthdate` - [] Geburtstag res.partner @@ -1664,7 +1599,6 @@ ID: `mint_system.ir_model.res_partner.x_created_on` - [] Erstellt am res.partner @@ -1687,7 +1621,6 @@ ID: `mint_system.ir_model.res_partner.x_external_ref` - [] Externe Referenz res.partner @@ -1710,7 +1643,6 @@ ID: `mint_system.ir_model.res_partner.x_packaging_ref` - [] Verpackungsreferenz res.partner @@ -1733,7 +1665,6 @@ ID: `mint_system.ir_model.res_partner.x_stock_move_ids` - [] Lagerbuchungen res.partner @@ -1759,7 +1690,6 @@ ID: `mint_system.ir_model.sale_blanket_order_line.x_product_uom_category_id` - [] Kategorie sale.blanket.order.line @@ -1785,7 +1715,6 @@ ID: `mint_system.ir_model.sale_order_line.x_client_order_ref` - [] Kundenreferenz sale.order.line @@ -1809,7 +1738,6 @@ ID: `mint_system.ir_model.sale_order_line.x_commitment_date` - [] Lieferdatum sale.order.line @@ -1833,7 +1761,6 @@ ID: `mint_system.ir_model.sale_order_line.x_date_order` - [] Auftragsdatum sale.order.line @@ -1857,7 +1784,6 @@ ID: `mint_system.ir_model.sale_order_line.x_drawing_file` - [] Zeichnung sale.order.line @@ -1881,7 +1807,6 @@ ID: `mint_system.ir_model.sale_order_line.x_industry_id` - [] Branche sale.order.line @@ -1905,7 +1830,6 @@ ID: `mint_system.ir_model.sale_order_line.x_margin_percent` - [] Marge (%) Marge Aufschlagsrechnung sale.order.line @@ -1936,7 +1860,6 @@ ID: `mint_system.ir_model.sale_order_line.x_pricelist_id` - [] Preisliste sale.order.line @@ -1960,7 +1883,6 @@ ID: `mint_system.ir_model.sale_order_line.x_service_policy` - [] Faktierungsregel sale.order.line @@ -1984,7 +1906,6 @@ ID: `mint_system.ir_model.sale_order_line.x_service_tracking` - [] Dienstverfolgung sale.order.line @@ -2008,7 +1929,6 @@ ID: `mint_system.ir_model.sale_order_line.x_state` - [] Status Auftragsposition sale.order.line @@ -2032,7 +1952,6 @@ ID: `mint_system.ir_model.sale_order_line.x_taxed_amount_invoiced` - [] Rechnungsbetrag inkl. MWST sale.order.line @@ -2058,7 +1977,6 @@ ID: `mint_system.ir_model.sale_order_line.x_taxed_amount` - [] Total inkl. MWST sale.order.line @@ -2084,7 +2002,6 @@ ID: `mint_system.ir_model.sale_order_line.x_untaxed_amount` - [] Total exkl. MWST sale.order.line @@ -2110,7 +2027,6 @@ ID: `mint_system.ir_model.sale_order_line.x_weight_delivered` - [] Geliefertes Gewicht sale.order.line @@ -2136,7 +2052,6 @@ ID: `mint_system.ir_model.sale_order.x_client_project_ref` - [] Projektnummer Kunde sale.order @@ -2159,7 +2074,6 @@ ID: `mint_system.ir_model.sale_order.x_incoterm_blanket_order` - [] Incoterm Rahmenauftrag sale.order @@ -2184,7 +2098,6 @@ ID: `mint_system.ir_model.sale_order.x_product_uom_qty` - [] Gesamtmenge sale.order @@ -2211,7 +2124,6 @@ ID: `mint_system.ir_model.sale_order.x_studio_description` - [] Beschreibung Verkausauftrag sale.order @@ -2234,7 +2146,6 @@ ID: `mint_system.ir_model.stock_location.x_should_be_valued` - [] Should be valued stock.location @@ -2261,7 +2172,6 @@ ID: `mint_system.ir_model.stock_move.x_count_boxes` - [] Anzahl Kisten stock.move @@ -2331,7 +2241,6 @@ ID: `mint_system.ir_model.stock_move.x_count_packaging` - [] Anzahl Verpackungen stock.move @@ -2364,7 +2273,6 @@ ID: `mint_system.ir_model.stock_move.x_operation_qty` - [] Inventory +/- stock.move @@ -2394,7 +2302,6 @@ ID: `mint_system.ir_model.stock_move.x_packaging_uom_id` - [] Mengeneinheit product.packaging @@ -2418,7 +2325,6 @@ ID: `mint_system.ir_model.stock_move.x_picking_partner_id` - [] Lieferadresse stock.move @@ -2443,7 +2349,6 @@ ID: `mint_system.ir_model.stock_move.x_print_parent_only` - [] Nur übergeordnete Verpackung drucken product.packaging @@ -2466,7 +2371,6 @@ ID: `mint_system.ir_model.stock_move.x_print_without_parent` - [] Ohne übergeordnete Verpackung drucken product.packaging @@ -2489,7 +2393,6 @@ ID: `mint_system.ir_model.stock_move.x_scrap_id` - [] Buchung Lagerschwund product.packaging @@ -2522,7 +2425,6 @@ ID: `mint_system.ir_model.stock_picking.x_autocomplete` - [] Automatisch Erledigen stock.picking @@ -2566,7 +2468,6 @@ ID: `mint_system.ir_model.stock_production_lot.x_production_ids` - [] Fertigungsaufträge stock.production.lot @@ -2590,7 +2491,6 @@ ID: `mint_system.ir_model.stock_production_lot.x_production_id` - [] Fertigungsauftrag stock.production.lot @@ -2619,7 +2519,6 @@ ID: `mint_system.ir_model.stock_production_lot.x_weight_uom` - [] Nettogewicht [kg] stock.production.lot @@ -2646,7 +2545,6 @@ ID: `mint_system.ir_model.stock_quant.x_last_delivery_partner_id` - [] Lieferadresse stock.quant @@ -2671,7 +2569,6 @@ ID: `mint_system.ir_model.stock_valuation_layer.x_quant_location_id` - [] Lagerort Bestand stock.valuation.layer diff --git a/snippets/ir_model.mrp_bom.x_note.xml b/snippets/ir_model.mrp_bom.x_note.xml index b8ab3b21..bd4fccc4 100644 --- a/snippets/ir_model.mrp_bom.x_note.xml +++ b/snippets/ir_model.mrp_bom.x_note.xml @@ -2,7 +2,6 @@ - [] Notiz mrp.bom diff --git a/snippets/ir_model.mrp_bom.x_type_description.xml b/snippets/ir_model.mrp_bom.x_type_description.xml index 75e5ebb2..41288683 100644 --- a/snippets/ir_model.mrp_bom.x_type_description.xml +++ b/snippets/ir_model.mrp_bom.x_type_description.xml @@ -2,7 +2,6 @@ - [] Typenbezeichnung mrp.bom diff --git a/snippets/ir_model.mrp_production.x_date_deadline.xml b/snippets/ir_model.mrp_production.x_date_deadline.xml index 06590c1e..70ec5e7a 100644 --- a/snippets/ir_model.mrp_production.x_date_deadline.xml +++ b/snippets/ir_model.mrp_production.x_date_deadline.xml @@ -2,7 +2,6 @@ - [] Frist mrp.production diff --git a/snippets/ir_model.mrp_production.x_note.xml b/snippets/ir_model.mrp_production.x_note.xml index fff258b5..8d474edd 100644 --- a/snippets/ir_model.mrp_production.x_note.xml +++ b/snippets/ir_model.mrp_production.x_note.xml @@ -2,7 +2,6 @@ - [] Notiz mrp.production diff --git a/snippets/ir_model.mrp_production.x_quality_check_ids.xml b/snippets/ir_model.mrp_production.x_quality_check_ids.xml index aa04bea0..4c67ca43 100644 --- a/snippets/ir_model.mrp_production.x_quality_check_ids.xml +++ b/snippets/ir_model.mrp_production.x_quality_check_ids.xml @@ -2,7 +2,6 @@ - [] Qualitätsprüfungen mrp.production diff --git a/snippets/ir_model.mrp_workorder.x_reservation_state.xml b/snippets/ir_model.mrp_workorder.x_reservation_state.xml index 1b765a04..f051c1d0 100644 --- a/snippets/ir_model.mrp_workorder.x_reservation_state.xml +++ b/snippets/ir_model.mrp_workorder.x_reservation_state.xml @@ -2,7 +2,6 @@ - [] Materialverfügbarkeit mrp.workorder diff --git a/snippets/ir_model.mrp_workorder.x_type_description.xml b/snippets/ir_model.mrp_workorder.x_type_description.xml index f76bc8d0..54090f3d 100644 --- a/snippets/ir_model.mrp_workorder.x_type_description.xml +++ b/snippets/ir_model.mrp_workorder.x_type_description.xml @@ -2,7 +2,6 @@ - [] Typenbezeichnung mrp.workorder diff --git a/snippets/ir_model.mrp_workorder.x_type_description2.xml b/snippets/ir_model.mrp_workorder.x_type_description2.xml index a5086f7a..90be555f 100644 --- a/snippets/ir_model.mrp_workorder.x_type_description2.xml +++ b/snippets/ir_model.mrp_workorder.x_type_description2.xml @@ -2,7 +2,6 @@ - [] Typenbezeichnung 2 mrp.workorder diff --git a/snippets/ir_model.product_category.x_relevant_for_certificate.xml b/snippets/ir_model.product_category.x_relevant_for_certificate.xml index b5209c7b..4efdbd6f 100644 --- a/snippets/ir_model.product_category.x_relevant_for_certificate.xml +++ b/snippets/ir_model.product_category.x_relevant_for_certificate.xml @@ -2,7 +2,6 @@ - [] Für Werkszeugnis relevant product.category diff --git a/snippets/ir_model.product_packaging.x_description.xml b/snippets/ir_model.product_packaging.x_description.xml index 3e065e6a..8a2a5dd2 100644 --- a/snippets/ir_model.product_packaging.x_description.xml +++ b/snippets/ir_model.product_packaging.x_description.xml @@ -2,7 +2,6 @@ - [] Beschreibung product.packaging diff --git a/snippets/ir_model.product_packaging.x_qty_description.xml b/snippets/ir_model.product_packaging.x_qty_description.xml index b635073b..25d139bc 100644 --- a/snippets/ir_model.product_packaging.x_qty_description.xml +++ b/snippets/ir_model.product_packaging.x_qty_description.xml @@ -2,7 +2,6 @@ - [] Label Gewicht product.packaging diff --git a/snippets/ir_model.product_set_line.x_categ_id.xml b/snippets/ir_model.product_set_line.x_categ_id.xml index b075a0c5..2678d2f3 100644 --- a/snippets/ir_model.product_set_line.x_categ_id.xml +++ b/snippets/ir_model.product_set_line.x_categ_id.xml @@ -2,7 +2,6 @@ - [] Produktkategorie product.set.line diff --git a/snippets/ir_model.product_template.x_calibre.xml b/snippets/ir_model.product_template.x_calibre.xml index e8671894..87e89ee8 100644 --- a/snippets/ir_model.product_template.x_calibre.xml +++ b/snippets/ir_model.product_template.x_calibre.xml @@ -2,7 +2,6 @@ - [] Kaliber product.template diff --git a/snippets/ir_model.product_template.x_expiration_days.xml b/snippets/ir_model.product_template.x_expiration_days.xml index 54e30cf2..93c45b74 100644 --- a/snippets/ir_model.product_template.x_expiration_days.xml +++ b/snippets/ir_model.product_template.x_expiration_days.xml @@ -2,7 +2,6 @@ - [] Haltbarkeit in Tagen product.template diff --git a/snippets/ir_model.product_template.x_hide_on_delivery.xml b/snippets/ir_model.product_template.x_hide_on_delivery.xml index ef1b77c6..68c9903a 100644 --- a/snippets/ir_model.product_template.x_hide_on_delivery.xml +++ b/snippets/ir_model.product_template.x_hide_on_delivery.xml @@ -2,7 +2,6 @@ - [] Auf Lieferschein ausblenden product.template diff --git a/snippets/ir_model.product_template.x_hide_on_invoice.xml b/snippets/ir_model.product_template.x_hide_on_invoice.xml index 5b8317ca..be36e02e 100644 --- a/snippets/ir_model.product_template.x_hide_on_invoice.xml +++ b/snippets/ir_model.product_template.x_hide_on_invoice.xml @@ -2,7 +2,6 @@ - [] Auf Rechnung ausblenden product.template diff --git a/snippets/ir_model.product_template.x_hide_on_sale_order.xml b/snippets/ir_model.product_template.x_hide_on_sale_order.xml index 37e8f216..2a0f789d 100644 --- a/snippets/ir_model.product_template.x_hide_on_sale_order.xml +++ b/snippets/ir_model.product_template.x_hide_on_sale_order.xml @@ -2,7 +2,6 @@ - [] Auf Verkaufsangebot ausblenden product.template diff --git a/snippets/ir_model.product_template.x_product_label.xml b/snippets/ir_model.product_template.x_product_label.xml index c0aef544..e8c930ae 100644 --- a/snippets/ir_model.product_template.x_product_label.xml +++ b/snippets/ir_model.product_template.x_product_label.xml @@ -14,7 +14,6 @@ ir.actions.report Set NULL - [] diff --git a/snippets/ir_model.product_template.x_storage_temperature.xml b/snippets/ir_model.product_template.x_storage_temperature.xml index 41f451cf..7f9e612d 100644 --- a/snippets/ir_model.product_template.x_storage_temperature.xml +++ b/snippets/ir_model.product_template.x_storage_temperature.xml @@ -2,7 +2,6 @@ - [] Aufbewahrung bei product.template diff --git a/snippets/ir_model.product_template.x_warranty.xml b/snippets/ir_model.product_template.x_warranty.xml index f74ca630..bd8a4e10 100644 --- a/snippets/ir_model.product_template.x_warranty.xml +++ b/snippets/ir_model.product_template.x_warranty.xml @@ -2,7 +2,6 @@ - [] Garantie product.template diff --git a/snippets/ir_model.product_template.x_xml_id.xml b/snippets/ir_model.product_template.x_xml_id.xml index 35c0daea..7c4e5cbd 100644 --- a/snippets/ir_model.product_template.x_xml_id.xml +++ b/snippets/ir_model.product_template.x_xml_id.xml @@ -2,7 +2,6 @@ - [] External ID product.template diff --git a/snippets/ir_model.project_task.x_business_requirement_id.xml b/snippets/ir_model.project_task.x_business_requirement_id.xml index 875b35a2..a3a46e2b 100644 --- a/snippets/ir_model.project_task.x_business_requirement_id.xml +++ b/snippets/ir_model.project_task.x_business_requirement_id.xml @@ -2,7 +2,6 @@ - [] Business Requirement project.task diff --git a/snippets/ir_model.project_task.x_lead_id.xml b/snippets/ir_model.project_task.x_lead_id.xml index f106a2d7..0b18ea19 100644 --- a/snippets/ir_model.project_task.x_lead_id.xml +++ b/snippets/ir_model.project_task.x_lead_id.xml @@ -2,7 +2,6 @@ - [] Lead project.task diff --git a/snippets/ir_model.project_task.x_not_billable.xml b/snippets/ir_model.project_task.x_not_billable.xml index b777a0a8..178bb56f 100644 --- a/snippets/ir_model.project_task.x_not_billable.xml +++ b/snippets/ir_model.project_task.x_not_billable.xml @@ -2,7 +2,6 @@ - [] Nicht Verrechenbar project.task diff --git a/snippets/ir_model.project_task.x_systemname.xml b/snippets/ir_model.project_task.x_systemname.xml index bcd41fb6..97759e90 100644 --- a/snippets/ir_model.project_task.x_systemname.xml +++ b/snippets/ir_model.project_task.x_systemname.xml @@ -2,7 +2,6 @@ - [] Benutzer project.task diff --git a/snippets/ir_model.project_task.x_user_text.xml b/snippets/ir_model.project_task.x_user_text.xml index 718643f3..840ce165 100644 --- a/snippets/ir_model.project_task.x_user_text.xml +++ b/snippets/ir_model.project_task.x_user_text.xml @@ -2,7 +2,6 @@ - [] Benutzer project.task diff --git a/snippets/ir_model.project_task.x_vehicle_id.xml b/snippets/ir_model.project_task.x_vehicle_id.xml index f8c60687..15acc753 100644 --- a/snippets/ir_model.project_task.x_vehicle_id.xml +++ b/snippets/ir_model.project_task.x_vehicle_id.xml @@ -2,7 +2,6 @@ - [] Fahrzeug project.task diff --git a/snippets/ir_model.purchase_order.x_comment.xml b/snippets/ir_model.purchase_order.x_comment.xml index c2990f1b..4f706b22 100644 --- a/snippets/ir_model.purchase_order.x_comment.xml +++ b/snippets/ir_model.purchase_order.x_comment.xml @@ -2,7 +2,6 @@ - [] Kommentar purchase.order diff --git a/snippets/ir_model.purchase_order_line.x_date_approve.xml b/snippets/ir_model.purchase_order_line.x_date_approve.xml index 38d8bc7d..570e429b 100644 --- a/snippets/ir_model.purchase_order_line.x_date_approve.xml +++ b/snippets/ir_model.purchase_order_line.x_date_approve.xml @@ -2,7 +2,6 @@ - [] Bestätigung am purchase.order.line diff --git a/snippets/ir_model.purchase_order_line.x_drawing_file.xml b/snippets/ir_model.purchase_order_line.x_drawing_file.xml index bf5fe3f4..944d9274 100644 --- a/snippets/ir_model.purchase_order_line.x_drawing_file.xml +++ b/snippets/ir_model.purchase_order_line.x_drawing_file.xml @@ -2,7 +2,6 @@ - [] Zeichnung purchase.order.line diff --git a/snippets/ir_model.purchase_order_line.x_origin.xml b/snippets/ir_model.purchase_order_line.x_origin.xml index 97106730..cebf9e7c 100644 --- a/snippets/ir_model.purchase_order_line.x_origin.xml +++ b/snippets/ir_model.purchase_order_line.x_origin.xml @@ -2,7 +2,6 @@ - [] Referenzbeleg purchase.order.line diff --git a/snippets/ir_model.purchase_order_line.x_partner_ref.xml b/snippets/ir_model.purchase_order_line.x_partner_ref.xml index 02ca2e33..8cddec3a 100644 --- a/snippets/ir_model.purchase_order_line.x_partner_ref.xml +++ b/snippets/ir_model.purchase_order_line.x_partner_ref.xml @@ -2,7 +2,6 @@ - [] Lieferantenreferenz purchase.order.line diff --git a/snippets/ir_model.purchase_order_line.x_state.xml b/snippets/ir_model.purchase_order_line.x_state.xml index 1be81dcf..546edbea 100644 --- a/snippets/ir_model.purchase_order_line.x_state.xml +++ b/snippets/ir_model.purchase_order_line.x_state.xml @@ -2,7 +2,6 @@ - [] Status Bestellposition purchase.order.line diff --git a/snippets/ir_model.purchase_order_line.x_user_id.xml b/snippets/ir_model.purchase_order_line.x_user_id.xml index 821c962b..ae3edfe9 100644 --- a/snippets/ir_model.purchase_order_line.x_user_id.xml +++ b/snippets/ir_model.purchase_order_line.x_user_id.xml @@ -2,7 +2,6 @@ - [] Einkaufsbeauftragter purchase.order.line diff --git a/snippets/ir_model.quality_check.x_active.xml b/snippets/ir_model.quality_check.x_active.xml index dfb275eb..dcd40368 100644 --- a/snippets/ir_model.quality_check.x_active.xml +++ b/snippets/ir_model.quality_check.x_active.xml @@ -2,7 +2,6 @@ - [] Aktiv quality.check diff --git a/snippets/ir_model.res_partner.x_birthdate.xml b/snippets/ir_model.res_partner.x_birthdate.xml index 819f0daa..748442f3 100644 --- a/snippets/ir_model.res_partner.x_birthdate.xml +++ b/snippets/ir_model.res_partner.x_birthdate.xml @@ -2,7 +2,6 @@ - [] Geburtstag res.partner diff --git a/snippets/ir_model.res_partner.x_created_on.xml b/snippets/ir_model.res_partner.x_created_on.xml index 3917bfbb..205ef24d 100644 --- a/snippets/ir_model.res_partner.x_created_on.xml +++ b/snippets/ir_model.res_partner.x_created_on.xml @@ -2,7 +2,6 @@ - [] Erstellt am res.partner diff --git a/snippets/ir_model.res_partner.x_external_ref.xml b/snippets/ir_model.res_partner.x_external_ref.xml index b66a1aa6..6c5774a5 100644 --- a/snippets/ir_model.res_partner.x_external_ref.xml +++ b/snippets/ir_model.res_partner.x_external_ref.xml @@ -2,7 +2,6 @@ - [] Externe Referenz res.partner diff --git a/snippets/ir_model.res_partner.x_packaging_ref.xml b/snippets/ir_model.res_partner.x_packaging_ref.xml index 6b0194d7..5b71015a 100644 --- a/snippets/ir_model.res_partner.x_packaging_ref.xml +++ b/snippets/ir_model.res_partner.x_packaging_ref.xml @@ -2,7 +2,6 @@ - [] Verpackungsreferenz res.partner diff --git a/snippets/ir_model.res_partner.x_stock_move_ids.xml b/snippets/ir_model.res_partner.x_stock_move_ids.xml index baa76b68..9103ada9 100644 --- a/snippets/ir_model.res_partner.x_stock_move_ids.xml +++ b/snippets/ir_model.res_partner.x_stock_move_ids.xml @@ -2,7 +2,6 @@ - [] Lagerbuchungen res.partner diff --git a/snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml b/snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml index 7556bb43..df357597 100644 --- a/snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml +++ b/snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml @@ -2,7 +2,6 @@ - [] Kategorie sale.blanket.order.line diff --git a/snippets/ir_model.sale_order.x_client_project_ref.xml b/snippets/ir_model.sale_order.x_client_project_ref.xml index 319ac0dd..5bda0ec9 100644 --- a/snippets/ir_model.sale_order.x_client_project_ref.xml +++ b/snippets/ir_model.sale_order.x_client_project_ref.xml @@ -2,7 +2,6 @@ - [] Projektnummer Kunde sale.order diff --git a/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml b/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml index 9af88f2d..2ff26ab0 100644 --- a/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml +++ b/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml @@ -2,7 +2,6 @@ - [] Incoterm Rahmenauftrag sale.order diff --git a/snippets/ir_model.sale_order.x_product_uom_qty.xml b/snippets/ir_model.sale_order.x_product_uom_qty.xml index eaee9fa4..57159850 100644 --- a/snippets/ir_model.sale_order.x_product_uom_qty.xml +++ b/snippets/ir_model.sale_order.x_product_uom_qty.xml @@ -2,7 +2,6 @@ - [] Gesamtmenge sale.order diff --git a/snippets/ir_model.sale_order.x_studio_description.xml b/snippets/ir_model.sale_order.x_studio_description.xml index a70601af..271d5a63 100644 --- a/snippets/ir_model.sale_order.x_studio_description.xml +++ b/snippets/ir_model.sale_order.x_studio_description.xml @@ -2,7 +2,6 @@ - [] Beschreibung Verkausauftrag sale.order diff --git a/snippets/ir_model.sale_order_line.x_client_order_ref.xml b/snippets/ir_model.sale_order_line.x_client_order_ref.xml index d1b68031..6c65533a 100644 --- a/snippets/ir_model.sale_order_line.x_client_order_ref.xml +++ b/snippets/ir_model.sale_order_line.x_client_order_ref.xml @@ -2,7 +2,6 @@ - [] Kundenreferenz sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_commitment_date.xml b/snippets/ir_model.sale_order_line.x_commitment_date.xml index c60bca9d..bce45808 100644 --- a/snippets/ir_model.sale_order_line.x_commitment_date.xml +++ b/snippets/ir_model.sale_order_line.x_commitment_date.xml @@ -2,7 +2,6 @@ - [] Lieferdatum sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_date_order.xml b/snippets/ir_model.sale_order_line.x_date_order.xml index 8cdda81f..016d58f7 100644 --- a/snippets/ir_model.sale_order_line.x_date_order.xml +++ b/snippets/ir_model.sale_order_line.x_date_order.xml @@ -2,7 +2,6 @@ - [] Auftragsdatum sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_drawing_file.xml b/snippets/ir_model.sale_order_line.x_drawing_file.xml index 228d23cf..3241a6c4 100644 --- a/snippets/ir_model.sale_order_line.x_drawing_file.xml +++ b/snippets/ir_model.sale_order_line.x_drawing_file.xml @@ -2,7 +2,6 @@ - [] Zeichnung sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_industry_id.xml b/snippets/ir_model.sale_order_line.x_industry_id.xml index 30e427d1..b53c5560 100644 --- a/snippets/ir_model.sale_order_line.x_industry_id.xml +++ b/snippets/ir_model.sale_order_line.x_industry_id.xml @@ -2,7 +2,6 @@ - [] Branche sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_margin_percent.xml b/snippets/ir_model.sale_order_line.x_margin_percent.xml index b6fa0b2a..bb75c244 100644 --- a/snippets/ir_model.sale_order_line.x_margin_percent.xml +++ b/snippets/ir_model.sale_order_line.x_margin_percent.xml @@ -2,7 +2,6 @@ - [] Marge (%) Marge Aufschlagsrechnung sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_pricelist_id.xml b/snippets/ir_model.sale_order_line.x_pricelist_id.xml index 947e4dec..ffbca49f 100644 --- a/snippets/ir_model.sale_order_line.x_pricelist_id.xml +++ b/snippets/ir_model.sale_order_line.x_pricelist_id.xml @@ -2,7 +2,6 @@ - [] Preisliste sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_service_policy.xml b/snippets/ir_model.sale_order_line.x_service_policy.xml index b14858e2..e4f0adc6 100644 --- a/snippets/ir_model.sale_order_line.x_service_policy.xml +++ b/snippets/ir_model.sale_order_line.x_service_policy.xml @@ -2,7 +2,6 @@ - [] Faktierungsregel sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_service_tracking.xml b/snippets/ir_model.sale_order_line.x_service_tracking.xml index ca82407f..afa93027 100644 --- a/snippets/ir_model.sale_order_line.x_service_tracking.xml +++ b/snippets/ir_model.sale_order_line.x_service_tracking.xml @@ -2,7 +2,6 @@ - [] Dienstverfolgung sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_state.xml b/snippets/ir_model.sale_order_line.x_state.xml index e0cb34ad..a315cb2d 100644 --- a/snippets/ir_model.sale_order_line.x_state.xml +++ b/snippets/ir_model.sale_order_line.x_state.xml @@ -2,7 +2,6 @@ - [] Status Auftragsposition sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_taxed_amount.xml b/snippets/ir_model.sale_order_line.x_taxed_amount.xml index 8601246f..9db24cd7 100644 --- a/snippets/ir_model.sale_order_line.x_taxed_amount.xml +++ b/snippets/ir_model.sale_order_line.x_taxed_amount.xml @@ -2,7 +2,6 @@ - [] Total inkl. MWST sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml b/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml index 0b28e9a2..718e9d53 100644 --- a/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml +++ b/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml @@ -2,7 +2,6 @@ - [] Rechnungsbetrag inkl. MWST sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_untaxed_amount.xml b/snippets/ir_model.sale_order_line.x_untaxed_amount.xml index 19de9d27..3c27fb17 100644 --- a/snippets/ir_model.sale_order_line.x_untaxed_amount.xml +++ b/snippets/ir_model.sale_order_line.x_untaxed_amount.xml @@ -2,7 +2,6 @@ - [] Total exkl. MWST sale.order.line diff --git a/snippets/ir_model.sale_order_line.x_weight_delivered.xml b/snippets/ir_model.sale_order_line.x_weight_delivered.xml index 8662dce2..fdba586f 100644 --- a/snippets/ir_model.sale_order_line.x_weight_delivered.xml +++ b/snippets/ir_model.sale_order_line.x_weight_delivered.xml @@ -2,7 +2,6 @@ - [] Geliefertes Gewicht sale.order.line diff --git a/snippets/ir_model.stock_location.x_should_be_valued.xml b/snippets/ir_model.stock_location.x_should_be_valued.xml index 19258aa4..0916d7f8 100644 --- a/snippets/ir_model.stock_location.x_should_be_valued.xml +++ b/snippets/ir_model.stock_location.x_should_be_valued.xml @@ -2,7 +2,6 @@ - [] Should be valued stock.location diff --git a/snippets/ir_model.stock_move.x_count_boxes.xml b/snippets/ir_model.stock_move.x_count_boxes.xml index 53f19b9f..86c41bc1 100644 --- a/snippets/ir_model.stock_move.x_count_boxes.xml +++ b/snippets/ir_model.stock_move.x_count_boxes.xml @@ -2,7 +2,6 @@ - [] Anzahl Kisten stock.move diff --git a/snippets/ir_model.stock_move.x_count_packaging.xml b/snippets/ir_model.stock_move.x_count_packaging.xml index 64750787..eee96532 100644 --- a/snippets/ir_model.stock_move.x_count_packaging.xml +++ b/snippets/ir_model.stock_move.x_count_packaging.xml @@ -2,7 +2,6 @@ - [] Anzahl Verpackungen stock.move diff --git a/snippets/ir_model.stock_move.x_operation_qty.xml b/snippets/ir_model.stock_move.x_operation_qty.xml index 027df588..1e70cdee 100644 --- a/snippets/ir_model.stock_move.x_operation_qty.xml +++ b/snippets/ir_model.stock_move.x_operation_qty.xml @@ -2,7 +2,6 @@ - [] Inventory +/- stock.move diff --git a/snippets/ir_model.stock_move.x_packaging_uom_id.xml b/snippets/ir_model.stock_move.x_packaging_uom_id.xml index 2d14920a..623e6d0d 100644 --- a/snippets/ir_model.stock_move.x_packaging_uom_id.xml +++ b/snippets/ir_model.stock_move.x_packaging_uom_id.xml @@ -2,7 +2,6 @@ - [] Mengeneinheit product.packaging diff --git a/snippets/ir_model.stock_move.x_picking_partner_id.xml b/snippets/ir_model.stock_move.x_picking_partner_id.xml index 38b964dd..cf8fd4fa 100644 --- a/snippets/ir_model.stock_move.x_picking_partner_id.xml +++ b/snippets/ir_model.stock_move.x_picking_partner_id.xml @@ -2,7 +2,6 @@ - [] Lieferadresse stock.move diff --git a/snippets/ir_model.stock_move.x_print_parent_only.xml b/snippets/ir_model.stock_move.x_print_parent_only.xml index 65792a95..9b7043c6 100644 --- a/snippets/ir_model.stock_move.x_print_parent_only.xml +++ b/snippets/ir_model.stock_move.x_print_parent_only.xml @@ -2,7 +2,6 @@ - [] Nur übergeordnete Verpackung drucken product.packaging diff --git a/snippets/ir_model.stock_move.x_print_without_parent.xml b/snippets/ir_model.stock_move.x_print_without_parent.xml index 851a44aa..af4d7422 100644 --- a/snippets/ir_model.stock_move.x_print_without_parent.xml +++ b/snippets/ir_model.stock_move.x_print_without_parent.xml @@ -2,7 +2,6 @@ - [] Ohne übergeordnete Verpackung drucken product.packaging diff --git a/snippets/ir_model.stock_move.x_scrap_id.xml b/snippets/ir_model.stock_move.x_scrap_id.xml index 0c6beafa..d01487dc 100644 --- a/snippets/ir_model.stock_move.x_scrap_id.xml +++ b/snippets/ir_model.stock_move.x_scrap_id.xml @@ -2,7 +2,6 @@ - [] Buchung Lagerschwund product.packaging diff --git a/snippets/ir_model.stock_picking.x_autocomplete.xml b/snippets/ir_model.stock_picking.x_autocomplete.xml index ce3edc04..248fa5d0 100644 --- a/snippets/ir_model.stock_picking.x_autocomplete.xml +++ b/snippets/ir_model.stock_picking.x_autocomplete.xml @@ -2,7 +2,6 @@ - [] Automatisch Erledigen stock.picking diff --git a/snippets/ir_model.stock_production_lot.x_production_id.xml b/snippets/ir_model.stock_production_lot.x_production_id.xml index d5de0602..2b81353f 100644 --- a/snippets/ir_model.stock_production_lot.x_production_id.xml +++ b/snippets/ir_model.stock_production_lot.x_production_id.xml @@ -2,7 +2,6 @@ - [] Fertigungsauftrag stock.production.lot diff --git a/snippets/ir_model.stock_production_lot.x_production_ids.xml b/snippets/ir_model.stock_production_lot.x_production_ids.xml index 32a0a98c..adcc0364 100644 --- a/snippets/ir_model.stock_production_lot.x_production_ids.xml +++ b/snippets/ir_model.stock_production_lot.x_production_ids.xml @@ -2,7 +2,6 @@ - [] Fertigungsaufträge stock.production.lot diff --git a/snippets/ir_model.stock_production_lot.x_weight_uom.xml b/snippets/ir_model.stock_production_lot.x_weight_uom.xml index 69b7c8dd..a0632d7c 100644 --- a/snippets/ir_model.stock_production_lot.x_weight_uom.xml +++ b/snippets/ir_model.stock_production_lot.x_weight_uom.xml @@ -2,7 +2,6 @@ - [] Nettogewicht [kg] stock.production.lot diff --git a/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml b/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml index d993da19..f660b6ed 100644 --- a/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml +++ b/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml @@ -2,7 +2,6 @@ - [] Lieferadresse stock.quant diff --git a/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml b/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml index 0d40d863..357b78b7 100644 --- a/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml +++ b/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml @@ -2,7 +2,6 @@ - [] Lagerort Bestand stock.valuation.layer diff --git a/snippets/mail.activity.x_reference.xml b/snippets/mail.activity.x_reference.xml index cad0e648..00145c92 100644 --- a/snippets/mail.activity.x_reference.xml +++ b/snippets/mail.activity.x_reference.xml @@ -2,7 +2,6 @@ - [] Reference mail.activity diff --git a/snippets/mail.md b/snippets/mail.md index e8e890e4..446681c9 100644 --- a/snippets/mail.md +++ b/snippets/mail.md @@ -7,7 +7,6 @@ ID: `mint_system.mail.activity.x_reference` - [] Reference mail.activity diff --git a/snippets/sale.report_saleorder_document.add_signature_note.xml b/snippets/sale.report_saleorder_document.add_signature_note.xml index 3826e459..69fc59ae 100644 --- a/snippets/sale.report_saleorder_document.add_signature_note.xml +++ b/snippets/sale.report_saleorder_document.add_signature_note.xml @@ -10,7 +10,7 @@ }
      -

      Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.
      +

      Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.


      Ort/Datum: _________________ Unterschrift Kunde: __________________________________

      From 5383b765ed73afb3666836832d2a2ce44da0abf8 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 26 Jun 2023 19:23:35 +0200 Subject: [PATCH 007/147] update snippets --- snippets/account.md | 86 +++++++++++++++++++ ...w_move_form.x_has_downpayment_warn_msg.xml | 2 +- snippets/hr_timesheet.md | 15 ++++ ...r_model.account_move.x_has_downpayment.xml | 13 ++- snippets/ir_model.md | 28 ++++++ snippets/sale.md | 2 +- snippets/stock.md | 13 ++- 7 files changed, 143 insertions(+), 16 deletions(-) diff --git a/snippets/account.md b/snippets/account.md index f5559943..90e00620 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -1,4 +1,29 @@ # Account +## Portal Invoice Page +### Convert Html Note +ID: `mint_system.account.portal_invoice_page.convert_html_note` +```xml + + + + + + + + + + + + + + + + + + +``` +Source: [snippets/account.portal_invoice_page.convert_html_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.portal_invoice_page.convert_html_note.xml) + ## Report Invoice Document ### Add Address Space ID: `mint_system.account.report_invoice_document.add_address_space` @@ -324,6 +349,28 @@ ID: `mint_system.account.report_invoice_document.bank_account` ``` Source: [snippets/account.report_invoice_document.bank_account.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.bank_account.xml) +### Convert Html Note +ID: `mint_system.account.report_invoice_document.convert_html_note` +```xml + + + + + + + + + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.convert_html_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.convert_html_note.xml) + ### Custom Address ID: `mint_system.account.report_invoice_document.custom_address` ```xml @@ -2517,6 +2564,28 @@ ID: `mint_system.account.report_invoice_document.bank_account` ``` Source: [snippets/account.report_invoice_document.bank_account.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.bank_account.xml) +### Convert Html Note +ID: `mint_system.account.report_invoice_document.convert_html_note` +```xml + + + + + + + + + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.convert_html_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.convert_html_note.xml) + ### Custom Address ID: `mint_system.account.report_invoice_document.custom_address` ```xml @@ -4841,6 +4910,23 @@ ID: `mint_system.account.view_move_form.x_duplicate_found` ``` Source: [snippets/account.view_move_form.x_duplicate_found.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.x_duplicate_found.xml) +### X Has Downpayment Warn Msg +ID: `mint_system.account.view_move_form.x_has_downpayment_warn_msg` +```xml + + + +
      + + +
      + +       +``` +Source: [snippets/account.view_move_form.x_has_downpayment_warn_msg.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml) + ### X Invoice Warn Msg ID: `mint_system.account.view_move_form.x_invoice_warn_msg` ```xml diff --git a/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml b/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml index 4df9d20b..f52a7e4d 100644 --- a/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml +++ b/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml @@ -4,7 +4,7 @@
      diff --git a/snippets/hr_timesheet.md b/snippets/hr_timesheet.md index dc0d6381..cc2e89d5 100644 --- a/snippets/hr_timesheet.md +++ b/snippets/hr_timesheet.md @@ -19,6 +19,21 @@ ID: `mint_system.hr_timesheet.hr_timesheet_line_search.filter_project_id` ``` Source: [snippets/hr_timesheet.hr_timesheet_line_search.filter_project_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.hr_timesheet_line_search.filter_project_id.xml) +### Filter Validated +ID: `mint_system.hr_timesheet.hr_timesheet_line_search.filter_validated` +```xml + + + + + + + + + +``` +Source: [snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml) + ## Hr Timesheet Line Tree ### Always Show So Line ID: `mint_system.hr_timesheet.hr_timesheet_line_tree.always_show_so_line` diff --git a/snippets/ir_model.account_move.x_has_downpayment.xml b/snippets/ir_model.account_move.x_has_downpayment.xml index 4b655dc9..f3332b38 100644 --- a/snippets/ir_model.account_move.x_has_downpayment.xml +++ b/snippets/ir_model.account_move.x_has_downpayment.xml @@ -9,14 +9,13 @@ - text + boolean + invoice_line_ids.sale_line_ids for rec in self: - so_lines_with_downpayment = rec.invoice_line_ids.sale_line_ids.filterd(lambda l: l.is_downpayment) - if so_lines_with_downpayment: - rec['x_has_downpayment'] = true - else: - rec['x_has_downpayment'] = false - + if any(line.is_downpayment for line in rec.invoice_line_ids.sale_line_ids.order_id.order_line): + rec['x_has_downpayment'] = True + else: + rec['x_has_downpayment'] = False diff --git a/snippets/ir_model.md b/snippets/ir_model.md index 3c0f88ce..958b0594 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -218,6 +218,34 @@ ID: `mint_system.ir_model.account_move.x_duplicate_found` ``` Source: [snippets/ir_model.account_move.x_duplicate_found.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.account_move.x_duplicate_found.xml) +### X Has Downpayment +ID: `mint_system.ir_model.account_move.x_has_downpayment` +```xml + + + + + Hat Anzahlung + account.move + + x_has_downpayment + + + + boolean + invoice_line_ids.sale_line_ids + for rec in self: + if any(line.is_downpayment for line in rec.invoice_line_ids.sale_line_ids.order_id.order_line): + rec['x_has_downpayment'] = True + else: + rec['x_has_downpayment'] = False + + + + +``` +Source: [snippets/ir_model.account_move.x_has_downpayment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.account_move.x_has_downpayment.xml) + ### X Hr Expense Sheet Ids ID: `mint_system.ir_model.account_move.x_hr_expense_sheet_ids` ```xml diff --git a/snippets/sale.md b/snippets/sale.md index 138e5c19..0af06bc5 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -1320,7 +1320,7 @@ ID: `mint_system.sale.report_saleorder_document.add_signature_note` }
      -

      Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.
      +

      Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.


      Ort/Datum: _________________ Unterschrift Kunde: __________________________________

      diff --git a/snippets/stock.md b/snippets/stock.md index a181fe24..90a1ce1e 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -1649,16 +1649,15 @@ ID: `mint_system.stock.report_delivery_document.format_qty` - - "integer" - + + "integer" + - - "integer" - + + "integer" + - ``` Source: [snippets/stock.report_delivery_document.format_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.format_qty.xml) From ad51b02c1a38d0dec39b57701b9b8700bd56b9ff Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 27 Jun 2023 11:44:31 +0200 Subject: [PATCH 008/147] ref --- addons/social | 2 +- addons/vertical_saas | 2 +- enterprise | 2 +- oca/account-financial-tools | 2 +- oca/bank-payment | 2 +- oca/brand | 2 +- oca/hr | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/purchase-workflow | 2 +- oca/rest-framework | 2 +- oca/sale-workflow | 2 +- oca/server-backend | 2 +- oca/server-env | 2 +- oca/timesheet | 2 +- odoo | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/social b/addons/social index f50f3f3c..74f8c777 160000 --- a/addons/social +++ b/addons/social @@ -1 +1 @@ -Subproject commit f50f3f3ccfb5515f1c45a945743b8c22847a3754 +Subproject commit 74f8c7778daf863a3938d179a72cc0e248083044 diff --git a/addons/vertical_saas b/addons/vertical_saas index 19037b4d..173bf2f7 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 19037b4d23f67a27934d845f2e85cc0fad8343c0 +Subproject commit 173bf2f70dbe665b726dc9e4d302c12b8a1fee91 diff --git a/enterprise b/enterprise index 7cdc7b02..c51b2b35 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 7cdc7b02a1fe7ca2bb264bfd3f01727ca6168e85 +Subproject commit c51b2b35ac529c8d2c451ae9b64f63a9c720523c diff --git a/oca/account-financial-tools b/oca/account-financial-tools index ad6f4412..a4f4237c 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit ad6f4412b87e6db1ce9f748d85af16ef348037e8 +Subproject commit a4f4237cbf42922e729aa149c1db1778f121830e diff --git a/oca/bank-payment b/oca/bank-payment index 5c9cf261..6ae1a2f0 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 5c9cf261e5ad81848df55c4f19ff865bd32d61f3 +Subproject commit 6ae1a2f0c1b4c272c2277cd5e48cfd96029c10b3 diff --git a/oca/brand b/oca/brand index 727faee2..96169606 160000 --- a/oca/brand +++ b/oca/brand @@ -1 +1 @@ -Subproject commit 727faee29e5196007f407890995b68ecdde7a7cb +Subproject commit 961696064d0fb30fe12efc4d927bebf071fe44f3 diff --git a/oca/hr b/oca/hr index 79f87cca..e95c4fee 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit 79f87cca69c0e28c2650afb3ec9d5cd42b514a18 +Subproject commit e95c4fee156696a2742d21a18bfa8ef1fc45342b diff --git a/oca/partner-contact b/oca/partner-contact index 32511d22..f941b2b9 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 32511d2244349841bb230aa23b15bb74ac153876 +Subproject commit f941b2b9c71d0fa5a92a1092687e968a13e6144d diff --git a/oca/product-attribute b/oca/product-attribute index 34c9da4a..b4990c7a 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 34c9da4aca7dfb44e4bf25734f9dd5b021477cf1 +Subproject commit b4990c7a6dcdcb39112039b20d0e5d0618b11ed9 diff --git a/oca/purchase-workflow b/oca/purchase-workflow index b22e7337..886a58ad 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit b22e7337a32a956ba8cb66135a042ab8a7d38d9e +Subproject commit 886a58adcb91298945d6aacae4addd8dd9d4b169 diff --git a/oca/rest-framework b/oca/rest-framework index c63e21d0..952f7c36 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit c63e21d0e62a503ad78efc3af06675ec425ed05e +Subproject commit 952f7c367a6e36d7bf5eef65cc7dba3a36b1e91a diff --git a/oca/sale-workflow b/oca/sale-workflow index 44643035..4e81d759 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 446430359c542b6041f1c6635a91e241c1bc64b5 +Subproject commit 4e81d759974a47566e8c42fefef38c704678c091 diff --git a/oca/server-backend b/oca/server-backend index a0895d3b..0a5f4101 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit a0895d3be472da97683f7e92e8dfbfdad7bf39f2 +Subproject commit 0a5f41017b8e83c427e5bed9583a08f48b1c77ea diff --git a/oca/server-env b/oca/server-env index edc914e4..5c3bde7c 160000 --- a/oca/server-env +++ b/oca/server-env @@ -1 +1 @@ -Subproject commit edc914e469c0459c8d501a96d503a265fb61a4f1 +Subproject commit 5c3bde7cfca7287a08f9acb581fdc2c0647481f5 diff --git a/oca/timesheet b/oca/timesheet index 3cbade3e..33a49a2c 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit 3cbade3e87b362b59c2c6ec8afb10ee43c436e05 +Subproject commit 33a49a2c96702af6efda21110d847bd7b5b45047 diff --git a/odoo b/odoo index eb022e38..9ab5f20a 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit eb022e388b62856020d95e063ec0dfd4b786c4a9 +Subproject commit 9ab5f20acd83f6840152d7179831cd5171fd3a4a From 9f0326ae37e5674ffdb9cb11d738397aa2f0f112 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 28 Jun 2023 15:18:36 +0200 Subject: [PATCH 009/147] ref --- addons/vertical_saas | 2 +- oca/account-financial-tools | 2 +- oca/bank-statement-import | 2 +- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/iot | 2 +- oca/l10n-switzerland | 2 +- oca/purchase-workflow | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 173bf2f7..b59de5bf 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 173bf2f70dbe665b726dc9e4d302c12b8a1fee91 +Subproject commit b59de5bf5b33bb1b27ba0689254754af04e98bff diff --git a/oca/account-financial-tools b/oca/account-financial-tools index a4f4237c..06f90480 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit a4f4237cbf42922e729aa149c1db1778f121830e +Subproject commit 06f904801f1b4c8b82d5dd2f1673f64ebe73933e diff --git a/oca/bank-statement-import b/oca/bank-statement-import index c24add14..6f77ff5f 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit c24add14ed5d18638971a3289a58f48467d58382 +Subproject commit 6f77ff5f6c2e034d2f24e3463911f38ce9e72814 diff --git a/oca/hr-attendance b/oca/hr-attendance index c3557e5a..8198451f 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit c3557e5af1cb732ab9b3a630b60b3254612270af +Subproject commit 8198451f93738fb1e978112558df28d1df7249a1 diff --git a/oca/hr-holidays b/oca/hr-holidays index a831e7cc..3f21899f 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit a831e7cc950d890ed38a977acb6afe23b8f1e08a +Subproject commit 3f21899f4b603ac3c20dfcde7ebcf3fdb08f75e8 diff --git a/oca/iot b/oca/iot index 520eba08..d8b5c84e 160000 --- a/oca/iot +++ b/oca/iot @@ -1 +1 @@ -Subproject commit 520eba08122e047a08aa05c9e1e80774acf7f6a1 +Subproject commit d8b5c84eada93a64f4442487b5e44fe7137a95f6 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index bb7affa6..fb0ecd0c 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 +Subproject commit fb0ecd0c1902df6158553d69fcd2a9980e0d706b diff --git a/oca/purchase-workflow b/oca/purchase-workflow index 886a58ad..5cbff205 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit 886a58adcb91298945d6aacae4addd8dd9d4b169 +Subproject commit 5cbff2053299e08a2f6ed01f143941560f88b349 From 150d846785686d02e2ca5a7083eb36d112f7ab4f Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 28 Jun 2023 15:22:42 +0200 Subject: [PATCH 010/147] sync --- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/l10n-switzerland | 2 +- ....report_invoice_document.move_incoterm.xml | 12 ++++ ..._saleorder_document.add_delivery_dates.xml | 14 ++++ ...rt_saleorder_document.add_intrastat_id.xml | 14 ++++ ...e.report_saleorder_document.add_weight.xml | 14 ++++ ....replace_address_and_information_block.xml | 72 +++++++++++++++++++ ...rnal_layout_boxed.hide_company_details.xml | 6 ++ ...ternal_layout_boxed.increase_logo_size.xml | 8 +++ 10 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 snippets/account.report_invoice_document.move_incoterm.xml create mode 100644 snippets/sale.report_saleorder_document.add_delivery_dates.xml create mode 100644 snippets/sale.report_saleorder_document.add_intrastat_id.xml create mode 100644 snippets/sale.report_saleorder_document.add_weight.xml create mode 100644 snippets/sale.report_saleorder_document.replace_address_and_information_block.xml create mode 100644 snippets/web.external_layout_boxed.hide_company_details.xml create mode 100644 snippets/web.external_layout_boxed.increase_logo_size.xml diff --git a/oca/hr-attendance b/oca/hr-attendance index 8198451f..c3557e5a 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 8198451f93738fb1e978112558df28d1df7249a1 +Subproject commit c3557e5af1cb732ab9b3a630b60b3254612270af diff --git a/oca/hr-holidays b/oca/hr-holidays index 3f21899f..a831e7cc 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit 3f21899f4b603ac3c20dfcde7ebcf3fdb08f75e8 +Subproject commit a831e7cc950d890ed38a977acb6afe23b8f1e08a diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index fb0ecd0c..bb7affa6 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit fb0ecd0c1902df6158553d69fcd2a9980e0d706b +Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 diff --git a/snippets/account.report_invoice_document.move_incoterm.xml b/snippets/account.report_invoice_document.move_incoterm.xml new file mode 100644 index 00000000..4f5b23f2 --- /dev/null +++ b/snippets/account.report_invoice_document.move_incoterm.xml @@ -0,0 +1,12 @@ + + + + + +

      + Incoterm: + + - +

      +       +       \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.add_delivery_dates.xml b/snippets/sale.report_saleorder_document.add_delivery_dates.xml new file mode 100644 index 00000000..1d1288a0 --- /dev/null +++ b/snippets/sale.report_saleorder_document.add_delivery_dates.xml @@ -0,0 +1,14 @@ + + + + + Delivery Date + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.add_intrastat_id.xml b/snippets/sale.report_saleorder_document.add_intrastat_id.xml new file mode 100644 index 00000000..0745cdeb --- /dev/null +++ b/snippets/sale.report_saleorder_document.add_intrastat_id.xml @@ -0,0 +1,14 @@ + + + + + HS Code + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.add_weight.xml b/snippets/sale.report_saleorder_document.add_weight.xml new file mode 100644 index 00000000..1d1288a0 --- /dev/null +++ b/snippets/sale.report_saleorder_document.add_weight.xml @@ -0,0 +1,14 @@ + + + + + Delivery Date + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml b/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml new file mode 100644 index 00000000..440db9ff --- /dev/null +++ b/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml @@ -0,0 +1,72 @@ + + + + + + + +
      +
      Customer
      +
      Invoice Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Delivery Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Your Contact
      +
      Our Contact
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +       + +       \ No newline at end of file diff --git a/snippets/web.external_layout_boxed.hide_company_details.xml b/snippets/web.external_layout_boxed.hide_company_details.xml new file mode 100644 index 00000000..0dd9adbb --- /dev/null +++ b/snippets/web.external_layout_boxed.hide_company_details.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/snippets/web.external_layout_boxed.increase_logo_size.xml b/snippets/web.external_layout_boxed.increase_logo_size.xml new file mode 100644 index 00000000..de68c078 --- /dev/null +++ b/snippets/web.external_layout_boxed.increase_logo_size.xml @@ -0,0 +1,8 @@ + + + + + width: 720px; margin-top: 10px + + + \ No newline at end of file From a89f42521b68a5cbcd8eb3357172fc9213b5a826 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 30 Jun 2023 12:40:55 +0200 Subject: [PATCH 011/147] sync --- snippets/account.md | 36 +++++ ...iew_partner_form.move_company_registry.xml | 7 + snippets/base.view_partner_form.x_eori.xml | 8 + snippets/ir_model.res_partner.x_birthdate.xml | 2 +- snippets/ir_model.res_partner.x_eori.xml | 16 ++ snippets/sale.md | 138 ++++++++++++++++++ ..._saleorder_document.add_delivery_dates.xml | 14 -- ....replace_address_and_information_block.xml | 74 ++++++++++ snippets/web.md | 26 ++++ task | 8 +- task.md | 1 + .../.gitignore | 0 .../.pre-commit-config.yaml | 0 .../LICENSE | 0 .../README.rst | 0 .../__init__.py | 0 .../__manifest__.py | 0 .../data/ir_actions.xml | 0 .../data/ir_sequence.xml | 0 .../demo/demo.xml | 0 .../images/screen.png | Bin .../models/__init__.py | 0 .../models/models.py | 0 .../report/invoice_document.xml | 0 .../security/ir.model.access.csv | 0 .../static/description/icon.png | Bin .../static/src/css/style.css | 0 .../static/src/js/widget.js | 0 .../views/assets.xml | 0 .../views/sale_order.xml | 0 30 files changed, 310 insertions(+), 20 deletions(-) create mode 100644 snippets/base.view_partner_form.move_company_registry.xml create mode 100644 snippets/base.view_partner_form.x_eori.xml create mode 100644 snippets/ir_model.res_partner.x_eori.xml delete mode 100644 snippets/sale.report_saleorder_document.add_delivery_dates.xml create mode 100644 snippets/stock.report_delivery_document.replace_address_and_information_block.xml rename template/{ms_custom_module => custom_module}/.gitignore (100%) rename template/{ms_custom_module => custom_module}/.pre-commit-config.yaml (100%) rename template/{ms_custom_module => custom_module}/LICENSE (100%) rename template/{ms_custom_module => custom_module}/README.rst (100%) rename template/{ms_custom_module => custom_module}/__init__.py (100%) rename template/{ms_custom_module => custom_module}/__manifest__.py (100%) rename template/{ms_custom_module => custom_module}/data/ir_actions.xml (100%) rename template/{ms_custom_module => custom_module}/data/ir_sequence.xml (100%) rename template/{ms_custom_module => custom_module}/demo/demo.xml (100%) rename template/{ms_custom_module => custom_module}/images/screen.png (100%) rename template/{ms_custom_module => custom_module}/models/__init__.py (100%) rename template/{ms_custom_module => custom_module}/models/models.py (100%) rename template/{ms_custom_module => custom_module}/report/invoice_document.xml (100%) rename template/{ms_custom_module => custom_module}/security/ir.model.access.csv (100%) rename template/{ms_custom_module => custom_module}/static/description/icon.png (100%) rename template/{ms_custom_module => custom_module}/static/src/css/style.css (100%) rename template/{ms_custom_module => custom_module}/static/src/js/widget.js (100%) rename template/{ms_custom_module => custom_module}/views/assets.xml (100%) rename template/{ms_custom_module => custom_module}/views/sale_order.xml (100%) diff --git a/snippets/account.md b/snippets/account.md index 90e00620..18e33cb4 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -990,6 +990,24 @@ ID: `mint_system.account.report_invoice_document.modify_main_table` ``` Source: [snippets/account.report_invoice_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.modify_main_table.xml) +### Move Incoterm +ID: `mint_system.account.report_invoice_document.move_incoterm` +```xml + + + + + +

      + Incoterm: + + - +

      +       +       +``` +Source: [snippets/account.report_invoice_document.move_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.move_incoterm.xml) + ### Net Value Summary ID: `mint_system.account.report_invoice_document.net_value_summary` ```xml @@ -3205,6 +3223,24 @@ ID: `mint_system.account.report_invoice_document.modify_main_table` ``` Source: [snippets/account.report_invoice_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.modify_main_table.xml) +### Move Incoterm +ID: `mint_system.account.report_invoice_document.move_incoterm` +```xml + + + + + +

      + Incoterm: + + - +

      +       +       +``` +Source: [snippets/account.report_invoice_document.move_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.move_incoterm.xml) + ### Net Value Summary ID: `mint_system.account.report_invoice_document.net_value_summary` ```xml diff --git a/snippets/base.view_partner_form.move_company_registry.xml b/snippets/base.view_partner_form.move_company_registry.xml new file mode 100644 index 00000000..ae05bcc5 --- /dev/null +++ b/snippets/base.view_partner_form.move_company_registry.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/base.view_partner_form.x_eori.xml b/snippets/base.view_partner_form.x_eori.xml new file mode 100644 index 00000000..32018a4e --- /dev/null +++ b/snippets/base.view_partner_form.x_eori.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/ir_model.res_partner.x_birthdate.xml b/snippets/ir_model.res_partner.x_birthdate.xml index 748442f3..17f26bf6 100644 --- a/snippets/ir_model.res_partner.x_birthdate.xml +++ b/snippets/ir_model.res_partner.x_birthdate.xml @@ -4,7 +4,7 @@ Geburtstag res.partner - + x_birthdate diff --git a/snippets/ir_model.res_partner.x_eori.xml b/snippets/ir_model.res_partner.x_eori.xml new file mode 100644 index 00000000..899935e9 --- /dev/null +++ b/snippets/ir_model.res_partner.x_eori.xml @@ -0,0 +1,16 @@ + + + + + [] + EORI + res.partner + + x_eori + + + + char + + + \ No newline at end of file diff --git a/snippets/sale.md b/snippets/sale.md index 0af06bc5..dce60ea2 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -848,6 +848,26 @@ ID: `mint_system.sale.report_saleorder_document.add_default_code` ``` Source: [snippets/sale.report_saleorder_document.add_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_default_code.xml) +### Add Delivery Dates +ID: `mint_system.sale.report_saleorder_document.add_delivery_dates` +```xml + + + + + Delivery Date + + + + + + + + + +``` +Source: [snippets/sale.report_saleorder_document.add_delivery_dates.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_delivery_dates.xml) + ### Add Delivery Date ID: `mint_system.sale.report_saleorder_document.add_delivery_date` ```xml @@ -1124,6 +1144,26 @@ ID: `mint_system.sale.report_saleorder_document.add_infotable` ``` Source: [snippets/sale.report_saleorder_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_infotable.xml) +### Add Intrastat Id +ID: `mint_system.sale.report_saleorder_document.add_intrastat_id` +```xml + + + + + HS Code + + + + + + + + + +``` +Source: [snippets/sale.report_saleorder_document.add_intrastat_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_intrastat_id.xml) + ### Add Note Space ID: `mint_system.sale.report_saleorder_document.add_note_space` ```xml @@ -1369,6 +1409,26 @@ ID: `mint_system.sale.report_saleorder_document.add_validity_date` ``` Source: [snippets/sale.report_saleorder_document.add_validity_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_validity_date.xml) +### Add Weight +ID: `mint_system.sale.report_saleorder_document.add_weight` +```xml + + + + + Delivery Date + + + + + + + + + +``` +Source: [snippets/sale.report_saleorder_document.add_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_weight.xml) + ### Append Payment Terms ID: `mint_system.sale.report_saleorder_document.append_payment_terms` ```xml @@ -1910,6 +1970,84 @@ ID: `mint_system.sale.report_saleorder_document.repeat_table_header` ``` Source: [snippets/sale.report_saleorder_document.repeat_table_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.repeat_table_header.xml) +### Replace Address And Information Block +ID: `mint_system.sale.report_saleorder_document.replace_address_and_information_block` +```xml + + + + + + + +
      +
      Customer
      +
      Invoice Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Delivery Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Your Contact
      +
      Our Contact
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +       + +       +``` +Source: [snippets/sale.report_saleorder_document.replace_address_and_information_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml) + ### Replace Informations ID: `mint_system.sale.report_saleorder_document.replace_informations` ```xml diff --git a/snippets/sale.report_saleorder_document.add_delivery_dates.xml b/snippets/sale.report_saleorder_document.add_delivery_dates.xml deleted file mode 100644 index 1d1288a0..00000000 --- a/snippets/sale.report_saleorder_document.add_delivery_dates.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Delivery Date - - - - - - - - - \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.replace_address_and_information_block.xml b/snippets/stock.report_delivery_document.replace_address_and_information_block.xml new file mode 100644 index 00000000..50d83896 --- /dev/null +++ b/snippets/stock.report_delivery_document.replace_address_and_information_block.xml @@ -0,0 +1,74 @@ + + + + + + + + Carbo-Link AG | Undermülistrasse 25 | CH 8320 Fehraltorf + +
      +
      Delivery Address
      +
      Customer
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Invoice Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Your Contact
      +
      Our Contact
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +       + +       \ No newline at end of file diff --git a/snippets/web.md b/snippets/web.md index 9a48b3a9..8bcbcaf0 100644 --- a/snippets/web.md +++ b/snippets/web.md @@ -192,6 +192,32 @@ ID: `mint_system.web.external_layout_boxed.footer_company_registry` ``` Source: [snippets/web.external_layout_boxed.footer_company_registry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_boxed.footer_company_registry.xml) +### Hide Company Details +ID: `mint_system.web.external_layout_boxed.hide_company_details` +```xml + + + + + + +``` +Source: [snippets/web.external_layout_boxed.hide_company_details.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_boxed.hide_company_details.xml) + +### Increase Logo Size +ID: `mint_system.web.external_layout_boxed.increase_logo_size` +```xml + + + + + width: 720px; margin-top: 10px + + + +``` +Source: [snippets/web.external_layout_boxed.increase_logo_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_boxed.increase_logo_size.xml) + ## External Layout Standard ### Eksb Layout ID: `mint_system.web.external_layout_standard.eksb_layout` diff --git a/task b/task index 4ed91cfe..f1b744a5 100755 --- a/task +++ b/task @@ -294,7 +294,7 @@ function lint-module() { find $1 -type d -exec chmod u=rwx,go=rx {} \; find $1 -type f -exec chmod u=rw,go=r {} \; echo "Copy default .gignore" - cp template/ms_custom_module/.gitignore "$1"/ + cp template/custom_module/.gitignore "$1"/ echo "Run pylint in $1" pylint --load-plugins=pylint_odoo -d all -e odoolint $1 cd $1 @@ -408,7 +408,7 @@ function create-module() { locale activate-venv echo "Scaffolding module $MODULE_NAME in $PARENT_DIR ..." - odoo-bin scaffold "$MODULE_NAME" "$PARENT_DIR" -t template/ms_custom_module + odoo-bin scaffold "$MODULE_NAME" "$PARENT_DIR" -t template/custom_module } function drop-db() { @@ -431,11 +431,9 @@ function clear-assets() { DATABASE=$1 DATABASE=${DATABASE:="$GIT_BRANCH"} - echo "Delete these assets:" + echo "Delete these assets for $DATABASE:" docker exec db psql postgres://odoo:odoo@localhost/$DATABASE -c "select id,name from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';" docker exec db psql postgres://odoo:odoo@localhost/$DATABASE -c "delete from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';" - - echo "Restart your docker service." } function convert-database() { diff --git a/task.md b/task.md index 7307cc91..dceaffae 100644 --- a/task.md +++ b/task.md @@ -5,6 +5,7 @@ | change-uuid | [env] | Change database uuid via xmlrpc. | | checkout | [branch][branch] | Switch and merge from one branch to another. | | checkout-revision | [revision] | Switch to a different Odoo revision by tag name. | +| clear-assets | [db] | Clear all assets of Odoo database. | | clear-filestore | [db] | Clear local filestore folder. No param will clear all filestores. Default is branch name. | | convert-database | [db] | Convert database backup file from postgres 9.5 to latest. Default is branch name. | | create-module | [path] | Create new Odoo module from template. | diff --git a/template/ms_custom_module/.gitignore b/template/custom_module/.gitignore similarity index 100% rename from template/ms_custom_module/.gitignore rename to template/custom_module/.gitignore diff --git a/template/ms_custom_module/.pre-commit-config.yaml b/template/custom_module/.pre-commit-config.yaml similarity index 100% rename from template/ms_custom_module/.pre-commit-config.yaml rename to template/custom_module/.pre-commit-config.yaml diff --git a/template/ms_custom_module/LICENSE b/template/custom_module/LICENSE similarity index 100% rename from template/ms_custom_module/LICENSE rename to template/custom_module/LICENSE diff --git a/template/ms_custom_module/README.rst b/template/custom_module/README.rst similarity index 100% rename from template/ms_custom_module/README.rst rename to template/custom_module/README.rst diff --git a/template/ms_custom_module/__init__.py b/template/custom_module/__init__.py similarity index 100% rename from template/ms_custom_module/__init__.py rename to template/custom_module/__init__.py diff --git a/template/ms_custom_module/__manifest__.py b/template/custom_module/__manifest__.py similarity index 100% rename from template/ms_custom_module/__manifest__.py rename to template/custom_module/__manifest__.py diff --git a/template/ms_custom_module/data/ir_actions.xml b/template/custom_module/data/ir_actions.xml similarity index 100% rename from template/ms_custom_module/data/ir_actions.xml rename to template/custom_module/data/ir_actions.xml diff --git a/template/ms_custom_module/data/ir_sequence.xml b/template/custom_module/data/ir_sequence.xml similarity index 100% rename from template/ms_custom_module/data/ir_sequence.xml rename to template/custom_module/data/ir_sequence.xml diff --git a/template/ms_custom_module/demo/demo.xml b/template/custom_module/demo/demo.xml similarity index 100% rename from template/ms_custom_module/demo/demo.xml rename to template/custom_module/demo/demo.xml diff --git a/template/ms_custom_module/images/screen.png b/template/custom_module/images/screen.png similarity index 100% rename from template/ms_custom_module/images/screen.png rename to template/custom_module/images/screen.png diff --git a/template/ms_custom_module/models/__init__.py b/template/custom_module/models/__init__.py similarity index 100% rename from template/ms_custom_module/models/__init__.py rename to template/custom_module/models/__init__.py diff --git a/template/ms_custom_module/models/models.py b/template/custom_module/models/models.py similarity index 100% rename from template/ms_custom_module/models/models.py rename to template/custom_module/models/models.py diff --git a/template/ms_custom_module/report/invoice_document.xml b/template/custom_module/report/invoice_document.xml similarity index 100% rename from template/ms_custom_module/report/invoice_document.xml rename to template/custom_module/report/invoice_document.xml diff --git a/template/ms_custom_module/security/ir.model.access.csv b/template/custom_module/security/ir.model.access.csv similarity index 100% rename from template/ms_custom_module/security/ir.model.access.csv rename to template/custom_module/security/ir.model.access.csv diff --git a/template/ms_custom_module/static/description/icon.png b/template/custom_module/static/description/icon.png similarity index 100% rename from template/ms_custom_module/static/description/icon.png rename to template/custom_module/static/description/icon.png diff --git a/template/ms_custom_module/static/src/css/style.css b/template/custom_module/static/src/css/style.css similarity index 100% rename from template/ms_custom_module/static/src/css/style.css rename to template/custom_module/static/src/css/style.css diff --git a/template/ms_custom_module/static/src/js/widget.js b/template/custom_module/static/src/js/widget.js similarity index 100% rename from template/ms_custom_module/static/src/js/widget.js rename to template/custom_module/static/src/js/widget.js diff --git a/template/ms_custom_module/views/assets.xml b/template/custom_module/views/assets.xml similarity index 100% rename from template/ms_custom_module/views/assets.xml rename to template/custom_module/views/assets.xml diff --git a/template/ms_custom_module/views/sale_order.xml b/template/custom_module/views/sale_order.xml similarity index 100% rename from template/ms_custom_module/views/sale_order.xml rename to template/custom_module/views/sale_order.xml From e45498a62caae45cdcfc0aac6f8a83ca692c156a Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 30 Jun 2023 13:29:43 +0200 Subject: [PATCH 012/147] ref --- .gitignore | 4 +++- addons/odoo_apps_partner | 2 +- enterprise | 2 +- oca/account-closing | 2 +- oca/account-financial-tools | 2 +- oca/bank-payment | 2 +- oca/bank-statement-import | 2 +- oca/edi | 2 +- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/l10n-switzerland | 2 +- oca/maintenance | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-workflow | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/stock-logistics-warehouse | 2 +- oca/timesheet | 2 +- oca/website | 2 +- odoo | 2 +- 24 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 7b54632e..a812f7e9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,6 @@ public dist =2.0.0 =4.0.0 -origin.dump \ No newline at end of file +origin.dump +filestore +upgraded.dump \ No newline at end of file diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner index e65ce856..74d70583 160000 --- a/addons/odoo_apps_partner +++ b/addons/odoo_apps_partner @@ -1 +1 @@ -Subproject commit e65ce85634569191343a639ad8ac289f58074caf +Subproject commit 74d70583685efca072ebe8f67efab92dbe8c0882 diff --git a/enterprise b/enterprise index c51b2b35..45ec9770 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit c51b2b35ac529c8d2c451ae9b64f63a9c720523c +Subproject commit 45ec977049892f3a57f2c2b28af090810019f713 diff --git a/oca/account-closing b/oca/account-closing index d6992b8b..b1fe911b 160000 --- a/oca/account-closing +++ b/oca/account-closing @@ -1 +1 @@ -Subproject commit d6992b8b55c03f3fc1ca91028f584409594688c2 +Subproject commit b1fe911bc39b5d49b20c81370aa6f71ea0987b79 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index 06f90480..69d5ffe2 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit 06f904801f1b4c8b82d5dd2f1673f64ebe73933e +Subproject commit 69d5ffe23fc65a6fdd242154c6cae91c5f4d5381 diff --git a/oca/bank-payment b/oca/bank-payment index 6ae1a2f0..51221017 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 6ae1a2f0c1b4c272c2277cd5e48cfd96029c10b3 +Subproject commit 51221017407473f6a8ec7f022623ff705556ebc4 diff --git a/oca/bank-statement-import b/oca/bank-statement-import index 6f77ff5f..25ad7bd1 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit 6f77ff5f6c2e034d2f24e3463911f38ce9e72814 +Subproject commit 25ad7bd106789d38cbc0d4c067600769e204d88c diff --git a/oca/edi b/oca/edi index b92e8f48..ace4738e 160000 --- a/oca/edi +++ b/oca/edi @@ -1 +1 @@ -Subproject commit b92e8f482af746870f719598b9ed52da4d34955f +Subproject commit ace4738eec703fcac427a3c3604a56853f80d281 diff --git a/oca/hr-attendance b/oca/hr-attendance index c3557e5a..e65fc058 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit c3557e5af1cb732ab9b3a630b60b3254612270af +Subproject commit e65fc058d5804ebcd0f79e3abac2079897f1046b diff --git a/oca/hr-holidays b/oca/hr-holidays index a831e7cc..d51a8895 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit a831e7cc950d890ed38a977acb6afe23b8f1e08a +Subproject commit d51a8895e798e192b729efadac4ad09396efa24a diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index bb7affa6..eee701f8 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 +Subproject commit eee701f80187b48e2c323b3e0b2c13a0692c73db diff --git a/oca/maintenance b/oca/maintenance index 43d86421..0b4fadf8 160000 --- a/oca/maintenance +++ b/oca/maintenance @@ -1 +1 @@ -Subproject commit 43d8642130713d9ffe0b851386bbf976d4df2aa9 +Subproject commit 0b4fadf8f1fc229767c65aab24dbca619aa0ea8f diff --git a/oca/partner-contact b/oca/partner-contact index f941b2b9..d65d3e67 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit f941b2b9c71d0fa5a92a1092687e968a13e6144d +Subproject commit d65d3e67f98c902f559f727b9ebde8e16fd9bdc8 diff --git a/oca/product-attribute b/oca/product-attribute index b4990c7a..eb9f76cb 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit b4990c7a6dcdcb39112039b20d0e5d0618b11ed9 +Subproject commit eb9f76cb86bacbc1dc2abf35f5c2c490f6782a2e diff --git a/oca/purchase-workflow b/oca/purchase-workflow index 5cbff205..d8bc8390 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit 5cbff2053299e08a2f6ed01f143941560f88b349 +Subproject commit d8bc83905f430b70c5868875833cd6b860073925 diff --git a/oca/reporting-engine b/oca/reporting-engine index 198e9679..940493ae 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 198e96796bfd565eb4d3248342a6b4f2a82e8505 +Subproject commit 940493ae203e066da3e9d5f2e92608fabf123037 diff --git a/oca/rest-framework b/oca/rest-framework index 952f7c36..a2dd9db8 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit 952f7c367a6e36d7bf5eef65cc7dba3a36b1e91a +Subproject commit a2dd9db8ee624dc089eadbcf15e40dcf72528f0b diff --git a/oca/sale-workflow b/oca/sale-workflow index 4e81d759..d124964a 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 4e81d759974a47566e8c42fefef38c704678c091 +Subproject commit d124964acbf8ca7f07feea012bc97537562decbb diff --git a/oca/server-tools b/oca/server-tools index 462a3db5..f4562f61 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 462a3db5d65621d9c3cf76ddb5adec104e25642e +Subproject commit f4562f612a0e229df2ad4d794b02843fd4fbcbf5 diff --git a/oca/server-ux b/oca/server-ux index 28077094..bf11ca10 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit 28077094aedbfc13caabf6ab80c0506d80431db0 +Subproject commit bf11ca102b01137e1457743be9b8092455640599 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index d0e598bb..d430c826 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit d0e598bb65d7029a32010bdb3fb08f3e84559af8 +Subproject commit d430c826a21da6c9bf06628612d377f3c9b455c0 diff --git a/oca/timesheet b/oca/timesheet index 33a49a2c..728f236e 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit 33a49a2c96702af6efda21110d847bd7b5b45047 +Subproject commit 728f236e87c49a6dcb5fbd1599d22212009ea197 diff --git a/oca/website b/oca/website index 6eff3efc..c95ea5eb 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit 6eff3efcf40756e9a63d9e37d272df5f85b289ff +Subproject commit c95ea5eb7115330d8d7c02b5f50078a1c461bdac diff --git a/odoo b/odoo index 9ab5f20a..aaa1c6d0 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 9ab5f20acd83f6840152d7179831cd5171fd3a4a +Subproject commit aaa1c6d02ed5c5fcadc293f0eb4e583676cb4bf9 From a2d4b61c3d679f438647c97efed54682e24d4fc6 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 4 Jul 2023 09:23:05 +0200 Subject: [PATCH 013/147] add pylint config --- .vscode/settings.json | 15 ++++++++------- enterprise | 2 +- odoo | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a32de325..78a780ff 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,12 @@ { - "spellright.language": [ - "en" - ], - "spellright.documentTypes": [ - "markdown", - "latex", - "plaintext" + "python.linting.enabled": true, + "python.linting.pylintArgs": [ + "--load-plugins", + "pylint_odoo" ], + "python.formatting.provider": "black", + "files.exclude": { + "**/*.pyc": true + }, "git.ignoreLimitWarning": true } \ No newline at end of file diff --git a/enterprise b/enterprise index 45ec9770..340bc1bf 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 45ec977049892f3a57f2c2b28af090810019f713 +Subproject commit 340bc1bf43b0ca7940a45e70de87b6c66571b030 diff --git a/odoo b/odoo index aaa1c6d0..7be497ef 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit aaa1c6d02ed5c5fcadc293f0eb4e583676cb4bf9 +Subproject commit 7be497ef47da458499dcf8665f01560bcea2f6e5 From 06173a4030c6b5c8a20d0a60acb3ef2a957c670e Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 4 Jul 2023 16:24:35 +0200 Subject: [PATCH 014/147] lint config --- .gitmodules | 2 +- .vscode/settings.json | 1 + addons/vertical_saas | 2 +- oca/stock-logistics-workflow | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index c4f68e49..f0f5fe20 100644 --- a/.gitmodules +++ b/.gitmodules @@ -204,7 +204,7 @@ branch = 16.0 [submodule "addons/vertical_saas"] path = addons/vertical_saas - url = git@github.com:Mint-System/Odoo-Apps-SaaS.git + url = git@github.com:Mint-System/Odoo-Apps-Vertical-SaaS.git branch = 16.0 [submodule "addons/social"] path = addons/social diff --git a/.vscode/settings.json b/.vscode/settings.json index 78a780ff..d85556c5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { + "python.autoComplete.extraPaths": ["./odoo/odoo", "./odoo/addons"], "python.linting.enabled": true, "python.linting.pylintArgs": [ "--load-plugins", diff --git a/addons/vertical_saas b/addons/vertical_saas index b59de5bf..9ee98d0b 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit b59de5bf5b33bb1b27ba0689254754af04e98bff +Subproject commit 9ee98d0bd45b12e512b06ddd7357ddb876e9d37c diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index f056e030..1256580a 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit f056e0309873bb8c57747cc810de499d296d8837 +Subproject commit 1256580a1ab603e45178fb3dd804989c1f13aad5 From 0574aa0d5d3a6da9e60efd9c3bdde1b6cf093139 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 4 Jul 2023 18:18:39 +0200 Subject: [PATCH 015/147] ref --- addons/vertical_saas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 9ee98d0b..a1afe64d 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 9ee98d0bd45b12e512b06ddd7357ddb876e9d37c +Subproject commit a1afe64d1157f22c0382c465b5ee498cddb60ca9 From ede4431f10e85b50407fa5736cb4dc7d99ca4742 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 5 Jul 2023 16:31:31 +0200 Subject: [PATCH 016/147] new patch --- build/cd.Dockerfile | 6 ++-- .../odoo16_microsoft_outlook_expires_in_patch | 34 +++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100755 scripts/odoo16_microsoft_outlook_expires_in_patch diff --git a/build/cd.Dockerfile b/build/cd.Dockerfile index c8ca2715..3130f921 100644 --- a/build/cd.Dockerfile +++ b/build/cd.Dockerfile @@ -1,7 +1,7 @@ FROM jenkins/jenkins USER root RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive \ - apt-get install --no-install-recommends --assume-yes \ - docker.io +&& DEBIAN_FRONTEND=noninteractive \ +apt-get install --no-install-recommends --assume-yes \ +docker.io USER jenkins \ No newline at end of file diff --git a/scripts/odoo16_microsoft_outlook_expires_in_patch b/scripts/odoo16_microsoft_outlook_expires_in_patch new file mode 100755 index 00000000..6c4f8f32 --- /dev/null +++ b/scripts/odoo16_microsoft_outlook_expires_in_patch @@ -0,0 +1,34 @@ +#!/bin/bash + +# Get script name +SCRIPT=$(basename "$0") + +# First param is docker container +CONTAINER=$1 + +# Default configuration +PACKAGE_PATH="/usr/lib/python3/dist-packages/" + +# Custom configuration +FILE_PATH="${PACKAGE_PATH}odoo/addons/microsoft_outlook/models/microsoft_outlook_mixin.py" +FIND="response\['expires_in'\]," +REPLACE="int(response['expires_in'])," + +# Get filename +FILE=`basename "$FILE_PATH"` + +# Copy from docker +docker cp "$CONTAINER":"$FILE_PATH" . + +# Find and replace +sed -i'' "s/$FIND/$REPLACE/g" $FILE + +# Copy back to docker +docker cp $FILE "$CONTAINER":"$FILE_PATH" + +# Remove file +# rm -f $FILE + +# Register patch installation +echo "Patch $SCRIPT applied." +touch "/etc/odoo/${SCRIPT}_${CONTAINER}_installed" From 1e6e1496a27f6fc387539e1181dcc4f07bb962db Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 5 Jul 2023 16:31:46 +0200 Subject: [PATCH 017/147] ref --- enterprise | 2 +- oca/account-closing | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/bank-payment | 2 +- oca/contract | 2 +- oca/credit-control | 2 +- oca/partner-contact | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/stock-logistics-warehouse | 2 +- oca/timesheet | 2 +- oca/website | 2 +- odoo | 2 +- themes | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/enterprise b/enterprise index 340bc1bf..065a952e 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 340bc1bf43b0ca7940a45e70de87b6c66571b030 +Subproject commit 065a952e26481201fe8178ee91c51bdafa93800c diff --git a/oca/account-closing b/oca/account-closing index b1fe911b..f96036f2 160000 --- a/oca/account-closing +++ b/oca/account-closing @@ -1 +1 @@ -Subproject commit b1fe911bc39b5d49b20c81370aa6f71ea0987b79 +Subproject commit f96036f2725b7e443ab8a456028b3e6410f59d69 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index 69d5ffe2..e642974d 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit 69d5ffe23fc65a6fdd242154c6cae91c5f4d5381 +Subproject commit e642974d15972abc11a573401ba4fae42be9b335 diff --git a/oca/account-invoicing b/oca/account-invoicing index a7d1ea3e..f95c865c 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit a7d1ea3ee2a851d779c0fc1cfd4594f4a5409432 +Subproject commit f95c865c66a0e0e21a4926f1b9113a302b1a2594 diff --git a/oca/bank-payment b/oca/bank-payment index 51221017..1cc068dd 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 51221017407473f6a8ec7f022623ff705556ebc4 +Subproject commit 1cc068dd7ac6c473d6cc086cc52ce46f644bac6a diff --git a/oca/contract b/oca/contract index dbaacd46..5aa4b253 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit dbaacd46775af9c54645629bf093320ae92e7dd4 +Subproject commit 5aa4b253adbb52e55cec94fa0999c5f81793eeb9 diff --git a/oca/credit-control b/oca/credit-control index 672a2217..5b1b8453 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 672a2217e8eb8c1bb3fc3570e9cf4692c2cc6c38 +Subproject commit 5b1b8453d89b3f49171f2b9562fb5ae915a6e475 diff --git a/oca/partner-contact b/oca/partner-contact index d65d3e67..dc19d6a0 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit d65d3e67f98c902f559f727b9ebde8e16fd9bdc8 +Subproject commit dc19d6a06c4c7583b441aac53cb6384a6665c57c diff --git a/oca/purchase-workflow b/oca/purchase-workflow index d8bc8390..ee130ff4 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit d8bc83905f430b70c5868875833cd6b860073925 +Subproject commit ee130ff447d06ee2341b9946767d386735f0d79c diff --git a/oca/reporting-engine b/oca/reporting-engine index 940493ae..9a3b26e0 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 940493ae203e066da3e9d5f2e92608fabf123037 +Subproject commit 9a3b26e0ec5e9e5830f4813f4684af5ecf84f394 diff --git a/oca/rest-framework b/oca/rest-framework index a2dd9db8..83ad8798 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit a2dd9db8ee624dc089eadbcf15e40dcf72528f0b +Subproject commit 83ad8798a2a458f767ec37523aac4aa3315153f7 diff --git a/oca/sale-workflow b/oca/sale-workflow index d124964a..a7c0188a 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit d124964acbf8ca7f07feea012bc97537562decbb +Subproject commit a7c0188aeee0856710a90c40c7941ac8446cbe7d diff --git a/oca/server-auth b/oca/server-auth index 8b7505ca..db19eab7 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit 8b7505cae46f269ea342d06195d1a746382ca120 +Subproject commit db19eab7e7c31c2dba3dbaced00eb98e18aa0548 diff --git a/oca/server-tools b/oca/server-tools index f4562f61..5dcaa3f2 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit f4562f612a0e229df2ad4d794b02843fd4fbcbf5 +Subproject commit 5dcaa3f2bea1c30f3f685f43beaaf4ad563e13d1 diff --git a/oca/server-ux b/oca/server-ux index bf11ca10..99572dbb 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit bf11ca102b01137e1457743be9b8092455640599 +Subproject commit 99572dbb5ea708a901a0f330ba4e61441f3e4cd9 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index d430c826..7d4a3264 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit d430c826a21da6c9bf06628612d377f3c9b455c0 +Subproject commit 7d4a3264df6e034cf0fa1040bf196ad304eb8d90 diff --git a/oca/timesheet b/oca/timesheet index 728f236e..fb3bb704 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit 728f236e87c49a6dcb5fbd1599d22212009ea197 +Subproject commit fb3bb704a21c407f9e17e61f8600dc02c8399f85 diff --git a/oca/website b/oca/website index c95ea5eb..6b45a2cd 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit c95ea5eb7115330d8d7c02b5f50078a1c461bdac +Subproject commit 6b45a2cdfd746440b68d8fb3e54d9168665e1513 diff --git a/odoo b/odoo index 7be497ef..d54bae78 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 7be497ef47da458499dcf8665f01560bcea2f6e5 +Subproject commit d54bae78db25dc62687e3afc64f8699dfbfd5cf8 diff --git a/themes b/themes index f4d818e7..ed2fdd45 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit f4d818e772c50fd557d30221e05a72ac891b7636 +Subproject commit ed2fdd45f2cfeec1aae785ea7d73f43f2ca62cdb From 956210fd7e06d81ee44a1ad2bdfe6450b45d15aa Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 6 Jul 2023 10:32:49 +0200 Subject: [PATCH 018/147] add snippets --- .../sale.view_quotation_tree.show_​payment_term_id.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snippets/sale.view_quotation_tree.show_​payment_term_id.xml diff --git a/snippets/sale.view_quotation_tree.show_​payment_term_id.xml b/snippets/sale.view_quotation_tree.show_​payment_term_id.xml new file mode 100644 index 00000000..1423584d --- /dev/null +++ b/snippets/sale.view_quotation_tree.show_​payment_term_id.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 3c228e426c9e1eb8d524ee2250e38182babedece Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 6 Jul 2023 15:39:22 +0200 Subject: [PATCH 019/147] sync --- ...rt_invoice_document.custom_pament_term.xml | 10 +++ ....report_invoice_document.hide_incoterm.xml | 6 ++ ...ort_invoice_document.hide_payment_term.xml | 6 ++ ....report_invoice_document.move_incoterm.xml | 7 +- ....replace_address_and_information_block.xml | 90 +++++++++++++++++++ ...port_invoice_document.style_carbo_link.xml | 19 ++++ ...et_time_and_material.round_final_total.xml | 7 ++ ...task_view_form.attributes_planned_date.xml | 8 ++ ...e.report_saleorder_document.add_weight.xml | 32 +++++-- ....replace_address_and_information_block.xml | 2 +- ...rt_saleorder_document.style_carbo_link.xml | 16 ++++ ..._blanket_order_form.fiscal_position_id.xml | 8 ++ ..._order.view_blanket_order_form.x_state.xml | 8 ++ ...ort_delivery_document.style_carbo_link.xml | 21 +++++ 14 files changed, 227 insertions(+), 13 deletions(-) create mode 100644 snippets/account.report_invoice_document.custom_pament_term.xml create mode 100644 snippets/account.report_invoice_document.hide_incoterm.xml create mode 100644 snippets/account.report_invoice_document.hide_payment_term.xml create mode 100644 snippets/account.report_invoice_document.replace_address_and_information_block.xml create mode 100644 snippets/account.report_invoice_document.style_carbo_link.xml create mode 100644 snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml create mode 100644 snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml create mode 100644 snippets/sale.report_saleorder_document.style_carbo_link.xml create mode 100644 snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml create mode 100644 snippets/sale_blanket_order.view_blanket_order_form.x_state.xml create mode 100644 snippets/stock.report_delivery_document.style_carbo_link.xml diff --git a/snippets/account.report_invoice_document.custom_pament_term.xml b/snippets/account.report_invoice_document.custom_pament_term.xml new file mode 100644 index 00000000..4ac9af72 --- /dev/null +++ b/snippets/account.report_invoice_document.custom_pament_term.xml @@ -0,0 +1,10 @@ + + + + +

      + Payment terms: +

      +       + +       diff --git a/snippets/account.report_invoice_document.hide_incoterm.xml b/snippets/account.report_invoice_document.hide_incoterm.xml new file mode 100644 index 00000000..210b0379 --- /dev/null +++ b/snippets/account.report_invoice_document.hide_incoterm.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.hide_payment_term.xml b/snippets/account.report_invoice_document.hide_payment_term.xml new file mode 100644 index 00000000..f7a6db0e --- /dev/null +++ b/snippets/account.report_invoice_document.hide_payment_term.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.move_incoterm.xml b/snippets/account.report_invoice_document.move_incoterm.xml index 4f5b23f2..72689579 100644 --- a/snippets/account.report_invoice_document.move_incoterm.xml +++ b/snippets/account.report_invoice_document.move_incoterm.xml @@ -3,10 +3,9 @@ -

      - Incoterm: - - - +

      Incoterm: + + -

      \ No newline at end of file diff --git a/snippets/account.report_invoice_document.replace_address_and_information_block.xml b/snippets/account.report_invoice_document.replace_address_and_information_block.xml new file mode 100644 index 00000000..0865a9c1 --- /dev/null +++ b/snippets/account.report_invoice_document.replace_address_and_information_block.xml @@ -0,0 +1,90 @@ + + + + + + + +
      +
      Customer
      +
      Invoice Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Delivery Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      + + + +
      +
      +
      + + + +
      + + + +
      + + + +in-top:25px"> +
      Your Contact
      +
      Our Contact
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + + + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.style_carbo_link.xml b/snippets/account.report_invoice_document.style_carbo_link.xml new file mode 100644 index 00000000..a7223369 --- /dev/null +++ b/snippets/account.report_invoice_document.style_carbo_link.xml @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml b/snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml new file mode 100644 index 00000000..f450ed5f --- /dev/null +++ b/snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml b/snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml new file mode 100644 index 00000000..cfd521bc --- /dev/null +++ b/snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml @@ -0,0 +1,8 @@ + + + + + False + + + diff --git a/snippets/sale.report_saleorder_document.add_weight.xml b/snippets/sale.report_saleorder_document.add_weight.xml index 1d1288a0..5990ed23 100644 --- a/snippets/sale.report_saleorder_document.add_weight.xml +++ b/snippets/sale.report_saleorder_document.add_weight.xml @@ -1,14 +1,30 @@ - - - Delivery Date + + +
      + Weight       - - - - + +
      + Weight       - + + +
      + + + + +       + + +
      + + + + +       +       \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml b/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml index 440db9ff..5640abb3 100644 --- a/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml +++ b/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml @@ -37,7 +37,7 @@
      - +
      diff --git a/snippets/sale.report_saleorder_document.style_carbo_link.xml b/snippets/sale.report_saleorder_document.style_carbo_link.xml new file mode 100644 index 00000000..b5ec0078 --- /dev/null +++ b/snippets/sale.report_saleorder_document.style_carbo_link.xml @@ -0,0 +1,16 @@ + + + + + + + + "date" + + + \ No newline at end of file diff --git a/snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml b/snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml new file mode 100644 index 00000000..9bbf654e --- /dev/null +++ b/snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale_blanket_order.view_blanket_order_form.x_state.xml b/snippets/sale_blanket_order.view_blanket_order_form.x_state.xml new file mode 100644 index 00000000..94819d1c --- /dev/null +++ b/snippets/sale_blanket_order.view_blanket_order_form.x_state.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.style_carbo_link.xml b/snippets/stock.report_delivery_document.style_carbo_link.xml new file mode 100644 index 00000000..e9f71711 --- /dev/null +++ b/snippets/stock.report_delivery_document.style_carbo_link.xml @@ -0,0 +1,21 @@ + + + + + + + + + "date" + + + + "date" + + + \ No newline at end of file From 2505b82dafa2c01798621cb2fdb543bb37fd476e Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 6 Jul 2023 16:42:09 +0200 Subject: [PATCH 020/147] init new module --- .gitmodules | 4 ++++ addons/vertical_job_portal | 1 + config/odoo-native.conf | 2 +- config/odoo.conf | 2 +- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/l10n-switzerland | 2 +- oca/maintenance | 2 +- 8 files changed, 11 insertions(+), 6 deletions(-) create mode 160000 addons/vertical_job_portal diff --git a/.gitmodules b/.gitmodules index f0f5fe20..25ea743a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -210,3 +210,7 @@ path = addons/social url = git@github.com:Mint-System/Odoo-Apps-Social.git branch = 16.0 +[submodule "addons/vertical_job_portal"] + path = addons/vertical_job_portal + url = git@github.com:sozialinfo/odoo-apps-vertical-job-portal.git + branch = 16.0 diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal new file mode 160000 index 00000000..ebaaeb96 --- /dev/null +++ b/addons/vertical_job_portal @@ -0,0 +1 @@ +Subproject commit ebaaeb96a0f6e90ceab9226ac681b9631b10dd44 diff --git a/config/odoo-native.conf b/config/odoo-native.conf index 6a4b79e0..ce7eb4a8 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social +addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal ; admin_passwd = admin admin_passwd = $pbkdf2-sha512$25000$rlUqpfTe2ztn7P2fcw7BOA$J9DDQN5WeT/.hyYeLNtJTOS6PhOsEbCeIN4iFaynjEY1PjW5zZwYVdR19qOEFVPOkR4HuHLi1EsV.juSjEc90w limit_time_real = 480 diff --git a/config/odoo.conf b/config/odoo.conf index 954dd7ed..d2341651 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social +addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal admin_passwd = admin data_dir = /var/lib/odoo limit_time_real = 480 diff --git a/oca/hr-attendance b/oca/hr-attendance index e65fc058..c2836464 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit e65fc058d5804ebcd0f79e3abac2079897f1046b +Subproject commit c2836464553fa4a84943563d226cab61904dbc1c diff --git a/oca/hr-holidays b/oca/hr-holidays index d51a8895..a831e7cc 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit d51a8895e798e192b729efadac4ad09396efa24a +Subproject commit a831e7cc950d890ed38a977acb6afe23b8f1e08a diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index eee701f8..bb7affa6 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit eee701f80187b48e2c323b3e0b2c13a0692c73db +Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 diff --git a/oca/maintenance b/oca/maintenance index 0b4fadf8..43d86421 160000 --- a/oca/maintenance +++ b/oca/maintenance @@ -1 +1 @@ -Subproject commit 0b4fadf8f1fc229767c65aab24dbca619aa0ea8f +Subproject commit 43d8642130713d9ffe0b851386bbf976d4df2aa9 From e6f384482ef4017a3ea5c5cf5578b647490fdf90 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 7 Jul 2023 11:52:26 +0200 Subject: [PATCH 021/147] new snippets --- ...details_fields.show_firstname_lastname.xml | 15 +++++++++++++++ ....portal_my_details_fields.show_street2.xml | 11 +++++++++++ ...ebsite_sale.address.overwrite_required.xml | 1 - ...e_sale.address.show_firstname_lastname.xml | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 snippets/portal.portal_my_details_fields.show_firstname_lastname.xml create mode 100644 snippets/portal.portal_my_details_fields.show_street2.xml create mode 100644 snippets/website_sale.address.show_firstname_lastname.xml diff --git a/snippets/portal.portal_my_details_fields.show_firstname_lastname.xml b/snippets/portal.portal_my_details_fields.show_firstname_lastname.xml new file mode 100644 index 00000000..9f6cc17b --- /dev/null +++ b/snippets/portal.portal_my_details_fields.show_firstname_lastname.xml @@ -0,0 +1,15 @@ + + + + +
      + + +
      +
      + + +
      +       + +       \ No newline at end of file diff --git a/snippets/portal.portal_my_details_fields.show_street2.xml b/snippets/portal.portal_my_details_fields.show_street2.xml new file mode 100644 index 00000000..2110e54a --- /dev/null +++ b/snippets/portal.portal_my_details_fields.show_street2.xml @@ -0,0 +1,11 @@ + + + + +
      + + +
      +       + +       \ No newline at end of file diff --git a/snippets/website_sale.address.overwrite_required.xml b/snippets/website_sale.address.overwrite_required.xml index 4dad59e4..17885352 100644 --- a/snippets/website_sale.address.overwrite_required.xml +++ b/snippets/website_sale.address.overwrite_required.xml @@ -1,5 +1,4 @@ - diff --git a/snippets/website_sale.address.show_firstname_lastname.xml b/snippets/website_sale.address.show_firstname_lastname.xml new file mode 100644 index 00000000..3f306eae --- /dev/null +++ b/snippets/website_sale.address.show_firstname_lastname.xml @@ -0,0 +1,19 @@ + + + + +
      + + +
      +
      + + +
      +       + + + display: none + + +       From 8e7953512f87f705041fb86e0c1b68ccc610ced5 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 10 Jul 2023 10:09:50 +0200 Subject: [PATCH 022/147] sync --- .vuepress/sidebar.js | 2 +- snippets.md | 2 + snippets/account.md | 146 +++++++++++++++++- ....replace_address_and_information_block.xml | 90 ----------- snippets/base.md | 28 ++++ snippets/industry_fsm_sale.md | 13 ++ snippets/ir_model.md | 24 ++- snippets/portal.md | 40 +++++ snippets/project_enterprise.md | 17 ++ snippets/purchase.md | 104 +++++++++++++ ..._purchaseorder_document.remove_user_id.xml | 7 + ....replace_address_and_information_block.xml | 63 ++++++++ ...urchaseorder_document.style_carbo_link.xml | 16 ++ snippets/sale.md | 90 +++++++---- snippets/sale_blanket_order.md | 28 ++++ snippets/stock.md | 107 +++++++++++++ snippets/website_sale.md | 27 +++- 17 files changed, 674 insertions(+), 130 deletions(-) delete mode 100644 snippets/account.report_invoice_document.replace_address_and_information_block.xml create mode 100644 snippets/portal.md create mode 100644 snippets/project_enterprise.md create mode 100644 snippets/purchase.report_purchaseorder_document.remove_user_id.xml create mode 100644 snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml create mode 100644 snippets/purchase.report_purchaseorder_document.style_carbo_link.xml diff --git a/.vuepress/sidebar.js b/.vuepress/sidebar.js index d1123a77..ccd93562 100644 --- a/.vuepress/sidebar.js +++ b/.vuepress/sidebar.js @@ -1 +1 @@ -export default ['/snippets/account.md','/snippets/account_asset.md','/snippets/account_budget.md','/snippets/account_financial_report.md','/snippets/account_followup.md','/snippets/account_journal_items_report.md','/snippets/account_sale_timesheet_report.md','/snippets/agreement.md','/snippets/agreement_legal.md','/snippets/base.md','/snippets/business_requirement.md','/snippets/calendar.md','/snippets/certificate_planer.md','/snippets/contract.md','/snippets/crm.md','/snippets/crm_iap_lead_enrich.md','/snippets/delivery.md','/snippets/digest.md','/snippets/fleet.md','/snippets/gio_payroll_custom.md','/snippets/helpdesk.md','/snippets/hr.md','/snippets/hr_attendance.md','/snippets/hr_contract.md','/snippets/hr_expense.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/industry_fsm.md','/snippets/industry_fsm_sale.md','/snippets/ir_model.md','/snippets/ir_ui_view.md','/snippets/l10n_ch.md','/snippets/l10n_ch_qr_isr_invoice_import.md','/snippets/mail.md','/snippets/mail_activity_board.md','/snippets/mrp.md','/snippets/mrp_account.md','/snippets/mrp_workorder.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/purchase.md','/snippets/purchase_requisition.md','/snippets/purchase_requisition_send.md','/snippets/res_groups.md','/snippets/sale.md','/snippets/sale_blanket_order.md','/snippets/sale_management.md','/snippets/sale_margin.md','/snippets/sale_order_contact_person.md','/snippets/sale_order_line_date.md','/snippets/sale_order_picking_note.md','/snippets/sale_partner_incoterm.md','/snippets/sale_product_set.md','/snippets/sale_subscription.md','/snippets/stock.md','/snippets/stock_account.md','/snippets/stock_delivery_note.md','/snippets/survey.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',] +export default ['/snippets/account.md','/snippets/account_asset.md','/snippets/account_budget.md','/snippets/account_financial_report.md','/snippets/account_followup.md','/snippets/account_journal_items_report.md','/snippets/account_sale_timesheet_report.md','/snippets/agreement.md','/snippets/agreement_legal.md','/snippets/base.md','/snippets/business_requirement.md','/snippets/calendar.md','/snippets/certificate_planer.md','/snippets/contract.md','/snippets/crm.md','/snippets/crm_iap_lead_enrich.md','/snippets/delivery.md','/snippets/digest.md','/snippets/fleet.md','/snippets/gio_payroll_custom.md','/snippets/helpdesk.md','/snippets/hr.md','/snippets/hr_attendance.md','/snippets/hr_contract.md','/snippets/hr_expense.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/industry_fsm.md','/snippets/industry_fsm_sale.md','/snippets/ir_model.md','/snippets/ir_ui_view.md','/snippets/l10n_ch.md','/snippets/l10n_ch_qr_isr_invoice_import.md','/snippets/mail.md','/snippets/mail_activity_board.md','/snippets/mrp.md','/snippets/mrp_account.md','/snippets/mrp_workorder.md','/snippets/portal.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/project_enterprise.md','/snippets/purchase.md','/snippets/purchase_requisition.md','/snippets/purchase_requisition_send.md','/snippets/res_groups.md','/snippets/sale.md','/snippets/sale_blanket_order.md','/snippets/sale_management.md','/snippets/sale_margin.md','/snippets/sale_order_contact_person.md','/snippets/sale_order_line_date.md','/snippets/sale_order_picking_note.md','/snippets/sale_partner_incoterm.md','/snippets/sale_product_set.md','/snippets/sale_subscription.md','/snippets/stock.md','/snippets/stock_account.md','/snippets/stock_delivery_note.md','/snippets/survey.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',] diff --git a/snippets.md b/snippets.md index e78d4129..7dbf7ca0 100644 --- a/snippets.md +++ b/snippets.md @@ -41,9 +41,11 @@ In Odoo everything is described as an XML document. Snippets are modificatio ## [Mrp](snippets/mrp.md) ## [Mrp Account](snippets/mrp_account.md) ## [Mrp Workorder](snippets/mrp_workorder.md) +## [Portal](snippets/portal.md) ## [Printnode Base](snippets/printnode_base.md) ## [Product](snippets/product.md) ## [Project](snippets/project.md) +## [Project Enterprise](snippets/project_enterprise.md) ## [Purchase](snippets/purchase.md) ## [Purchase Requisition](snippets/purchase_requisition.md) ## [Purchase Requisition Send](snippets/purchase_requisition_send.md) diff --git a/snippets/account.md b/snippets/account.md index 18e33cb4..bebfdd1f 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -405,6 +405,23 @@ ID: `mint_system.account.report_invoice_document.custom_address` ``` Source: [snippets/account.report_invoice_document.custom_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.custom_address.xml) +### Custom Pament Term +ID: `mint_system.account.report_invoice_document.custom_pament_term` +```xml + + + + +

      + Payment terms: +

      +       + +       + +``` +Source: [snippets/account.report_invoice_document.custom_pament_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.custom_pament_term.xml) + ### Custom Taxes ID: `mint_system.account.report_invoice_document.custom_taxes` ```xml @@ -826,6 +843,30 @@ ID: `mint_system.account.report_invoice_document.group_by_sale_order` ``` Source: [snippets/account.report_invoice_document.group_by_sale_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.group_by_sale_order.xml) +### Hide Incoterm +ID: `mint_system.account.report_invoice_document.hide_incoterm` +```xml + + + + + + +``` +Source: [snippets/account.report_invoice_document.hide_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.hide_incoterm.xml) + +### Hide Payment Term +ID: `mint_system.account.report_invoice_document.hide_payment_term` +```xml + + + + + + +``` +Source: [snippets/account.report_invoice_document.hide_payment_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.hide_payment_term.xml) + ### Margin After Title ID: `mint_system.account.report_invoice_document.margin_after_title` ```xml @@ -998,10 +1039,9 @@ ID: `mint_system.account.report_invoice_document.move_incoterm` -

      - Incoterm: - - - +

      Incoterm: + + -

      @@ -2046,6 +2086,31 @@ ID: `mint_system.account.report_invoice_document.show_shipping_address` ``` Source: [snippets/account.report_invoice_document.show_shipping_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_shipping_address.xml) +### Style Carbo Link +ID: `mint_system.account.report_invoice_document.style_carbo_link` +```xml + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_carbo_link.xml) + ### Style Trimada ID: `mint_system.account.report_invoice_document.style_trimada` ```xml @@ -2638,6 +2703,23 @@ ID: `mint_system.account.report_invoice_document.custom_address` ``` Source: [snippets/account.report_invoice_document.custom_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.custom_address.xml) +### Custom Pament Term +ID: `mint_system.account.report_invoice_document.custom_pament_term` +```xml + + + + +

      + Payment terms: +

      +       + +       + +``` +Source: [snippets/account.report_invoice_document.custom_pament_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.custom_pament_term.xml) + ### Custom Taxes ID: `mint_system.account.report_invoice_document.custom_taxes` ```xml @@ -3059,6 +3141,30 @@ ID: `mint_system.account.report_invoice_document.group_by_sale_order` ``` Source: [snippets/account.report_invoice_document.group_by_sale_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.group_by_sale_order.xml) +### Hide Incoterm +ID: `mint_system.account.report_invoice_document.hide_incoterm` +```xml + + + + + + +``` +Source: [snippets/account.report_invoice_document.hide_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.hide_incoterm.xml) + +### Hide Payment Term +ID: `mint_system.account.report_invoice_document.hide_payment_term` +```xml + + + + + + +``` +Source: [snippets/account.report_invoice_document.hide_payment_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.hide_payment_term.xml) + ### Margin After Title ID: `mint_system.account.report_invoice_document.margin_after_title` ```xml @@ -3231,10 +3337,9 @@ ID: `mint_system.account.report_invoice_document.move_incoterm` -

      - Incoterm: - - - +

      Incoterm: + + -

      @@ -4279,6 +4384,31 @@ ID: `mint_system.account.report_invoice_document.show_shipping_address` ``` Source: [snippets/account.report_invoice_document.show_shipping_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_shipping_address.xml) +### Style Carbo Link +ID: `mint_system.account.report_invoice_document.style_carbo_link` +```xml + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_carbo_link.xml) + ### Style Trimada ID: `mint_system.account.report_invoice_document.style_trimada` ```xml diff --git a/snippets/account.report_invoice_document.replace_address_and_information_block.xml b/snippets/account.report_invoice_document.replace_address_and_information_block.xml deleted file mode 100644 index 0865a9c1..00000000 --- a/snippets/account.report_invoice_document.replace_address_and_information_block.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - -
      -
      Customer
      -
      Invoice Address
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      Delivery Address
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      - - - -
      -
      -
      - - - -
      - - - -
      - - - -in-top:25px"> -
      Your Contact
      -
      Our Contact
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - - - - \ No newline at end of file diff --git a/snippets/base.md b/snippets/base.md index 2e1830a4..1314e272 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -291,6 +291,19 @@ ID: `mint_system.base.view_partner_form.add_display_name` ``` Source: [snippets/base.view_partner_form.add_display_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.add_display_name.xml) +### Move Company Registry +ID: `mint_system.base.view_partner_form.move_company_registry` +```xml + + + + + + + +``` +Source: [snippets/base.view_partner_form.move_company_registry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_company_registry.xml) + ### Move Ref ID: `mint_system.base.view_partner_form.move_ref` ```xml @@ -368,6 +381,21 @@ ID: `mint_system.base.view_partner_form.x_created_on` ``` Source: [snippets/base.view_partner_form.x_created_on.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_created_on.xml) +### X Eori +ID: `mint_system.base.view_partner_form.x_eori` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_form.x_eori.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_eori.xml) + ### X External Ref ID: `mint_system.base.view_partner_form.x_external_ref` ```xml diff --git a/snippets/industry_fsm_sale.md b/snippets/industry_fsm_sale.md index 60e2ca3f..df571f51 100644 --- a/snippets/industry_fsm_sale.md +++ b/snippets/industry_fsm_sale.md @@ -90,6 +90,19 @@ ID: `mint_system.industry_fsm_sale.worksheet_time_and_material.replace_product_d ``` Source: [snippets/industry_fsm_sale.worksheet_time_and_material.replace_product_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/industry_fsm_sale.worksheet_time_and_material.replace_product_description.xml) +### Round Final Total +ID: `mint_system.industry_fsm_sale.worksheet_time_and_material.round_final_total` +```xml + + + + + + + +``` +Source: [snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml) + ### Style Moser ID: `mint_system.industry_fsm_sale.worksheet_time_and_material.style_moser` ```xml diff --git a/snippets/ir_model.md b/snippets/ir_model.md index 958b0594..aa31ab63 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -1607,7 +1607,7 @@ ID: `mint_system.ir_model.res_partner.x_birthdate` Geburtstag res.partner - + x_birthdate @@ -1642,6 +1642,28 @@ ID: `mint_system.ir_model.res_partner.x_created_on` ``` Source: [snippets/ir_model.res_partner.x_created_on.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_created_on.xml) +### X Eori +ID: `mint_system.ir_model.res_partner.x_eori` +```xml + + + + + [] + EORI + res.partner + + x_eori + + + + char + + + +``` +Source: [snippets/ir_model.res_partner.x_eori.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_eori.xml) + ### X External Ref ID: `mint_system.ir_model.res_partner.x_external_ref` ```xml diff --git a/snippets/portal.md b/snippets/portal.md new file mode 100644 index 00000000..5171187e --- /dev/null +++ b/snippets/portal.md @@ -0,0 +1,40 @@ +# Portal +## Portal My Details Fields +### Show Firstname Lastname +ID: `mint_system.portal.portal_my_details_fields.show_firstname_lastname` +```xml + + + + +
      + + +
      +
      + + +
      +       + +       +``` +Source: [snippets/portal.portal_my_details_fields.show_firstname_lastname.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/portal.portal_my_details_fields.show_firstname_lastname.xml) + +### Show Street2 +ID: `mint_system.portal.portal_my_details_fields.show_street2` +```xml + + + + +
      + + +
      +       + +       +``` +Source: [snippets/portal.portal_my_details_fields.show_street2.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/portal.portal_my_details_fields.show_street2.xml) + diff --git a/snippets/project_enterprise.md b/snippets/project_enterprise.md new file mode 100644 index 00000000..93989580 --- /dev/null +++ b/snippets/project_enterprise.md @@ -0,0 +1,17 @@ +# Project Enterprise +## Project Task View Form +### Attributes Planned Date +ID: `mint_system.project_enterprise.project_task_view_form.attributes_planned_date` +```xml + + + + + False + + + + +``` +Source: [snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml) + diff --git a/snippets/purchase.md b/snippets/purchase.md index 38da0956..55849861 100644 --- a/snippets/purchase.md +++ b/snippets/purchase.md @@ -902,6 +902,19 @@ ID: `mint_system.purchase.report_purchaseorder_document.remove_taxes` ``` Source: [snippets/purchase.report_purchaseorder_document.remove_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.remove_taxes.xml) +### Remove User Id +ID: `mint_system.purchase.report_purchaseorder_document.remove_user_id` +```xml + + + + + + + +``` +Source: [snippets/purchase.report_purchaseorder_document.remove_user_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.remove_user_id.xml) + ### Remove Vat ID: `mint_system.purchase.report_purchaseorder_document.remove_vat` ```xml @@ -937,6 +950,75 @@ ID: `mint_system.purchase.report_purchaseorder_document.rename_deadline` ``` Source: [snippets/purchase.report_purchaseorder_document.rename_deadline.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.rename_deadline.xml) +### Replace Address And Information Block +ID: `mint_system.purchase.report_purchaseorder_document.replace_address_and_information_block` +```xml + + + + + + + +
      +
      Vendor
      +
      Invoice Address
      +
      + +
      +
      + + +
      +
      + + +
      +
      + +
      +
      Delivery Address
      +
      + +
      +
      +
      + +
      + + +
      +
      + +
      +
      Your Contact
      +
      Our Contact
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +       + +       +``` +Source: [snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml) + ### Replace Informations ID: `mint_system.purchase.report_purchaseorder_document.replace_informations` ```xml @@ -1214,6 +1296,28 @@ ID: `mint_system.purchase.report_purchaseorder_document.show_seller_product` ``` Source: [snippets/purchase.report_purchaseorder_document.show_seller_product.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.show_seller_product.xml) +### Style Carbo Link +ID: `mint_system.purchase.report_purchaseorder_document.style_carbo_link` +```xml + + + + + + + + "date" + + + +``` +Source: [snippets/purchase.report_purchaseorder_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml) + ### Style Moser ID: `mint_system.purchase.report_purchaseorder_document.style_moser` ```xml diff --git a/snippets/purchase.report_purchaseorder_document.remove_user_id.xml b/snippets/purchase.report_purchaseorder_document.remove_user_id.xml new file mode 100644 index 00000000..23ba235c --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.remove_user_id.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml b/snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml new file mode 100644 index 00000000..a188203b --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml @@ -0,0 +1,63 @@ + + + + + + + +
      +
      Vendor
      +
      Invoice Address
      +
      + +
      +
      + + +
      +
      + + +
      +
      + +
      +
      Delivery Address
      +
      + +
      +
      +
      + +
      + + +
      +
      + +
      +
      Your Contact
      +
      Our Contact
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +       + +       \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml b/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml new file mode 100644 index 00000000..18e13904 --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml @@ -0,0 +1,16 @@ + + + + + + + + "date" + + + \ No newline at end of file diff --git a/snippets/sale.md b/snippets/sale.md index dce60ea2..56fc6f84 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -848,26 +848,6 @@ ID: `mint_system.sale.report_saleorder_document.add_default_code` ``` Source: [snippets/sale.report_saleorder_document.add_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_default_code.xml) -### Add Delivery Dates -ID: `mint_system.sale.report_saleorder_document.add_delivery_dates` -```xml - - - - - Delivery Date - - - - - - - - - -``` -Source: [snippets/sale.report_saleorder_document.add_delivery_dates.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_delivery_dates.xml) - ### Add Delivery Date ID: `mint_system.sale.report_saleorder_document.add_delivery_date` ```xml @@ -1414,17 +1394,33 @@ ID: `mint_system.sale.report_saleorder_document.add_weight` ```xml - - - Delivery Date + + +
      + Weight       - - - - + +
      + Weight       - + + +
      + + + + +       + + +
      + + + + +       +       ``` Source: [snippets/sale.report_saleorder_document.add_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_weight.xml) @@ -2012,7 +2008,7 @@ ID: `mint_system.sale.report_saleorder_document.replace_address_and_information_
      - +
      @@ -2609,6 +2605,28 @@ ID: `mint_system.sale.report_saleorder_document.show_qty_remaining` ``` Source: [snippets/sale.report_saleorder_document.show_qty_remaining.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.show_qty_remaining.xml) +### Style Carbo Link +ID: `mint_system.sale.report_saleorder_document.style_carbo_link` +```xml + + + + + + + + "date" + + + +``` +Source: [snippets/sale.report_saleorder_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_carbo_link.xml) + ### Style Gelso ID: `mint_system.sale.report_saleorder_document.style_gelso` ```xml @@ -4100,6 +4118,20 @@ ID: `mint_system.sale.view_quotation_tree.replace_create_date` ``` Source: [snippets/sale.view_quotation_tree.replace_create_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.replace_create_date.xml) +### Show ​Payment Term Id +ID: `mint_system.sale.view_quotation_tree.show_​payment_term_id` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_quotation_tree.show_​payment_term_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_​payment_term_id.xml) + ## View Sales Order Filter ### Add Invoice Status ID: `mint_system.sale.view_sales_order_filter.add_invoice_status` diff --git a/snippets/sale_blanket_order.md b/snippets/sale_blanket_order.md index 67fb3f86..d52f59f3 100644 --- a/snippets/sale_blanket_order.md +++ b/snippets/sale_blanket_order.md @@ -880,6 +880,20 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.title_margin` Source: [snippets/sale_blanket_order.report_blanketorder_document.title_margin.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.title_margin.xml) ## View Blanket Order Form +### Fiscal Position Id +ID: `mint_system.sale_blanket_order.view_blanket_order_form.fiscal_position_id` +```xml + + + + + + + + +``` +Source: [snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml) + ### Modify Attributes Date Confirmed ID: `mint_system.sale_blanket_order.view_blanket_order_form.modify_attributes_date_confirmed` ```xml @@ -912,6 +926,20 @@ ID: `mint_system.sale_blanket_order.view_blanket_order_form.x_product_uom_catego ``` Source: [snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml) +### X State +ID: `mint_system.sale_blanket_order.view_blanket_order_form.x_state` +```xml + + + + + + + + +``` +Source: [snippets/sale_blanket_order.view_blanket_order_form.x_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.x_state.xml) + ## View Blanket Order Search ### Replace Filter ID: `mint_system.sale_blanket_order.view_blanket_order_search.replace_filter` diff --git a/snippets/stock.md b/snippets/stock.md index 90a1ce1e..4c4050fa 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -2089,6 +2089,86 @@ ID: `mint_system.stock.report_delivery_document.remove_informations` ``` Source: [snippets/stock.report_delivery_document.remove_informations.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.remove_informations.xml) +### Replace Address And Information Block +ID: `mint_system.stock.report_delivery_document.replace_address_and_information_block` +```xml + + + + + + + + Carbo-Link AG | Undermülistrasse 25 | CH 8320 Fehraltorf + +
      +
      Delivery Address
      +
      Customer
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Invoice Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Your Contact
      +
      Our Contact
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +       + +       +``` +Source: [snippets/stock.report_delivery_document.replace_address_and_information_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_address_and_information_block.xml) + ### Replace Description Sale ID: `mint_system.stock.report_delivery_document.replace_description_sale` ```xml @@ -2891,6 +2971,33 @@ ID: `mint_system.stock.report_delivery_document.sort_by_position` ``` Source: [snippets/stock.report_delivery_document.sort_by_position.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.sort_by_position.xml) +### Style Carbo Link +ID: `mint_system.stock.report_delivery_document.style_carbo_link` +```xml + + + + + + + + + "date" + + + + "date" + + + +``` +Source: [snippets/stock.report_delivery_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.style_carbo_link.xml) + ### Style Tissa ID: `mint_system.stock.report_delivery_document.style_tissa` ```xml diff --git a/snippets/website_sale.md b/snippets/website_sale.md index b4e8f962..ebd90c27 100644 --- a/snippets/website_sale.md +++ b/snippets/website_sale.md @@ -4,7 +4,6 @@ ID: `mint_system.website_sale.address.overwrite_required` ```xml - @@ -36,6 +35,32 @@ ID: `mint_system.website_sale.address.overwrite_required` ``` Source: [snippets/website_sale.address.overwrite_required.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.address.overwrite_required.xml) +### Show Firstname Lastname +ID: `mint_system.website_sale.address.show_firstname_lastname` +```xml + + + + +
      + + +
      +
      + + +
      +       + + + display: none + + +       + +``` +Source: [snippets/website_sale.address.show_firstname_lastname.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.address.show_firstname_lastname.xml) + ## Products Categories ### Bigger Categories Button ID: `mint_system.website_sale.products_categories.bigger_categories_button` From 8d773a808b17a059c0b4d0d99e349f32b77e3812 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 11 Jul 2023 12:55:46 +0200 Subject: [PATCH 023/147] sync --- template/custom_module/models/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/custom_module/models/models.py b/template/custom_module/models/models.py index 973f66ed..c3889bea 100644 --- a/template/custom_module/models/models.py +++ b/template/custom_module/models/models.py @@ -1,5 +1,5 @@ -from odoo import _, api, fields, models import logging +from odoo import _, api, fields, models _logger = logging.getLogger(__name__) From 7e500f5b7e0a43e6e5a00d71dce7883bcdb5ed42 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 11 Jul 2023 12:55:50 +0200 Subject: [PATCH 024/147] ref --- addons/sale_workflow | 2 +- addons/vertical_job_portal | 2 +- addons/vertical_saas | 2 +- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/stock-logistics-workflow | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/sale_workflow b/addons/sale_workflow index 2778c59d..a67cce6f 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit 2778c59ddfcd558f71b98d3813b29849375f5a4d +Subproject commit a67cce6f5005f3ce185dd4a5833bdd9ad8857072 diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index ebaaeb96..75b4e1dc 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit ebaaeb96a0f6e90ceab9226ac681b9631b10dd44 +Subproject commit 75b4e1dc9248752d5b9cf8c7f84e25cf1ef5b2d4 diff --git a/addons/vertical_saas b/addons/vertical_saas index a1afe64d..d4228227 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit a1afe64d1157f22c0382c465b5ee498cddb60ca9 +Subproject commit d4228227afb0bab9d914ac548bdbe29fd74e08a8 diff --git a/oca/hr-attendance b/oca/hr-attendance index c2836464..96b8dbcc 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit c2836464553fa4a84943563d226cab61904dbc1c +Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 diff --git a/oca/hr-holidays b/oca/hr-holidays index a831e7cc..3211429e 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit a831e7cc950d890ed38a977acb6afe23b8f1e08a +Subproject commit 3211429e61490107d128e9859b79bc113312143e diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index 1256580a..81df8d1b 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit 1256580a1ab603e45178fb3dd804989c1f13aad5 +Subproject commit 81df8d1b936b8897be7588f70e450f0373a0383a From a24892cb57c594f4a6ab3b65f22cddde6d4a9a19 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 12 Jul 2023 08:55:48 +0200 Subject: [PATCH 025/147] ref --- ...port_invoice_document.style_carbo_link.xml | 3 + ...nt.report_invoice_document.style_tissa.xml | 30 +++++ ...voice_document.tissa_replace_infotable.xml | 103 +++++++++++++++ ...urchaseorder_document.style_carbo_link.xml | 7 + ...rt_saleorder_document.add_intrastat_id.xml | 35 +++-- ...ort_saleorder_document.add_product_uom.xml | 13 ++ ....report_saleorder_document.style_tissa.xml | 74 +++++++++++ ...ketorder_document.remove_date_schedule.xml | 8 ++ ...anketorder_document.replace_product_id.xml | 8 ++ ...ck.report_delivery_document.add_weight.xml | 17 +++ ...delivery_document.hide_product_uom_qty.xml | 5 + .../stock.report_picking_document_tissa.xml | 123 ++++++++++++++++++ ....external_layout_standard.tissa_layout.xml | 52 ++++++++ 13 files changed, 465 insertions(+), 13 deletions(-) create mode 100644 snippets/account.report_invoice_document.style_tissa.xml create mode 100644 snippets/account.report_invoice_document.tissa_replace_infotable.xml create mode 100644 snippets/sale.report_saleorder_document.add_product_uom.xml create mode 100644 snippets/sale.report_saleorder_document.style_tissa.xml create mode 100644 snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml create mode 100644 snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml create mode 100644 snippets/stock.report_delivery_document.add_weight.xml create mode 100644 snippets/stock.report_delivery_document.hide_product_uom_qty.xml create mode 100644 snippets/stock.report_picking_document_tissa.xml create mode 100644 snippets/web.external_layout_standard.tissa_layout.xml diff --git a/snippets/account.report_invoice_document.style_carbo_link.xml b/snippets/account.report_invoice_document.style_carbo_link.xml index a7223369..898f804c 100644 --- a/snippets/account.report_invoice_document.style_carbo_link.xml +++ b/snippets/account.report_invoice_document.style_carbo_link.xml @@ -13,6 +13,9 @@ #total { margin-bottom: 2rem; } + h2 { + font-size: 1.5rem; + }       diff --git a/snippets/account.report_invoice_document.style_tissa.xml b/snippets/account.report_invoice_document.style_tissa.xml new file mode 100644 index 00000000..ab7e9462 --- /dev/null +++ b/snippets/account.report_invoice_document.style_tissa.xml @@ -0,0 +1,30 @@ + + + + + + + + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + + diff --git a/snippets/account.report_invoice_document.tissa_replace_infotable.xml b/snippets/account.report_invoice_document.tissa_replace_infotable.xml new file mode 100644 index 00000000..27678e59 --- /dev/null +++ b/snippets/account.report_invoice_document.tissa_replace_infotable.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + Kundennummer: + + + + Datum: + + +
      + USt-IdNr: + + + Unser Auftrag: + + + / + + +
      EORI-Nummer: + + Abruf: + + + / + +
      Ihre Bestellung: + + Kundenbetreuer/in: + +
      + + Sachbearbeiter/in: + +
      + MwSt-Nr: + + CHE-103.327.797 MWST +
      +       +       \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml b/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml index 18e13904..cb7fbfd4 100644 --- a/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml +++ b/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml @@ -6,9 +6,16 @@ font-family: Dobra-Book; font-size: 80%; } + h2 { + font-size: 1.5rem; + } + + "date" + + "date" diff --git a/snippets/sale.report_saleorder_document.add_intrastat_id.xml b/snippets/sale.report_saleorder_document.add_intrastat_id.xml index 0745cdeb..209b3eec 100644 --- a/snippets/sale.report_saleorder_document.add_intrastat_id.xml +++ b/snippets/sale.report_saleorder_document.add_intrastat_id.xml @@ -1,14 +1,23 @@ - - - - - HS Code - - - - - - - - + + + + + + + + text-right align-text-top + + + + "date" + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.add_product_uom.xml b/snippets/sale.report_saleorder_document.add_product_uom.xml new file mode 100644 index 00000000..1c77fea9 --- /dev/null +++ b/snippets/sale.report_saleorder_document.add_product_uom.xml @@ -0,0 +1,13 @@ + + + + ME + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.style_tissa.xml b/snippets/sale.report_saleorder_document.style_tissa.xml new file mode 100644 index 00000000..8c48fbe1 --- /dev/null +++ b/snippets/sale.report_saleorder_document.style_tissa.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + text-right + + + + diff --git a/snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml b/snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml new file mode 100644 index 00000000..691533a8 --- /dev/null +++ b/snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml new file mode 100644 index 00000000..7cb53df4 --- /dev/null +++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml @@ -0,0 +1,8 @@ + +> + + + + + + diff --git a/snippets/stock.report_delivery_document.add_weight.xml b/snippets/stock.report_delivery_document.add_weight.xml new file mode 100644 index 00000000..42c1068a --- /dev/null +++ b/snippets/stock.report_delivery_document.add_weight.xml @@ -0,0 +1,17 @@ + + + + + + Weight + + + + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.hide_product_uom_qty.xml b/snippets/stock.report_delivery_document.hide_product_uom_qty.xml new file mode 100644 index 00000000..8255d155 --- /dev/null +++ b/snippets/stock.report_delivery_document.hide_product_uom_qty.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/snippets/stock.report_picking_document_tissa.xml b/snippets/stock.report_picking_document_tissa.xml new file mode 100644 index 00000000..22793c90 --- /dev/null +++ b/snippets/stock.report_picking_document_tissa.xml @@ -0,0 +1,123 @@ + + + + +
      + + + +
      +
      + +
      +
      + +
      + + - + + + +
      +
      + + + + + + + +
      + + + Barcode +
      + + + + + + + + + + +
      NameLieferantBeschreibung
      + + + + + +
      + + + + + + +
      + + + Barcode +
      + + + + + + + + + + + + + +
      + + + + Barcode +
      + + Spulen +
      + Einlagerungsdatum: + +
      + +

      + + + \ No newline at end of file diff --git a/snippets/web.external_layout_standard.tissa_layout.xml b/snippets/web.external_layout_standard.tissa_layout.xml new file mode 100644 index 00000000..9aeb5698 --- /dev/null +++ b/snippets/web.external_layout_standard.tissa_layout.xml @@ -0,0 +1,52 @@ + + +

      +
      +
      + Logo +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      + + +
      + +
      + +
      +
      +
        + +
        • +
        • +
        • +
      • :
        • +
      + +
      + +
      + +
      + Page: / +
      +
      +
      + + + \ No newline at end of file From 0cda7ad697b781eb3452e34d0146162da99a3a97 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 12 Jul 2023 10:34:54 +0200 Subject: [PATCH 026/147] update custom module and linting files --- addons/odoo_apps_partner | 2 +- addons/partner_contact | 2 +- addons/product_attribute | 2 +- addons/project | 2 +- addons/sale_workflow | 2 +- addons/server_tools | 2 +- addons/social | 2 +- addons/vertical_job_portal | 2 +- addons/vertical_saas | 2 +- addons/website | 2 +- enterprise | 2 +- oca/account-closing | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/bank-payment | 2 +- oca/bank-statement-import | 2 +- oca/credit-control | 2 +- oca/edi | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/server-backend | 2 +- oca/timesheet | 2 +- oca/website | 2 +- odoo | 2 +- task | 18 ++- template/.flake8 | 12 ++ template/{custom_module => }/.gitignore | 0 template/.isort.cfg | 13 ++ .../.pre-commit-config.yaml | 34 +++-- template/.pylintrc | 121 ++++++++++++++++++ template/{custom_module => module}/LICENSE | 0 template/{custom_module => module}/README.rst | 0 .../{custom_module => module}/__init__.py | 0 .../{custom_module => module}/__manifest__.py | 0 .../data/ir_actions.xml | 0 .../data/ir_sequence.xml | 0 .../{custom_module => module}/demo/demo.xml | 0 .../images/screen.png | Bin .../models/__init__.py | 0 .../models/models.py | 0 .../report/invoice_document.xml | 0 .../security/ir.model.access.csv | 0 .../static/description/icon.png | Bin .../static/src/css/style.css | 0 .../static/src/js/widget.js | 0 .../views/assets.xml | 0 .../views/sale_order.xml | 0 49 files changed, 204 insertions(+), 46 deletions(-) create mode 100644 template/.flake8 rename template/{custom_module => }/.gitignore (100%) create mode 100644 template/.isort.cfg rename template/{custom_module => }/.pre-commit-config.yaml (80%) create mode 100644 template/.pylintrc rename template/{custom_module => module}/LICENSE (100%) rename template/{custom_module => module}/README.rst (100%) rename template/{custom_module => module}/__init__.py (100%) rename template/{custom_module => module}/__manifest__.py (100%) rename template/{custom_module => module}/data/ir_actions.xml (100%) rename template/{custom_module => module}/data/ir_sequence.xml (100%) rename template/{custom_module => module}/demo/demo.xml (100%) rename template/{custom_module => module}/images/screen.png (100%) rename template/{custom_module => module}/models/__init__.py (100%) rename template/{custom_module => module}/models/models.py (100%) rename template/{custom_module => module}/report/invoice_document.xml (100%) rename template/{custom_module => module}/security/ir.model.access.csv (100%) rename template/{custom_module => module}/static/description/icon.png (100%) rename template/{custom_module => module}/static/src/css/style.css (100%) rename template/{custom_module => module}/static/src/js/widget.js (100%) rename template/{custom_module => module}/views/assets.xml (100%) rename template/{custom_module => module}/views/sale_order.xml (100%) diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner index 74d70583..b3fd3ddc 160000 --- a/addons/odoo_apps_partner +++ b/addons/odoo_apps_partner @@ -1 +1 @@ -Subproject commit 74d70583685efca072ebe8f67efab92dbe8c0882 +Subproject commit b3fd3ddcb6a489966387901b6c360b03c54b1cc4 diff --git a/addons/partner_contact b/addons/partner_contact index 7cde1181..aedc2a9d 160000 --- a/addons/partner_contact +++ b/addons/partner_contact @@ -1 +1 @@ -Subproject commit 7cde11812955be1b96b7e4373a6bc316f124d69d +Subproject commit aedc2a9dde8f0cc3cf1f5243f10393cecb239333 diff --git a/addons/product_attribute b/addons/product_attribute index 04258d5c..287f5595 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit 04258d5c91db528982882398e659b21a9a4ec52b +Subproject commit 287f559562504aa6a5859195f4ab2aa5886d11c1 diff --git a/addons/project b/addons/project index 9a918d22..ecccf10e 160000 --- a/addons/project +++ b/addons/project @@ -1 +1 @@ -Subproject commit 9a918d227aa6ef638d8fcc010218b166a6a3f601 +Subproject commit ecccf10ee9deabc3506f32202b9076849fc683a2 diff --git a/addons/sale_workflow b/addons/sale_workflow index a67cce6f..c7e5482b 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit a67cce6f5005f3ce185dd4a5833bdd9ad8857072 +Subproject commit c7e5482be8c6cbfa9cd54fbbe721c162a971bbf4 diff --git a/addons/server_tools b/addons/server_tools index 44134c7c..381ff99b 160000 --- a/addons/server_tools +++ b/addons/server_tools @@ -1 +1 @@ -Subproject commit 44134c7c6f699261225789f7e17fcf7f0ca9ff53 +Subproject commit 381ff99b7cf98d46799113e0384c164dc3c6aedd diff --git a/addons/social b/addons/social index 74f8c777..2bd69fcc 160000 --- a/addons/social +++ b/addons/social @@ -1 +1 @@ -Subproject commit 74f8c7778daf863a3938d179a72cc0e248083044 +Subproject commit 2bd69fcc760eac3de3c27c5a90f93d36253e53ef diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 75b4e1dc..2347edbb 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 75b4e1dc9248752d5b9cf8c7f84e25cf1ef5b2d4 +Subproject commit 2347edbb0fd751042ac9e8c8cf64dad47093c2f5 diff --git a/addons/vertical_saas b/addons/vertical_saas index d4228227..08e169d5 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit d4228227afb0bab9d914ac548bdbe29fd74e08a8 +Subproject commit 08e169d5e7fe3168eaa6355453c6ffa90f86e4c1 diff --git a/addons/website b/addons/website index 43cc4a86..8b7f3dcd 160000 --- a/addons/website +++ b/addons/website @@ -1 +1 @@ -Subproject commit 43cc4a86d797f55413cd6c617a58c39702d611d5 +Subproject commit 8b7f3dcd300ff406bb9564cca0b29d3fcf4eab17 diff --git a/enterprise b/enterprise index 065a952e..adfe654f 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 065a952e26481201fe8178ee91c51bdafa93800c +Subproject commit adfe654f14fe1cf962e7a8151df6bb47162391be diff --git a/oca/account-closing b/oca/account-closing index f96036f2..ab30edc2 160000 --- a/oca/account-closing +++ b/oca/account-closing @@ -1 +1 @@ -Subproject commit f96036f2725b7e443ab8a456028b3e6410f59d69 +Subproject commit ab30edc2aca805805ff91283344d81313d993c9c diff --git a/oca/account-financial-tools b/oca/account-financial-tools index e642974d..8f520483 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit e642974d15972abc11a573401ba4fae42be9b335 +Subproject commit 8f520483b9477206d4ecc4c330bd848c57a4a776 diff --git a/oca/account-invoicing b/oca/account-invoicing index f95c865c..c2cfb66a 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit f95c865c66a0e0e21a4926f1b9113a302b1a2594 +Subproject commit c2cfb66a7a68302c2740adf91d0798d0c90e6b79 diff --git a/oca/bank-payment b/oca/bank-payment index 1cc068dd..eb35cd19 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 1cc068dd7ac6c473d6cc086cc52ce46f644bac6a +Subproject commit eb35cd1919f3b5f1d512e3d9de6f3de5c5bc6a2c diff --git a/oca/bank-statement-import b/oca/bank-statement-import index 25ad7bd1..6befd80a 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit 25ad7bd106789d38cbc0d4c067600769e204d88c +Subproject commit 6befd80a2f383cc8618544924a1471ba9e78f9a1 diff --git a/oca/credit-control b/oca/credit-control index 5b1b8453..112aaf66 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 5b1b8453d89b3f49171f2b9562fb5ae915a6e475 +Subproject commit 112aaf66ea268d2fa1000092139a02f63cf1f473 diff --git a/oca/edi b/oca/edi index ace4738e..9cc7dc1c 160000 --- a/oca/edi +++ b/oca/edi @@ -1 +1 @@ -Subproject commit ace4738eec703fcac427a3c3604a56853f80d281 +Subproject commit 9cc7dc1c1809f69e844138b5b97665a610b71c4a diff --git a/oca/manufacture b/oca/manufacture index fd14862d..62f64fa4 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit fd14862dd8cc42fb977efd9ef150c738d42f94e5 +Subproject commit 62f64fa459927d634b2f0b797d83d5476039b5d8 diff --git a/oca/partner-contact b/oca/partner-contact index dc19d6a0..a8f37c5e 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit dc19d6a06c4c7583b441aac53cb6384a6665c57c +Subproject commit a8f37c5e263536246bf14e33b32367492921c2a6 diff --git a/oca/product-attribute b/oca/product-attribute index eb9f76cb..07d71b50 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit eb9f76cb86bacbc1dc2abf35f5c2c490f6782a2e +Subproject commit 07d71b505ccee97c299954989c58e287e1a569e5 diff --git a/oca/project b/oca/project index d1fb961f..da69f2fe 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit d1fb961f7b49871adc996730ff066db3124e1af2 +Subproject commit da69f2fecb941a7295de7b368dd7676e5b36aa08 diff --git a/oca/server-backend b/oca/server-backend index 0a5f4101..d99347f1 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 0a5f41017b8e83c427e5bed9583a08f48b1c77ea +Subproject commit d99347f1000a614983ab8f62ab70acebd10998d3 diff --git a/oca/timesheet b/oca/timesheet index fb3bb704..e628799e 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit fb3bb704a21c407f9e17e61f8600dc02c8399f85 +Subproject commit e628799e4d11f564f1748145a9cb7a930871ca1c diff --git a/oca/website b/oca/website index 6b45a2cd..db98c3b2 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit 6b45a2cdfd746440b68d8fb3e54d9168665e1513 +Subproject commit db98c3b2ed7b6de069b3924f969595bd2edc8cad diff --git a/odoo b/odoo index d54bae78..2b7e86da 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit d54bae78db25dc62687e3afc64f8699dfbfd5cf8 +Subproject commit 2b7e86da909187a002939cc29b0e5a76b95b9136 diff --git a/task b/task index f1b744a5..74c27830 100755 --- a/task +++ b/task @@ -293,15 +293,21 @@ function lint-module() { echo "Set file and folder permissions on $1" find $1 -type d -exec chmod u=rwx,go=rx {} \; find $1 -type f -exec chmod u=rw,go=r {} \; - echo "Copy default .gignore" - cp template/custom_module/.gitignore "$1"/ - echo "Run pylint in $1" - pylint --load-plugins=pylint_odoo -d all -e odoolint $1 - cd $1 + + echo "Copy default configurtion files" + cp template/{.flake8,.gitignore,.isort.cfg,.pre-commit-config.yaml,.pylintrc} $1/../ + + # echo "Run pylint in $1" + # cd $1 + # pylint --load-plugins=pylint_odoo -d all -e odoolint $1 --valid-odoo-versions=$GIT_BRANCH + echo "Run pre-commit in $1" + cd $1 pre-commit run --files ./* + echo "Update index.html" rst2html5 README.rst static/description/index.html + echo "Stage changes" git add . } @@ -408,7 +414,7 @@ function create-module() { locale activate-venv echo "Scaffolding module $MODULE_NAME in $PARENT_DIR ..." - odoo-bin scaffold "$MODULE_NAME" "$PARENT_DIR" -t template/custom_module + odoo-bin scaffold "$MODULE_NAME" "$PARENT_DIR" -t template/module } function drop-db() { diff --git a/template/.flake8 b/template/.flake8 new file mode 100644 index 00000000..784e5771 --- /dev/null +++ b/template/.flake8 @@ -0,0 +1,12 @@ +[flake8] +max-line-length = 88 +max-complexity = 16 +# B = bugbear +# B9 = bugbear opinionated (incl line length) +select = C,E,F,W,B,B9 +# E203: whitespace before ':' (black behaviour) +# E501: flake8 line length (covered by bugbear B950) +# W503: line break before binary operator (black behaviour) +ignore = E203,E501,W503 +per-file-ignores= + __init__.py:F401 \ No newline at end of file diff --git a/template/custom_module/.gitignore b/template/.gitignore similarity index 100% rename from template/custom_module/.gitignore rename to template/.gitignore diff --git a/template/.isort.cfg b/template/.isort.cfg new file mode 100644 index 00000000..e9ca60ff --- /dev/null +++ b/template/.isort.cfg @@ -0,0 +1,13 @@ +[settings] +; see https://github.com/psf/black +multi_line_output=3 +include_trailing_comma=True +force_grid_wrap=0 +combine_as_imports=True +use_parentheses=True +line_length=88 +known_odoo=odoo +known_odoo_addons=odoo.addons +sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER +default_section=THIRDPARTY +ensure_newline_before_comments = True \ No newline at end of file diff --git a/template/custom_module/.pre-commit-config.yaml b/template/.pre-commit-config.yaml similarity index 80% rename from template/custom_module/.pre-commit-config.yaml rename to template/.pre-commit-config.yaml index c5000d30..2718392d 100644 --- a/template/custom_module/.pre-commit-config.yaml +++ b/template/.pre-commit-config.yaml @@ -10,15 +10,12 @@ exclude: | ^README\.md$| # Library files can have extraneous formatting (even minimized) /static/(src/)?lib/| - # test_repo is expected to break lints - test_repo/| # Repos using Sphinx to generate docs don't need prettying ^docs/_templates/.*\.html$| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: python: python3 - node: "16.17.0" repos: - repo: local hooks: @@ -29,8 +26,13 @@ repos: entry: found forbidden files; remove them language: fail files: "\\.rej$" + - id: en-po-files + name: en.po files cannot exist + entry: found a en.po file + language: fail + files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/myint/autoflake - rev: v1.7.6 + rev: v1.6.1 hooks: - id: autoflake args: @@ -41,14 +43,18 @@ repos: - --remove-duplicate-keys - --remove-unused-variables - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 22.8.0 hooks: - id: black - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.3.0 hooks: - id: trailing-whitespace + # exclude autogenerated files + exclude: /README\.rst$|\.pot?$ - id: end-of-file-fixer + # exclude autogenerated files + exclude: /README\.rst$|\.pot?$ - id: debug-statements - id: fix-encoding-pragma args: ["--remove"] @@ -62,13 +68,8 @@ repos: - id: check-xml - id: mixed-line-ending args: ["--fix=lf"] - - repo: https://github.com/asottile/pyupgrade - rev: v3.1.0 - hooks: - - id: pyupgrade - args: ["--keep-percent-format"] - repo: https://github.com/PyCQA/isort - rev: 5.11.5 + rev: 5.12.0 hooks: - id: isort name: isort except __init__.py @@ -81,7 +82,12 @@ repos: - id: flake8 name: flake8 additional_dependencies: ["flake8-bugbear==21.9.2"] - - repo: https://github.com/PyCQA/pylint - rev: v2.15.4 + - repo: https://github.com/OCA/pylint-odoo + rev: 7.0.2 hooks: - - id: pylint \ No newline at end of file + - id: pylint_odoo + name: pylint with optional checks + args: + - --rcfile=.pylintrc + - --exit-zero + verbose: true \ No newline at end of file diff --git a/template/.pylintrc b/template/.pylintrc new file mode 100644 index 00000000..49292140 --- /dev/null +++ b/template/.pylintrc @@ -0,0 +1,121 @@ +[MASTER] +load-plugins=pylint_odoo +score=n + +[ODOOLINT] +readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest_required_authors=Mint System GmbH +manifest_required_keys=license +manifest_deprecated_keys=description,active +license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid_odoo_versions=16.0 + +[MESSAGES CONTROL] +disable=all + +# This .pylintrc contains optional AND mandatory checks and is meant to be +# loaded in an IDE to have it check everything, in the hope this will make +# optional checks more visible to contributors who otherwise never look at a +# green travis to see optional checks that failed. +# .pylintrc-mandatory containing only mandatory checks is used the pre-commit +# config as a blocking check. + +enable=anomalous-backslash-in-string, + api-one-deprecated, + api-one-multi-together, + assignment-from-none, + attribute-deprecated, + class-camelcase, + dangerous-default-value, + dangerous-view-replace-wo-priority, + development-status-allowed, + duplicate-id-csv, + duplicate-key, + duplicate-xml-fields, + duplicate-xml-record-id, + eval-referenced, + eval-used, + incoherent-interpreter-exec-perm, + license-allowed, + manifest-author-string, + manifest-deprecated-key, + manifest-required-author, + manifest-required-key, + manifest-version-format, + method-compute, + method-inverse, + method-required-super, + method-search, + openerp-exception-warning, + pointless-statement, + pointless-string-statement, + print-used, + redundant-keyword-arg, + redundant-modulename-xml, + reimported, + relative-import, + return-in-init, + rst-syntax-error, + sql-injection, + too-few-format-args, + translation-field, + translation-required, + unreachable, + use-vim-comment, + wrong-tabs-instead-of-spaces, + xml-syntax-error, + attribute-string-redundant, + character-not-valid-in-resource-link, + consider-merging-classes-inherited, + context-overridden, + create-user-wo-reset-password, + dangerous-filter-wo-user, + dangerous-qweb-replace-wo-priority, + deprecated-data-xml-node, + deprecated-openerp-xml-node, + duplicate-po-message-definition, + except-pass, + file-not-used, + invalid-commit, + manifest-maintainers-list, + missing-newline-extrafiles, + missing-readme, + missing-return, + odoo-addons-relative-import, + old-api7-method-defined, + po-msgstr-variables, + po-syntax-error, + renamed-field-parameter, + resource-not-exist, + str-format-used, + test-folder-imported, + translation-contains-variable, + translation-positional-used, + unnecessary-utf8-coding-comment, + website-manifest-key-not-valid-uri, + xml-attribute-translatable, + xml-deprecated-qweb-directive, + xml-deprecated-tree-attribute, + external-request-timeout, + # messages that do not cause the lint step to fail + consider-merging-classes-inherited, + create-user-wo-reset-password, + dangerous-filter-wo-user, + deprecated-module, + file-not-used, + invalid-commit, + missing-manifest-dependency, + missing-newline-extrafiles, + missing-readme, + no-utf8-coding-comment, + odoo-addons-relative-import, + old-api7-method-defined, + redefined-builtin, + too-complex, + unnecessary-utf8-coding-comment + + +[REPORTS] +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} +output-format=colorized +reports=no \ No newline at end of file diff --git a/template/custom_module/LICENSE b/template/module/LICENSE similarity index 100% rename from template/custom_module/LICENSE rename to template/module/LICENSE diff --git a/template/custom_module/README.rst b/template/module/README.rst similarity index 100% rename from template/custom_module/README.rst rename to template/module/README.rst diff --git a/template/custom_module/__init__.py b/template/module/__init__.py similarity index 100% rename from template/custom_module/__init__.py rename to template/module/__init__.py diff --git a/template/custom_module/__manifest__.py b/template/module/__manifest__.py similarity index 100% rename from template/custom_module/__manifest__.py rename to template/module/__manifest__.py diff --git a/template/custom_module/data/ir_actions.xml b/template/module/data/ir_actions.xml similarity index 100% rename from template/custom_module/data/ir_actions.xml rename to template/module/data/ir_actions.xml diff --git a/template/custom_module/data/ir_sequence.xml b/template/module/data/ir_sequence.xml similarity index 100% rename from template/custom_module/data/ir_sequence.xml rename to template/module/data/ir_sequence.xml diff --git a/template/custom_module/demo/demo.xml b/template/module/demo/demo.xml similarity index 100% rename from template/custom_module/demo/demo.xml rename to template/module/demo/demo.xml diff --git a/template/custom_module/images/screen.png b/template/module/images/screen.png similarity index 100% rename from template/custom_module/images/screen.png rename to template/module/images/screen.png diff --git a/template/custom_module/models/__init__.py b/template/module/models/__init__.py similarity index 100% rename from template/custom_module/models/__init__.py rename to template/module/models/__init__.py diff --git a/template/custom_module/models/models.py b/template/module/models/models.py similarity index 100% rename from template/custom_module/models/models.py rename to template/module/models/models.py diff --git a/template/custom_module/report/invoice_document.xml b/template/module/report/invoice_document.xml similarity index 100% rename from template/custom_module/report/invoice_document.xml rename to template/module/report/invoice_document.xml diff --git a/template/custom_module/security/ir.model.access.csv b/template/module/security/ir.model.access.csv similarity index 100% rename from template/custom_module/security/ir.model.access.csv rename to template/module/security/ir.model.access.csv diff --git a/template/custom_module/static/description/icon.png b/template/module/static/description/icon.png similarity index 100% rename from template/custom_module/static/description/icon.png rename to template/module/static/description/icon.png diff --git a/template/custom_module/static/src/css/style.css b/template/module/static/src/css/style.css similarity index 100% rename from template/custom_module/static/src/css/style.css rename to template/module/static/src/css/style.css diff --git a/template/custom_module/static/src/js/widget.js b/template/module/static/src/js/widget.js similarity index 100% rename from template/custom_module/static/src/js/widget.js rename to template/module/static/src/js/widget.js diff --git a/template/custom_module/views/assets.xml b/template/module/views/assets.xml similarity index 100% rename from template/custom_module/views/assets.xml rename to template/module/views/assets.xml diff --git a/template/custom_module/views/sale_order.xml b/template/module/views/sale_order.xml similarity index 100% rename from template/custom_module/views/sale_order.xml rename to template/module/views/sale_order.xml From ac30e45b4a9bb37c83f2e5cedd416289937be9d2 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 12 Jul 2023 10:36:50 +0200 Subject: [PATCH 027/147] fix typo --- task | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task b/task index 74c27830..6ae93978 100755 --- a/task +++ b/task @@ -294,7 +294,7 @@ function lint-module() { find $1 -type d -exec chmod u=rwx,go=rx {} \; find $1 -type f -exec chmod u=rw,go=r {} \; - echo "Copy default configurtion files" + echo "Copy default configuration files" cp template/{.flake8,.gitignore,.isort.cfg,.pre-commit-config.yaml,.pylintrc} $1/../ # echo "Run pylint in $1" From 8d953dc7adb3621699ad196bf239933605fb6ffd Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 12 Jul 2023 11:16:36 +0200 Subject: [PATCH 028/147] sync --- task | 4 ++-- template/.pylintrc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/task b/task index 6ae93978..d418baf3 100755 --- a/task +++ b/task @@ -294,8 +294,8 @@ function lint-module() { find $1 -type d -exec chmod u=rwx,go=rx {} \; find $1 -type f -exec chmod u=rw,go=r {} \; - echo "Copy default configuration files" - cp template/{.flake8,.gitignore,.isort.cfg,.pre-commit-config.yaml,.pylintrc} $1/../ + # echo "Copy default configuration files" + # cp template/{.flake8,.gitignore,.isort.cfg,.pre-commit-config.yaml,.pylintrc} $1/../ # echo "Run pylint in $1" # cd $1 diff --git a/template/.pylintrc b/template/.pylintrc index 49292140..c046432b 100644 --- a/template/.pylintrc +++ b/template/.pylintrc @@ -8,7 +8,7 @@ manifest_required_authors=Mint System GmbH manifest_required_keys=license manifest_deprecated_keys=description,active license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid_odoo_versions=16.0 +valid_odoo_versions=15.0 [MESSAGES CONTROL] disable=all From 9c76acb21e330ba6b7ed276573b25e9906a62bee Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 18 Jul 2023 17:17:40 +0200 Subject: [PATCH 029/147] sync --- snippets/account.md | 298 ++++ ...port_invoice_document.remove_incoterm.xml} | 2 +- ....replace_address_and_information_block.xml | 55 + ...t.report_invoice_document.show_hs_code.xml | 16 + ...nt.report_invoice_document.show_weight.xml | 30 + ..._task_form2.domain_sale_line_id_active.xml | 2 +- snippets/purchase.md | 7 + snippets/sale.md | 135 +- ..._saleorder_document.add_delivery_dates.xml | 14 + ...rt_saleorder_document.add_intrastat_id.xml | 35 +- ...port_saleorder_document.remove_user_id.xml | 6 + snippets/sale_blanket_order.md | 30 + snippets/stock.md | 1441 +++++++++++++++++ ...> stock.report_picking_document.tissa.xml} | 2 +- snippets/web.md | 58 + 15 files changed, 2093 insertions(+), 38 deletions(-) rename snippets/{account.report_invoice_document.remove_incoterms.xml => account.report_invoice_document.remove_incoterm.xml} (60%) create mode 100644 snippets/account.report_invoice_document.replace_address_and_information_block.xml create mode 100644 snippets/account.report_invoice_document.show_hs_code.xml create mode 100644 snippets/account.report_invoice_document.show_weight.xml create mode 100644 snippets/sale.report_saleorder_document.add_delivery_dates.xml create mode 100644 snippets/sale.report_saleorder_document.remove_user_id.xml rename snippets/{stock.report_picking_document_tissa.xml => stock.report_picking_document.tissa.xml} (98%) diff --git a/snippets/account.md b/snippets/account.md index bebfdd1f..c5356b73 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -2104,6 +2104,9 @@ ID: `mint_system.account.report_invoice_document.style_carbo_link` #total { margin-bottom: 2rem; } + h2 { + font-size: 1.5rem; + } @@ -2111,6 +2114,43 @@ ID: `mint_system.account.report_invoice_document.style_carbo_link` ``` Source: [snippets/account.report_invoice_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_carbo_link.xml) +### Style Tissa +ID: `mint_system.account.report_invoice_document.style_tissa` +```xml + + + + + + + + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + + + +``` +Source: [snippets/account.report_invoice_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_tissa.xml) + ### Style Trimada ID: `mint_system.account.report_invoice_document.style_trimada` ```xml @@ -2247,6 +2287,115 @@ ID: `mint_system.account.report_invoice_document.tissa_rechnungstext` ``` Source: [snippets/account.report_invoice_document.tissa_rechnungstext.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.tissa_rechnungstext.xml) +### Tissa Replace Infotable +ID: `mint_system.account.report_invoice_document.tissa_replace_infotable` +```xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + Kundennummer: + + + + Datum: + + +
      + USt-IdNr: + + + Unser Auftrag: + + + / + + +
      EORI-Nummer: + + Abruf: + + + / + +
      Ihre Bestellung: + + Kundenbetreuer/in: + +
      + + Sachbearbeiter/in: + +
      + MwSt-Nr: + + CHE-103.327.797 MWST +
      +       +       +``` +Source: [snippets/account.report_invoice_document.tissa_replace_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.tissa_replace_infotable.xml) + ### Unit Precision ID: `mint_system.account.report_invoice_document.unit_precision` ```xml @@ -4402,6 +4551,9 @@ ID: `mint_system.account.report_invoice_document.style_carbo_link` #total { margin-bottom: 2rem; } + h2 { + font-size: 1.5rem; + } @@ -4409,6 +4561,43 @@ ID: `mint_system.account.report_invoice_document.style_carbo_link` ``` Source: [snippets/account.report_invoice_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_carbo_link.xml) +### Style Tissa +ID: `mint_system.account.report_invoice_document.style_tissa` +```xml + + + + + + + + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + + + +``` +Source: [snippets/account.report_invoice_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_tissa.xml) + ### Style Trimada ID: `mint_system.account.report_invoice_document.style_trimada` ```xml @@ -4545,6 +4734,115 @@ ID: `mint_system.account.report_invoice_document.tissa_rechnungstext` ``` Source: [snippets/account.report_invoice_document.tissa_rechnungstext.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.tissa_rechnungstext.xml) +### Tissa Replace Infotable +ID: `mint_system.account.report_invoice_document.tissa_replace_infotable` +```xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + Kundennummer: + + + + Datum: + + +
      + USt-IdNr: + + + Unser Auftrag: + + + / + + +
      EORI-Nummer: + + Abruf: + + + / + +
      Ihre Bestellung: + + Kundenbetreuer/in: + +
      + + Sachbearbeiter/in: + +
      + MwSt-Nr: + + CHE-103.327.797 MWST +
      +       +       +``` +Source: [snippets/account.report_invoice_document.tissa_replace_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.tissa_replace_infotable.xml) + ### Unit Precision ID: `mint_system.account.report_invoice_document.unit_precision` ```xml diff --git a/snippets/account.report_invoice_document.remove_incoterms.xml b/snippets/account.report_invoice_document.remove_incoterm.xml similarity index 60% rename from snippets/account.report_invoice_document.remove_incoterms.xml rename to snippets/account.report_invoice_document.remove_incoterm.xml index fae47db0..4381cbb7 100644 --- a/snippets/account.report_invoice_document.remove_incoterms.xml +++ b/snippets/account.report_invoice_document.remove_incoterm.xml @@ -1,7 +1,7 @@ - + diff --git a/snippets/account.report_invoice_document.replace_address_and_information_block.xml b/snippets/account.report_invoice_document.replace_address_and_information_block.xml new file mode 100644 index 00000000..8d37376b --- /dev/null +++ b/snippets/account.report_invoice_document.replace_address_and_information_block.xml @@ -0,0 +1,55 @@ + + + + + +
      +
      Customer
      +
      Invoice Address
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      Delivery Address
      +
      + +
      +
      + +
      +
      + +
      +
      Your Contact
      +
      Our Contact
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +       + +       \ No newline at end of file diff --git a/snippets/account.report_invoice_document.show_hs_code.xml b/snippets/account.report_invoice_document.show_hs_code.xml new file mode 100644 index 00000000..0968bbdb --- /dev/null +++ b/snippets/account.report_invoice_document.show_hs_code.xml @@ -0,0 +1,16 @@ + + + + + + H.S. Code + + + + + + + + + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.show_weight.xml b/snippets/account.report_invoice_document.show_weight.xml new file mode 100644 index 00000000..eaebe772 --- /dev/null +++ b/snippets/account.report_invoice_document.show_weight.xml @@ -0,0 +1,30 @@ + + + + +
      + Weight +       + + +
      + Total Weight +       + + +
      + + + + +       + + +
      + + + + +       + +       \ No newline at end of file diff --git a/snippets/project.view_task_form2.domain_sale_line_id_active.xml b/snippets/project.view_task_form2.domain_sale_line_id_active.xml index ea6ef8d0..ad729507 100644 --- a/snippets/project.view_task_form2.domain_sale_line_id_active.xml +++ b/snippets/project.view_task_form2.domain_sale_line_id_active.xml @@ -2,7 +2,7 @@ - [('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale', 'done']), ('order_id', '=?', project_sale_order_id)] + [('x_service_policy', '=', 'delivered_timesheet'),('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale', 'done'])] diff --git a/snippets/purchase.md b/snippets/purchase.md index 55849861..562d935e 100644 --- a/snippets/purchase.md +++ b/snippets/purchase.md @@ -1307,9 +1307,16 @@ ID: `mint_system.purchase.report_purchaseorder_document.style_carbo_link` font-family: Dobra-Book; font-size: 80%; } + h2 { + font-size: 1.5rem; + } + + "date" + + "date" diff --git a/snippets/sale.md b/snippets/sale.md index 56fc6f84..4f3b4f2b 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -1127,19 +1127,28 @@ Source: [snippets/sale.report_saleorder_document.add_infotable.xml](https://gith ### Add Intrastat Id ID: `mint_system.sale.report_saleorder_document.add_intrastat_id` ```xml - - - - - HS Code - - - - - - - - + + + + + + + + text-right align-text-top + + + + "date" + + ``` Source: [snippets/sale.report_saleorder_document.add_intrastat_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_intrastat_id.xml) @@ -1235,6 +1244,25 @@ ID: `mint_system.sale.report_saleorder_document.add_percentage_sign` ``` Source: [snippets/sale.report_saleorder_document.add_percentage_sign.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_percentage_sign.xml) +### Add Product Uom +ID: `mint_system.sale.report_saleorder_document.add_product_uom` +```xml + + + + ME + + + + + + + + + +``` +Source: [snippets/sale.report_saleorder_document.add_product_uom.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_product_uom.xml) + ### Address Block ID: `mint_system.sale.report_saleorder_document.address_block` ```xml @@ -2680,6 +2708,87 @@ ID: `mint_system.sale.report_saleorder_document.style_moser` ``` Source: [snippets/sale.report_saleorder_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_moser.xml) +### Style Tissa +ID: `mint_system.sale.report_saleorder_document.style_tissa` +```xml + + + + + + + + + + + + + text-right + + + + + +``` +Source: [snippets/sale.report_saleorder_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_tissa.xml) + ### Style Trimada ID: `mint_system.sale.report_saleorder_document.style_trimada` ```xml diff --git a/snippets/sale.report_saleorder_document.add_delivery_dates.xml b/snippets/sale.report_saleorder_document.add_delivery_dates.xml new file mode 100644 index 00000000..1d1288a0 --- /dev/null +++ b/snippets/sale.report_saleorder_document.add_delivery_dates.xml @@ -0,0 +1,14 @@ + + + + + Delivery Date + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.add_intrastat_id.xml b/snippets/sale.report_saleorder_document.add_intrastat_id.xml index 209b3eec..0745cdeb 100644 --- a/snippets/sale.report_saleorder_document.add_intrastat_id.xml +++ b/snippets/sale.report_saleorder_document.add_intrastat_id.xml @@ -1,23 +1,14 @@ - - - - - - - - text-right align-text-top - - - - "date" - - + + + + + HS Code + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.remove_user_id.xml b/snippets/sale.report_saleorder_document.remove_user_id.xml new file mode 100644 index 00000000..0137fe60 --- /dev/null +++ b/snippets/sale.report_saleorder_document.remove_user_id.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/snippets/sale_blanket_order.md b/snippets/sale_blanket_order.md index d52f59f3..f1f93753 100644 --- a/snippets/sale_blanket_order.md +++ b/snippets/sale_blanket_order.md @@ -397,6 +397,21 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.relocate_price_ ``` Source: [snippets/sale_blanket_order.report_blanketorder_document.relocate_price_unit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.relocate_price_unit.xml) +### Remove Date Schedule +ID: `mint_system.sale_blanket_order.report_blanketorder_document.remove_date_schedule` +```xml + + + + + + + + + +``` +Source: [snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml) + ### Remove Informations ID: `mint_system.sale_blanket_order.report_blanketorder_document.remove_informations` ```xml @@ -512,6 +527,21 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_product ``` Source: [snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml) +### Replace Product Id +ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_product_id` +```xml + +> + + + + + + + +``` +Source: [snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml) + ### Replace Summary ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_summary` ```xml diff --git a/snippets/stock.md b/snippets/stock.md index 4c4050fa..b44b360d 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -1436,6 +1436,29 @@ ID: `mint_system.stock.report_delivery_document.add_table_margin` ``` Source: [snippets/stock.report_delivery_document.add_table_margin.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.add_table_margin.xml) +### Add Weight +ID: `mint_system.stock.report_delivery_document.add_weight` +```xml + + + + + + Weight + + + + + + + + + + + +``` +Source: [snippets/stock.report_delivery_document.add_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.add_weight.xml) + ### Append Signature Text ID: `mint_system.stock.report_delivery_document.append_signature_text` ```xml @@ -1822,6 +1845,17 @@ ID: `mint_system.stock.report_delivery_document.hide_name` ``` Source: [snippets/stock.report_delivery_document.hide_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.hide_name.xml) +### Hide Product Uom Qty +ID: `mint_system.stock.report_delivery_document.hide_product_uom_qty` +```xml + + + + + +``` +Source: [snippets/stock.report_delivery_document.hide_product_uom_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.hide_product_uom_qty.xml) + ### Hs Code Origin And Weight ID: `mint_system.stock.report_delivery_document.hs_code_origin_and_weight` ```xml @@ -4452,6 +4486,1413 @@ ID: `mint_system.stock.report_picking.x_packaging_uom_id` ``` Source: [snippets/stock.report_picking.x_packaging_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.x_packaging_uom_id.xml) +## Report Picking Document +### Tissa +ID: `mint_system.stock.report_picking_document.tissa` +```xml + + + + +
      + + + +
      +
      + +
      +
      + +
      + + - + + + +
      +
      + + + + + + + +
      + + + Barcode +
      + + + + + + + + + + +
      NameLieferantBeschreibung
      + + + + + +
      + + + + + + +
      + + + Barcode +
      + + + + + + + + + + + + + +
      + + + + Barcode +
      + + Spulen +
      + Einlagerungsdatum: + +
      + +

      + + + +``` +Source: [snippets/stock.report_picking_document.tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking_document.tissa.xml) + +## Report Picking +### Add Address Block +ID: `mint_system.stock.report_picking.add_address_block` +```xml + + + + +

      +
      +
      +
      +
      +
      +
      + + + +``` +Source: [snippets/stock.report_picking.add_address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.add_address_block.xml) + +### Add Delivery Note +ID: `mint_system.stock.report_picking.add_delivery_note` +```xml + + + + +

      + + + + +``` +Source: [snippets/stock.report_picking.add_delivery_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.add_delivery_note.xml) + +### Add Mrp Production X Note +ID: `mint_system.stock.report_picking.add_mrp_production_x_note` +```xml + + + + + + + +

      + + + + + +``` +Source: [snippets/stock.report_picking.add_mrp_production_x_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.add_mrp_production_x_note.xml) + +### Barcode Label +ID: `mint_system.stock.report_picking.barcode_label` +```xml + + + + + Rüstschein Code: + + + + +``` +Source: [snippets/stock.report_picking.barcode_label.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.barcode_label.xml) + +### Format Delivery Date +ID: `mint_system.stock.report_picking.format_delivery_date` +```xml + + + + + "date" + + + + +``` +Source: [snippets/stock.report_picking.format_delivery_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.format_delivery_date.xml) + +### Format Qty Available +ID: `mint_system.stock.report_picking.format_qty_available` +```xml + + + + + "integer" + + + +``` +Source: [snippets/stock.report_picking.format_qty_available.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.format_qty_available.xml) + +### Format Qty +ID: `mint_system.stock.report_picking.format_qty` +```xml + + + + + + + + + + + + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.format_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.format_qty.xml) + +### Format Title +ID: `mint_system.stock.report_picking.format_title` +```xml + + + + +

      + + + + +``` +Source: [snippets/stock.report_picking.format_title.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.format_title.xml) + +### Get Position +ID: `mint_system.stock.report_picking.get_position` +```xml + + + + + + + Pos + + + + + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.get_position.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.get_position.xml) + +### Group By Date +ID: `mint_system.stock.report_picking.group_by_date` +```xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Lieferdatum: + + + + + + + + + + + + + +
      + + + + + + + + + + + + + + + +
      + + + + +
      + + + Barcode + + + + + + Barcode + Barcode + Barcode + + + + + + + + +       +       + +       + +       +``` +Source: [snippets/stock.report_picking.group_by_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.group_by_date.xml) + +### Header Box +ID: `mint_system.stock.report_picking.header_box` +```xml + + + + +
      +
      +
      +

      Rüstschein +

      +
      +
      + Barcode +
      +
      +
      +       + +       +``` +Source: [snippets/stock.report_picking.header_box.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.header_box.xml) + +### Hide Address +ID: `mint_system.stock.report_picking.hide_address` +```xml + + + + + + +``` +Source: [snippets/stock.report_picking.hide_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.hide_address.xml) + +### Hide Location Dest +ID: `mint_system.stock.report_picking.hide_location_dest` +```xml + + + + + + + To + + + + + attribute name="t-if" + +
      + + + + +
      + +       + +       +``` +Source: [snippets/stock.report_picking.hide_location_dest.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.hide_location_dest.xml) + +### Hide Name +ID: `mint_system.stock.report_picking.hide_name` +```xml + + + + + + +``` +Source: [snippets/stock.report_picking.hide_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.hide_name.xml) + +### Margin Barcode +ID: `mint_system.stock.report_picking.margin_barcode` +```xml + + + + + + + + + +``` +Source: [snippets/stock.report_picking.margin_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.margin_barcode.xml) + +### Margin Before Table +ID: `mint_system.stock.report_picking.margin_before_table` +```xml + + + + + + + + + +``` +Source: [snippets/stock.report_picking.margin_before_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.margin_before_table.xml) + +### Modify No Reserved Product +ID: `mint_system.stock.report_picking.modify_no_reserved_product` +```xml + + + + + o.move_lines.filtered(lambda x: x.product_uom_qty != x.reserved_availability and x.state!='done') + + + +``` +Source: [snippets/stock.report_picking.modify_no_reserved_product.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.modify_no_reserved_product.xml) + +### Partner Ref +ID: `mint_system.stock.report_picking.partner_ref` +```xml + + + + +
      + Kundennummer: + +
      +       + +       + +``` +Source: [snippets/stock.report_picking.partner_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.partner_ref.xml) + +### Pos In Table +ID: `mint_system.stock.report_picking.pos_in_table` +```xml + + + + + + Pos + + + + + + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.pos_in_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.pos_in_table.xml) + +### Pricelist Below Address +ID: `mint_system.stock.report_picking.pricelist_below_address` +```xml + + + + + + + + + +``` +Source: [snippets/stock.report_picking.pricelist_below_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.pricelist_below_address.xml) + +### Product Description +ID: `mint_system.stock.report_picking.product_description` +```xml + + + + + + + + + +
      + + +
      +       + + +
      +       + + +       + +       +``` +Source: [snippets/stock.report_picking.product_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.product_description.xml) + +### Relocate Quantity +ID: `mint_system.stock.report_picking.relocate_quantity` +```xml + + + + + + + + Quantity + + + + + + + + + + + + + + + () + + + + + +
      + + + +       + +       +``` +Source: [snippets/stock.report_picking.relocate_quantity.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.relocate_quantity.xml) + +### Remove From And To +ID: `mint_system.stock.report_picking.remove_from_and_to` +```xml + + + + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.remove_from_and_to.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.remove_from_and_to.xml) + +### Remove Reservation Notice +ID: `mint_system.stock.report_picking.remove_reservation_notice` +```xml + + + + + + + +``` +Source: [snippets/stock.report_picking.remove_reservation_notice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.remove_reservation_notice.xml) + +### Remove Serial Number +ID: `mint_system.stock.report_picking.remove_serial_number` +```xml + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.remove_serial_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.remove_serial_number.xml) + +### Remove To +ID: `mint_system.stock.report_picking.remove_to` +```xml + + + + + + To + + + + + +
      + + + + +
      + +       + +       +``` +Source: [snippets/stock.report_picking.remove_to.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.remove_to.xml) + +### Replace Barcode +ID: `mint_system.stock.report_picking.replace_barcode` +```xml + + + + + + + + + Barcode + Barcode + Barcode + + + + + + + + +``` +Source: [snippets/stock.report_picking.replace_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_barcode.xml) + +### Replace Header +ID: `mint_system.stock.report_picking.replace_header` +```xml + + + + + + + + + + + + +
      Rüstschein + + + Barcode + +
      + +       +       +``` +Source: [snippets/stock.report_picking.replace_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_header.xml) + +### Replace Order Definition +ID: `mint_system.stock.report_picking.replace_order_definition` +```xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + + Fertigungsauftrag + + + + + Produkt + + + + + + Bestellung + + +
      + Status: + + + Datum: + +
      + Typ: + + + Auslieferungsmethode: + +
      + +       +       +``` +Source: [snippets/stock.report_picking.replace_order_definition.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_order_definition.xml) + +### Replace Table +ID: `mint_system.stock.report_picking.replace_table` +```xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + Art. Nr. + + Bezeichnung / Typenbezeichnung + + Von + + Nach + + Menge + + Lager + + Lot/Serial Number + + +
      +
      +       		+
      + +       		+ + + + + +
      + + + + +
      +       		+ + + + + + + + Barcode + + + + + Barcode + Barcode + Barcode + + + + +
      + +       +       +``` +Source: [snippets/stock.report_picking.replace_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_table.xml) + +### Round Qty2 +ID: `mint_system.stock.report_picking.round_qty2` +```xml + + + + + + + + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.round_qty2.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.round_qty2.xml) + +### Round Qty +ID: `mint_system.stock.report_picking.round_qty` +```xml + + + + + + + + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.round_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.round_qty.xml) + +### Set Ids +ID: `mint_system.stock.report_picking.set_ids` +```xml + + + + + th_product + + + + product_uom_qty + + + + th_to + + + + barcode + + + + main_table + + + +``` +Source: [snippets/stock.report_picking.set_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.set_ids.xml) + +### Show Default Code +ID: `mint_system.stock.report_picking.show_default_code` +```xml + + + + + + Part No. + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_default_code.xml) + +### Show Full Address +ID: `mint_system.stock.report_picking.show_full_address` +```xml + + + + + ['name', 'phone', 'address'] + + + + +``` +Source: [snippets/stock.report_picking.show_full_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_full_address.xml) + +### Show Lot +ID: `mint_system.stock.report_picking.show_lot` +```xml + + + + + + Los + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.show_lot.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_lot.xml) + +### Show Move Not Lines +ID: `mint_system.stock.report_picking.show_move_not_lines` +```xml + + + + + o.move_ids_without_package + + + + + + +
      + + + + + + + + + + + +
      + +
      + + + + + + Barcode + Barcode + Barcode + + + + + + +       + +       +``` +Source: [snippets/stock.report_picking.show_move_not_lines.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_move_not_lines.xml) + +### Show Move Qty +ID: `mint_system.stock.report_picking.show_move_qty` +```xml + + + + + + + + + +``` +Source: [snippets/stock.report_picking.show_move_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_move_qty.xml) + +### Show Order Date +ID: `mint_system.stock.report_picking.show_order_date` +```xml + + + + +
      + Bestelldatum: +

      +

      +       + +       + +``` +Source: [snippets/stock.report_picking.show_order_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_order_date.xml) + +### Show Packaging +ID: `mint_system.stock.report_picking.show_packaging` +```xml + + + + + + Verpackung + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.show_packaging.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_packaging.xml) + +### Show Qty Available +ID: `mint_system.stock.report_picking.show_qty_available` +```xml + + + + + + Lager + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.show_qty_available.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_qty_available.xml) + +### Stock Delivery Note +ID: `mint_system.stock.report_picking.stock_delivery_note` +```xml + + + + +
      +
      +

      +

      +
      +       + +       + +``` +Source: [snippets/stock.report_picking.stock_delivery_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.stock_delivery_note.xml) + +### Style Trimada +ID: `mint_system.stock.report_picking.style_trimada` +```xml + + + + + + + +. + + + + +``` +Source: [snippets/stock.report_picking.style_trimada.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.style_trimada.xml) + +### X Count Packaging +ID: `mint_system.stock.report_picking.x_count_packaging` +```xml + + + + + + Anzahl Verp. + + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.x_count_packaging.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.x_count_packaging.xml) + +### X Packaging Uom Id +ID: `mint_system.stock.report_picking.x_packaging_uom_id` +```xml + + + + + + + + + + +``` +Source: [snippets/stock.report_picking.x_packaging_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.x_packaging_uom_id.xml) + ## Stock Report Delivery Aggregated Move Lines ### Add Country Of Origin And Hs Code ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.add_country_of_origin_and_hs_code` diff --git a/snippets/stock.report_picking_document_tissa.xml b/snippets/stock.report_picking_document.tissa.xml similarity index 98% rename from snippets/stock.report_picking_document_tissa.xml rename to snippets/stock.report_picking_document.tissa.xml index 22793c90..579fc427 100644 --- a/snippets/stock.report_picking_document_tissa.xml +++ b/snippets/stock.report_picking_document.tissa.xml @@ -1,4 +1,4 @@ - + - - - - text-right align-text-top - - - - "date" - - + + + + + HS Code + + + + + + + + ``` Source: [snippets/sale.report_saleorder_document.add_intrastat_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_intrastat_id.xml) @@ -1919,6 +1930,18 @@ ID: `mint_system.sale.report_saleorder_document.remove_taxes` ``` Source: [snippets/sale.report_saleorder_document.remove_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.remove_taxes.xml) +### Remove User Id +ID: `mint_system.sale.report_saleorder_document.remove_user_id` +```xml + + + + + + +``` +Source: [snippets/sale.report_saleorder_document.remove_user_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.remove_user_id.xml) + ### Remove Vat ID: `mint_system.sale.report_saleorder_document.remove_vat` ```xml diff --git a/snippets/website_sale.md b/snippets/website_sale.md index ebd90c27..e789ee81 100644 --- a/snippets/website_sale.md +++ b/snippets/website_sale.md @@ -81,3 +81,58 @@ ID: `mint_system.website_sale.products_categories.bigger_categories_button` ``` Source: [snippets/website_sale.products_categories.bigger_categories_button.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.products_categories.bigger_categories_button.xml) +## Product +### Show Product Dimension +ID: `mint_system.website_sale.product.show_product_dimension` +```xml + + + + + +
      + Dimensions:
      +
        + +
      • + + + + +
        • +         +
      +
      +       + +       +``` +Source: [snippets/website_sale.product.show_product_dimension.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.product.show_product_dimension.xml) + +### Show Product Material +ID: `mint_system.website_sale.product.show_product_material` +```xml + + + + + +
      + Materials:
      +
        + +
      • + + + + +
        • +         +
      +
      +       + +       +``` +Source: [snippets/website_sale.product.show_product_material.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.product.show_product_material.xml) + From 2615e6e9def3c5db47ec67da505d644ab303c164 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 21 Jul 2023 15:17:08 +0200 Subject: [PATCH 033/147] ref --- addons/product_attribute | 2 +- addons/vertical_job_portal | 2 +- addons/vertical_saas | 2 +- enterprise | 2 +- oca/account-financial-reporting | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/bank-payment | 2 +- oca/bank-statement-import | 2 +- oca/business-requirement | 2 +- oca/contract | 2 +- oca/credit-control | 2 +- oca/crm | 2 +- oca/edi | 2 +- oca/hr | 2 +- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/iot | 2 +- oca/knowledge | 2 +- oca/l10n-switzerland | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/sale-workflow | 2 +- oca/server-backend | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/social | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/timesheet | 2 +- oca/web | 2 +- odoo | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/addons/product_attribute b/addons/product_attribute index e7b790e2..f0c16b15 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit e7b790e2013fc8371f0d5c415bed8923e4928ace +Subproject commit f0c16b151da3fe598da0764f84bbc64566e108c7 diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 2347edbb..31c8c70b 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 2347edbb0fd751042ac9e8c8cf64dad47093c2f5 +Subproject commit 31c8c70b687bff11960c68843df3200dec84dd96 diff --git a/addons/vertical_saas b/addons/vertical_saas index 08e169d5..cee91155 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 08e169d5e7fe3168eaa6355453c6ffa90f86e4c1 +Subproject commit cee91155d93faa5a0bb473b72c3bdc758432f0e6 diff --git a/enterprise b/enterprise index adfe654f..4c1ac69f 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit adfe654f14fe1cf962e7a8151df6bb47162391be +Subproject commit 4c1ac69feecd2711b2eafe408f5eb85026466002 diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting index 9989c4ec..eb9148ed 160000 --- a/oca/account-financial-reporting +++ b/oca/account-financial-reporting @@ -1 +1 @@ -Subproject commit 9989c4ec2ab1acf002f4e6b40ebbdcd107dcca0e +Subproject commit eb9148ed7064f4523ea0b6fa79fea5c2048451f0 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index 8f520483..cf5a2e9b 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit 8f520483b9477206d4ecc4c330bd848c57a4a776 +Subproject commit cf5a2e9bd56b0d37e54c379cd883cedf93820b39 diff --git a/oca/account-invoicing b/oca/account-invoicing index c2cfb66a..d9d2b545 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit c2cfb66a7a68302c2740adf91d0798d0c90e6b79 +Subproject commit d9d2b545e78fffe5bc535054ef5a2aef674a657d diff --git a/oca/bank-payment b/oca/bank-payment index eb35cd19..f64659dc 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit eb35cd1919f3b5f1d512e3d9de6f3de5c5bc6a2c +Subproject commit f64659dcfc655aaf2c97cd3dad3bdee9812d9d3c diff --git a/oca/bank-statement-import b/oca/bank-statement-import index 6befd80a..fb2f434b 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit 6befd80a2f383cc8618544924a1471ba9e78f9a1 +Subproject commit fb2f434b2941d887466e1cc6a2cd78d9bf6aff92 diff --git a/oca/business-requirement b/oca/business-requirement index 7da6b420..6fd2e144 160000 --- a/oca/business-requirement +++ b/oca/business-requirement @@ -1 +1 @@ -Subproject commit 7da6b42091b8a43abcb113a05838fb0cf753a284 +Subproject commit 6fd2e1444d132682080c29d94a66b80ead29adc8 diff --git a/oca/contract b/oca/contract index 5aa4b253..06e18aa0 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit 5aa4b253adbb52e55cec94fa0999c5f81793eeb9 +Subproject commit 06e18aa08ce25b0555a41761a70fb6cac9a5d7b9 diff --git a/oca/credit-control b/oca/credit-control index 112aaf66..51c3dcaf 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 112aaf66ea268d2fa1000092139a02f63cf1f473 +Subproject commit 51c3dcafbab78b75f1cb472cf814e10864e2cac0 diff --git a/oca/crm b/oca/crm index f6af95d3..4015316d 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit f6af95d30cd2aa1e204d7fa8a66c7d787cb91730 +Subproject commit 4015316dcfdbc2252c4c6df06468d1e5ed17ed47 diff --git a/oca/edi b/oca/edi index 9cc7dc1c..7bc140a6 160000 --- a/oca/edi +++ b/oca/edi @@ -1 +1 @@ -Subproject commit 9cc7dc1c1809f69e844138b5b97665a610b71c4a +Subproject commit 7bc140a69423685b11e66c7776ff702b02e484b0 diff --git a/oca/hr b/oca/hr index e95c4fee..36827fd7 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit e95c4fee156696a2742d21a18bfa8ef1fc45342b +Subproject commit 36827fd7cc9255f938ac83a26c04bdc6f0b8f485 diff --git a/oca/hr-attendance b/oca/hr-attendance index 9591a63a..96b8dbcc 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 9591a63af4b26db9a9e591fd9718a4b0a4295364 +Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 diff --git a/oca/hr-holidays b/oca/hr-holidays index dada53c6..3211429e 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit dada53c6e2ca4d5fb1286506ce4afb3842fbe02b +Subproject commit 3211429e61490107d128e9859b79bc113312143e diff --git a/oca/iot b/oca/iot index d8b5c84e..5e8e6c9d 160000 --- a/oca/iot +++ b/oca/iot @@ -1 +1 @@ -Subproject commit d8b5c84eada93a64f4442487b5e44fe7137a95f6 +Subproject commit 5e8e6c9d392510c86aa73e65ea30e4558eb64a84 diff --git a/oca/knowledge b/oca/knowledge index 4284f6f1..2d90c953 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit 4284f6f14c17b3465e78cadc7c39ec960e6395c7 +Subproject commit 2d90c953c3fe324abc5d08d3844f67218d1bcc5c diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 1be7f963..bb7affa6 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 1be7f9631fa6a255eae9928d8417b549c3a73461 +Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 diff --git a/oca/manufacture b/oca/manufacture index 62f64fa4..01d9f531 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 62f64fa459927d634b2f0b797d83d5476039b5d8 +Subproject commit 01d9f531c438d2c55d9956be2402b2c67cfda0e8 diff --git a/oca/partner-contact b/oca/partner-contact index a8f37c5e..1c9fc793 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit a8f37c5e263536246bf14e33b32367492921c2a6 +Subproject commit 1c9fc793e52daefd6bd097319dcdb744a9449342 diff --git a/oca/product-attribute b/oca/product-attribute index 07d71b50..9f823fdc 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 07d71b505ccee97c299954989c58e287e1a569e5 +Subproject commit 9f823fdcda6b9b17f234f10bcae80e3776c790ef diff --git a/oca/project b/oca/project index da69f2fe..d7b897b1 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit da69f2fecb941a7295de7b368dd7676e5b36aa08 +Subproject commit d7b897b14ecc14f3f10c212eef56eee00298d716 diff --git a/oca/purchase-workflow b/oca/purchase-workflow index ee130ff4..ce81a96c 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit ee130ff447d06ee2341b9946767d386735f0d79c +Subproject commit ce81a96c899f08ea7965ea9109bb108aaf7693ca diff --git a/oca/reporting-engine b/oca/reporting-engine index 9a3b26e0..fd083f7f 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 9a3b26e0ec5e9e5830f4813f4684af5ecf84f394 +Subproject commit fd083f7fde6e47327acd1ea209807ec1b22b416c diff --git a/oca/sale-workflow b/oca/sale-workflow index a7c0188a..0e9d4b98 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit a7c0188aeee0856710a90c40c7941ac8446cbe7d +Subproject commit 0e9d4b98ec8c38383b8f84cd8c8d7db1ea1924d8 diff --git a/oca/server-backend b/oca/server-backend index d99347f1..bebd6046 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit d99347f1000a614983ab8f62ab70acebd10998d3 +Subproject commit bebd60466a7e450c46072b0772f57c67ac06cb5a diff --git a/oca/server-tools b/oca/server-tools index 5dcaa3f2..2f8f08f2 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 5dcaa3f2bea1c30f3f685f43beaaf4ad563e13d1 +Subproject commit 2f8f08f27bb943cf137bdd0491351897e7c02bc0 diff --git a/oca/server-ux b/oca/server-ux index 99572dbb..7d7b14b6 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit 99572dbb5ea708a901a0f330ba4e61441f3e4cd9 +Subproject commit 7d7b14b672748858dfe6d5c3ad29b4ce81fdab5c diff --git a/oca/social b/oca/social index 49e79f73..3de2aeca 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit 49e79f73016da06b453cccce422a051015d634ed +Subproject commit 3de2aecae4e180fc76ada8f5ae6da4819a12b713 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 7d4a3264..b644a8e7 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 7d4a3264df6e034cf0fa1040bf196ad304eb8d90 +Subproject commit b644a8e7b6c6dae30549bb73b2133db3d297ddb1 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index 81df8d1b..6bbc37af 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit 81df8d1b936b8897be7588f70e450f0373a0383a +Subproject commit 6bbc37af9d1df05d897e2e5ec9ec7198219d5d6a diff --git a/oca/timesheet b/oca/timesheet index e628799e..755dabca 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit e628799e4d11f564f1748145a9cb7a930871ca1c +Subproject commit 755dabca271fd2568a193463179656892686833c diff --git a/oca/web b/oca/web index dfadd419..7c7778c5 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit dfadd419a421bf07e493327a804c0b4d1cd75c0e +Subproject commit 7c7778c53618b36367cda349b3f5407da5c8af76 diff --git a/odoo b/odoo index 2b7e86da..462c1eed 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 2b7e86da909187a002939cc29b0e5a76b95b9136 +Subproject commit 462c1eed41ecd975a511f7430e1fc303e449e869 From 1ae68ab144a202ae5ab602e87fcaddedd6adcfea Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 24 Jul 2023 09:14:37 +0200 Subject: [PATCH 034/147] sync --- ...iew_partner_form.x_global_location_number.xml | 8 ++++++++ snippets/base.view_partner_form.x_vst.xml | 8 ++++++++ ...odel.res_partner.x_global_location_number.xml | 16 ++++++++++++++++ snippets/ir_model.res_partner.x_vst.xml | 16 ++++++++++++++++ snippets/ir_model.sale_order.x_order_number.xml | 15 +++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 snippets/base.view_partner_form.x_global_location_number.xml create mode 100644 snippets/base.view_partner_form.x_vst.xml create mode 100644 snippets/ir_model.res_partner.x_global_location_number.xml create mode 100644 snippets/ir_model.res_partner.x_vst.xml create mode 100644 snippets/ir_model.sale_order.x_order_number.xml diff --git a/snippets/base.view_partner_form.x_global_location_number.xml b/snippets/base.view_partner_form.x_global_location_number.xml new file mode 100644 index 00000000..561afe67 --- /dev/null +++ b/snippets/base.view_partner_form.x_global_location_number.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/base.view_partner_form.x_vst.xml b/snippets/base.view_partner_form.x_vst.xml new file mode 100644 index 00000000..932abccb --- /dev/null +++ b/snippets/base.view_partner_form.x_vst.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/ir_model.res_partner.x_global_location_number.xml b/snippets/ir_model.res_partner.x_global_location_number.xml new file mode 100644 index 00000000..48861bd6 --- /dev/null +++ b/snippets/ir_model.res_partner.x_global_location_number.xml @@ -0,0 +1,16 @@ + + + + + [] + VSTGLN + res.partner + + x_global_location_number + + + + char + + + \ No newline at end of file diff --git a/snippets/ir_model.res_partner.x_vst.xml b/snippets/ir_model.res_partner.x_vst.xml new file mode 100644 index 00000000..79b4c29b --- /dev/null +++ b/snippets/ir_model.res_partner.x_vst.xml @@ -0,0 +1,16 @@ + + + + + [] + VST + res.partner + + x_vst + + + + char + + + \ No newline at end of file diff --git a/snippets/ir_model.sale_order.x_order_number.xml b/snippets/ir_model.sale_order.x_order_number.xml new file mode 100644 index 00000000..076e52ca --- /dev/null +++ b/snippets/ir_model.sale_order.x_order_number.xml @@ -0,0 +1,15 @@ + + + + + Bestellnummer Kunde + sale.order + + x_order_number + + + + Char + + + From 17d212ac5dc712313878725f7b37f2d4ef775372 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 24 Jul 2023 15:59:12 +0200 Subject: [PATCH 035/147] update snippet --- snippets/stock.report_delivery_document.title_supplement.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/snippets/stock.report_delivery_document.title_supplement.xml b/snippets/stock.report_delivery_document.title_supplement.xml index bbd26884..80557a7f 100644 --- a/snippets/stock.report_delivery_document.title_supplement.xml +++ b/snippets/stock.report_delivery_document.title_supplement.xml @@ -2,9 +2,7 @@ -

      - Delivery Slip -

      +

      Delivery Slip

      \ No newline at end of file From e1d90d41e29893c18bb16dedfbbd550739b143bf Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 25 Jul 2023 19:57:12 +0200 Subject: [PATCH 036/147] sync --- docker-compose.yml | 3 +- snippets/account.md | 16 +++++ ...ort_invoice_document.round_price_unit..xml | 8 +++ ...nt.report_invoice_document.style_tissa.xml | 8 +++ snippets/base.md | 30 +++++++++ snippets/ir_model.md | 66 +++++++++++++++++++ snippets/sale.md | 14 ++++ .../sale.view_order_form.x_order_number.xml | 8 +++ snippets/sale_blanket_order.md | 50 ++++++++++++-- ...etorder_document.replace_address_block.xml | 15 +++++ ...port_blanketorder_document.style_tissa.xml | 29 ++++++-- snippets/stock.md | 4 +- 12 files changed, 234 insertions(+), 17 deletions(-) create mode 100644 snippets/account.report_invoice_document.round_price_unit..xml create mode 100644 snippets/sale.view_order_form.x_order_number.xml create mode 100644 snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml diff --git a/docker-compose.yml b/docker-compose.yml index c34117f7..099dced5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: ports: - "127.0.0.1:8069:8069" volumes: - - odoo-data:/var/lib/odoo + - $HOME/.local/share/Odoo/filestore:/var/lib/odoo/filestore - ./config:/etc/odoo - ./addons:/mnt/addons - ./oca:/mnt/oca @@ -74,7 +74,6 @@ services: volumes: - cd-data:/var/jenkins_home volumes: - odoo-data: db-data: admin-data: mail-data: diff --git a/snippets/account.md b/snippets/account.md index 8cc550ff..282a9063 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -2265,6 +2265,14 @@ ID: `mint_system.account.report_invoice_document.style_tissa` text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + margin-bottom: 0px + + + + margin-bottom: 0px + + ``` @@ -4831,6 +4839,14 @@ ID: `mint_system.account.report_invoice_document.style_tissa` text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + margin-bottom: 0px + + + + margin-bottom: 0px + + ``` diff --git a/snippets/account.report_invoice_document.round_price_unit..xml b/snippets/account.report_invoice_document.round_price_unit..xml new file mode 100644 index 00000000..d691cce3 --- /dev/null +++ b/snippets/account.report_invoice_document.round_price_unit..xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/account.report_invoice_document.style_tissa.xml b/snippets/account.report_invoice_document.style_tissa.xml index ab7e9462..05f82d4a 100644 --- a/snippets/account.report_invoice_document.style_tissa.xml +++ b/snippets/account.report_invoice_document.style_tissa.xml @@ -27,4 +27,12 @@ text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + + margin-bottom: 0px + + + + margin-bottom: 0px + + diff --git a/snippets/base.md b/snippets/base.md index 2265ef59..9083342a 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -411,6 +411,21 @@ ID: `mint_system.base.view_partner_form.x_external_ref` ``` Source: [snippets/base.view_partner_form.x_external_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_external_ref.xml) +### X Global Location Number +ID: `mint_system.base.view_partner_form.x_global_location_number` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_form.x_global_location_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_global_location_number.xml) + ### X Packaging Ref ID: `mint_system.base.view_partner_form.x_packaging_ref` ```xml @@ -426,6 +441,21 @@ ID: `mint_system.base.view_partner_form.x_packaging_ref` ``` Source: [snippets/base.view_partner_form.x_packaging_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_packaging_ref.xml) +### X Vst +ID: `mint_system.base.view_partner_form.x_vst` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_form.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_vst.xml) + ## View Partner Tree ### Add Ref Zip Type ID: `mint_system.base.view_partner_tree.add_ref_zip_type` diff --git a/snippets/ir_model.md b/snippets/ir_model.md index aa31ab63..f37e3494 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -1686,6 +1686,28 @@ ID: `mint_system.ir_model.res_partner.x_external_ref` ``` Source: [snippets/ir_model.res_partner.x_external_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_external_ref.xml) +### X Global Location Number +ID: `mint_system.ir_model.res_partner.x_global_location_number` +```xml + + + + + [] + VSTGLN + res.partner + + x_global_location_number + + + + char + + + +``` +Source: [snippets/ir_model.res_partner.x_global_location_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_global_location_number.xml) + ### X Packaging Ref ID: `mint_system.ir_model.res_partner.x_packaging_ref` ```xml @@ -1732,6 +1754,28 @@ ID: `mint_system.ir_model.res_partner.x_stock_move_ids` ``` Source: [snippets/ir_model.res_partner.x_stock_move_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_stock_move_ids.xml) +### X Vst +ID: `mint_system.ir_model.res_partner.x_vst` +```xml + + + + + [] + VST + res.partner + + x_vst + + + + char + + + +``` +Source: [snippets/ir_model.res_partner.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_vst.xml) + ## Sale Blanket Order Line ### X Product Uom Category Id ID: `mint_system.ir_model.sale_blanket_order_line.x_product_uom_category_id` @@ -2141,6 +2185,28 @@ ID: `mint_system.ir_model.sale_order.x_incoterm_blanket_order` ``` Source: [snippets/ir_model.sale_order.x_incoterm_blanket_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml) +### X Order Number +ID: `mint_system.ir_model.sale_order.x_order_number` +```xml + + + + + Bestellnummer Kunde + sale.order + + x_order_number + + + + Char + + + + +``` +Source: [snippets/ir_model.sale_order.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_order_number.xml) + ### X Product Uom Qty ID: `mint_system.ir_model.sale_order.x_product_uom_qty` ```xml diff --git a/snippets/sale.md b/snippets/sale.md index 51e8b33c..710f0eda 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -3788,6 +3788,20 @@ ID: `mint_system.sale.view_order_form.x_margin_percent` ``` Source: [snippets/sale.view_order_form.x_margin_percent.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_margin_percent.xml) +### X Order Number +ID: `mint_system.sale.view_order_form.x_order_number` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_order_form.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_order_number.xml) + ### X Sudio Description ID: `mint_system.sale.view_order_form.x_sudio_description` ```xml diff --git a/snippets/sale.view_order_form.x_order_number.xml b/snippets/sale.view_order_form.x_order_number.xml new file mode 100644 index 00000000..cd6974d3 --- /dev/null +++ b/snippets/sale.view_order_form.x_order_number.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale_blanket_order.md b/snippets/sale_blanket_order.md index f1f93753..6d42b555 100644 --- a/snippets/sale_blanket_order.md +++ b/snippets/sale_blanket_order.md @@ -438,6 +438,27 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.remove_vat` ``` Source: [snippets/sale_blanket_order.report_blanketorder_document.remove_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.remove_vat.xml) +### Replace Address Block +ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_address_block` +```xml + +> + + +
      +
      +
      +
      +

      VAT: +

      +
      +
      + + + +``` +Source: [snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml) + ### Replace Infoblock ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_infoblock` ```xml @@ -810,16 +831,33 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_tissa` - - col-4 - - #{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml new file mode 100644 index 00000000..e8ea7335 --- /dev/null +++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml @@ -0,0 +1,15 @@ + +> + + +
      +
      +
      +
      +

      VAT: +

      +
      +
      + + + \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml b/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml index 723577ca..e54a997f 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml @@ -3,16 +3,33 @@ - - col-4 - - #{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto diff --git a/snippets/stock.md b/snippets/stock.md index b44b360d..11578346 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -3177,9 +3177,7 @@ ID: `mint_system.stock.report_delivery_document.title_supplement` -

      - Delivery Slip -

      +

      Delivery Slip

      From f977058dd0f3dc2a26ed47bc5f6a9a80242ae1ec Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 25 Jul 2023 19:59:58 +0200 Subject: [PATCH 037/147] ref --- enterprise | 2 +- oca/bank-payment | 2 +- oca/hr-holidays | 2 +- oca/manufacture | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/rest-framework | 2 +- oca/sale-workflow | 2 +- oca/server-backend | 2 +- oca/server-env | 2 +- oca/social | 2 +- oca/stock-logistics-workflow | 2 +- oca/web | 2 +- odoo | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/enterprise b/enterprise index 4c1ac69f..99df5b69 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 4c1ac69feecd2711b2eafe408f5eb85026466002 +Subproject commit 99df5b6936b0593b1c9a91067bd22f5aa7387259 diff --git a/oca/bank-payment b/oca/bank-payment index f64659dc..35e5de1d 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit f64659dcfc655aaf2c97cd3dad3bdee9812d9d3c +Subproject commit 35e5de1ddea0af9e19df2180bbd3512c23f35d0a diff --git a/oca/hr-holidays b/oca/hr-holidays index 3211429e..9005d54d 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit 3211429e61490107d128e9859b79bc113312143e +Subproject commit 9005d54de02fc8477365a6fd1ad67636f7a51066 diff --git a/oca/manufacture b/oca/manufacture index 01d9f531..d66d57c3 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 01d9f531c438d2c55d9956be2402b2c67cfda0e8 +Subproject commit d66d57c35c565b285b9e55cbc8121b64e62765d4 diff --git a/oca/product-attribute b/oca/product-attribute index 9f823fdc..a4f05938 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 9f823fdcda6b9b17f234f10bcae80e3776c790ef +Subproject commit a4f05938f0782c709246d7ace9c9bd0ac8a453a2 diff --git a/oca/project b/oca/project index d7b897b1..91fcc8cc 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit d7b897b14ecc14f3f10c212eef56eee00298d716 +Subproject commit 91fcc8cc7d50018814b16d20e1031f30fb497d8c diff --git a/oca/purchase-workflow b/oca/purchase-workflow index ce81a96c..79a74079 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit ce81a96c899f08ea7965ea9109bb108aaf7693ca +Subproject commit 79a74079457eda30c19acf3e4cffb228263611cc diff --git a/oca/rest-framework b/oca/rest-framework index 83ad8798..b834273f 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit 83ad8798a2a458f767ec37523aac4aa3315153f7 +Subproject commit b834273fcca8c34f791f1b07ddec0eb2fb453faf diff --git a/oca/sale-workflow b/oca/sale-workflow index 0e9d4b98..fa9393a9 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 0e9d4b98ec8c38383b8f84cd8c8d7db1ea1924d8 +Subproject commit fa9393a97b7792c4d50c58cdd8b631a1ae18cc01 diff --git a/oca/server-backend b/oca/server-backend index bebd6046..4cc8c0f7 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit bebd60466a7e450c46072b0772f57c67ac06cb5a +Subproject commit 4cc8c0f7b14da59470429cdd76678fbc4f1f198d diff --git a/oca/server-env b/oca/server-env index 5c3bde7c..d40461b2 160000 --- a/oca/server-env +++ b/oca/server-env @@ -1 +1 @@ -Subproject commit 5c3bde7cfca7287a08f9acb581fdc2c0647481f5 +Subproject commit d40461b2a7abc81e9a2660a5b1312b8b98e1864d diff --git a/oca/social b/oca/social index 3de2aeca..a5a5485d 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit 3de2aecae4e180fc76ada8f5ae6da4819a12b713 +Subproject commit a5a5485d8b69bdbc069c3b14391f7de433c6414d diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index 6bbc37af..196155ae 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit 6bbc37af9d1df05d897e2e5ec9ec7198219d5d6a +Subproject commit 196155ae89b0b4d5b2e7e3e42ae6e087fd2b1eee diff --git a/oca/web b/oca/web index 7c7778c5..c6f10535 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 7c7778c53618b36367cda349b3f5407da5c8af76 +Subproject commit c6f105356efc2d4eb87cb71105a9bd0363e1331e diff --git a/odoo b/odoo index 462c1eed..08f2ed7a 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 462c1eed41ecd975a511f7430e1fc303e449e869 +Subproject commit 08f2ed7a132b8df4cc6c1863b9cc1e75ab4ddf32 From 4207ac80222447f479e4d09a00938017718006ac Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 25 Jul 2023 21:37:59 +0200 Subject: [PATCH 038/147] increase tiemout --- config/odoo-native.conf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/odoo-native.conf b/config/odoo-native.conf index ce7eb4a8..2b58176d 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,11 +1,9 @@ [options] addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal -; admin_passwd = admin -admin_passwd = $pbkdf2-sha512$25000$rlUqpfTe2ztn7P2fcw7BOA$J9DDQN5WeT/.hyYeLNtJTOS6PhOsEbCeIN4iFaynjEY1PjW5zZwYVdR19qOEFVPOkR4HuHLi1EsV.juSjEc90w -limit_time_real = 480 +admin_passwd = $pbkdf2-sha512$25000$uBdCaA2hNAbA.B9DSOldiw$0HKIxJeRHdT6T10YSulefVHY6MGQUn5seDGJmOkY6eyKEVAfY9oqbkSw1BLZK2PYe51YGAmNoDMdoXmB7d6cpw +limit_time_real = 600 dbfilter = .* db_host = localhost db_password = odoo db_user = odoo -;without_demo = True -;log_level = debug + From 570f1ba5d70e43865e605324d5a3ab39d5e02987 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 26 Jul 2023 11:51:38 +0200 Subject: [PATCH 039/147] new submdoule management system --- .gitmodules | 4 ++++ config/odoo-native.conf | 2 +- config/odoo.conf | 2 +- docker-compose.yml | 4 +++- oca/management-system | 1 + task | 6 ++++++ 6 files changed, 16 insertions(+), 3 deletions(-) create mode 160000 oca/management-system diff --git a/.gitmodules b/.gitmodules index 25ea743a..ed3a9dc2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -214,3 +214,7 @@ path = addons/vertical_job_portal url = git@github.com:sozialinfo/odoo-apps-vertical-job-portal.git branch = 16.0 +[submodule "oca/management-system"] + path = oca/management-system + url = git@github.com:OCA/management-system.git + branch = 16.0 diff --git a/config/odoo-native.conf b/config/odoo-native.conf index 2b58176d..c95a0847 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal +addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system admin_passwd = $pbkdf2-sha512$25000$uBdCaA2hNAbA.B9DSOldiw$0HKIxJeRHdT6T10YSulefVHY6MGQUn5seDGJmOkY6eyKEVAfY9oqbkSw1BLZK2PYe51YGAmNoDMdoXmB7d6cpw limit_time_real = 600 dbfilter = .* diff --git a/config/odoo.conf b/config/odoo.conf index d2341651..941ee1ef 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal +addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system admin_passwd = admin data_dir = /var/lib/odoo limit_time_real = 480 diff --git a/docker-compose.yml b/docker-compose.yml index 099dced5..280599ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,8 @@ services: ports: - "127.0.0.1:8069:8069" volumes: - - $HOME/.local/share/Odoo/filestore:/var/lib/odoo/filestore + # - $HOME/.local/share/Odoo/filestore:/var/lib/odoo/filestore + - odoo-data:/var/lib/odoo - ./config:/etc/odoo - ./addons:/mnt/addons - ./oca:/mnt/oca @@ -74,6 +75,7 @@ services: volumes: - cd-data:/var/jenkins_home volumes: + odoo-data: db-data: admin-data: mail-data: diff --git a/oca/management-system b/oca/management-system new file mode 160000 index 00000000..f84bf207 --- /dev/null +++ b/oca/management-system @@ -0,0 +1 @@ +Subproject commit f84bf2079a7a0f970317fd645d3e3c1ca39b8eb7 diff --git a/task b/task index d418baf3..c49243bc 100755 --- a/task +++ b/task @@ -169,6 +169,10 @@ function open-url-with-delay(){ xdg-open $1 } +# function share-filestore(){ +# sudo chmod o+rwx -R ~/.local/share/Odoo/filestore +# } + function start() { DATABASE=$2 # Use default database if second param is not given @@ -203,6 +207,7 @@ function start() { fi if [[ "$1" =~ "odoo" ]]; then + # share-filestore docker-compose up -d odoo echo "Open http://localhost:8069 url in your browser." fi @@ -273,6 +278,7 @@ function init-db() { locale activate-venv + # share-filestore echo "Make sure only one odoo process is running when initalizing the database." odoo-bin --init base -d $DATABASE --config 'config/odoo-native.conf' --stop-after-init --no-http --load-language $ODOO_LANGUAGE } From 42d019b76b2d7079abd05edf0f256b9c73e00476 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 26 Jul 2023 12:30:23 +0200 Subject: [PATCH 040/147] add snippet --- ...ject.view_task_kanban.show_planned_date_begin.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 snippets/project.view_task_kanban.show_planned_date_begin.xml diff --git a/snippets/project.view_task_kanban.show_planned_date_begin.xml b/snippets/project.view_task_kanban.show_planned_date_begin.xml new file mode 100644 index 00000000..47add0ab --- /dev/null +++ b/snippets/project.view_task_kanban.show_planned_date_begin.xml @@ -0,0 +1,12 @@ + + + +
      + +
      + +
      + +
      + +       From aee558f9a051cb43fe7aae9caa3af7409b7ee385 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 28 Jul 2023 16:16:50 +0200 Subject: [PATCH 041/147] add snippet --- ...account.view_move_line_tree.show_cumulated_balance.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snippets/account.view_move_line_tree.show_cumulated_balance.xml diff --git a/snippets/account.view_move_line_tree.show_cumulated_balance.xml b/snippets/account.view_move_line_tree.show_cumulated_balance.xml new file mode 100644 index 00000000..aa190243 --- /dev/null +++ b/snippets/account.view_move_line_tree.show_cumulated_balance.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 1b9228b38948631157ed32347e7d2fbfa7d1b703 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 31 Jul 2023 08:50:58 +0200 Subject: [PATCH 042/147] ref --- addons/product_attribute | 2 +- addons/vertical_saas | 2 +- oca/sale-workflow | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/product_attribute b/addons/product_attribute index f0c16b15..ffabae97 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit f0c16b151da3fe598da0764f84bbc64566e108c7 +Subproject commit ffabae9703902a3329b257db46fc7c32d3d964b9 diff --git a/addons/vertical_saas b/addons/vertical_saas index cee91155..8bc3242f 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit cee91155d93faa5a0bb473b72c3bdc758432f0e6 +Subproject commit 8bc3242ff4040abf708af3e7d0790bd2760d76af diff --git a/oca/sale-workflow b/oca/sale-workflow index fa9393a9..c52b9a28 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit fa9393a97b7792c4d50c58cdd8b631a1ae18cc01 +Subproject commit c52b9a2885a142dead3c53e4b6f62b7d14e74b95 From 28374a155a661f4e37ab9647c65908b67a3e1084 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 31 Jul 2023 13:13:25 +0200 Subject: [PATCH 043/147] sync snippets --- .../hr.view_employee_form.user_id_domain.xml | 8 +++++ ...eet_view_tree_user.show_​product_uom_id.xml | 9 ++++++ snippets/ir_model.sale_order.x_as4import.xml | 15 ++++++++++ ...ect.edit_project.show_collaborator_ids.xml | 8 +++++ ...ct.view_task_form2.show_partner_mobile.xml | 7 +++++ ...purchaseorder_document.append_incoterm.xml | 14 +++++++++ ...ort_purchaseorder_document.format_date.xml | 8 +++++ ...ument.product_hide_bracket_description.xml | 9 ++++++ ...urchaseorder_document.replace_taxes_id.xml | 17 +++++++++++ ...ort_purchaseorder_document.round_price.xml | 2 +- ...ort_purchaseorder_document.style_tissa.xml | 30 +++++++++++++++++++ ...purchasequotation_document.format_date.xml | 2 +- ...ument.product_hide_bracket_description.xml | 10 +++++++ ...ew_quotation_tree.show_​delivery_status.xml | 8 +++++ ...etorder_document.add_payment_term copy.xml | 9 ++++++ ...blanketorder_document.add_payment_term.xml | 9 ++++++ ..._blanketorder_document.add_product_uom.xml | 14 +++++++++ ...etorder_document.replace_address_block.xml | 2 -- 18 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 snippets/hr.view_employee_form.user_id_domain.xml create mode 100644 snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml create mode 100644 snippets/ir_model.sale_order.x_as4import.xml create mode 100644 snippets/project.edit_project.show_collaborator_ids.xml create mode 100644 snippets/project.view_task_form2.show_partner_mobile.xml create mode 100644 snippets/purchase.report_purchaseorder_document.append_incoterm.xml create mode 100644 snippets/purchase.report_purchaseorder_document.format_date.xml create mode 100644 snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml create mode 100644 snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml create mode 100644 snippets/purchase.report_purchaseorder_document.style_tissa.xml create mode 100644 snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml create mode 100644 snippets/sale.view_quotation_tree.show_​delivery_status.xml create mode 100644 snippets/sale_blanket_order.report_blanketorder_document.add_payment_term copy.xml create mode 100644 snippets/sale_blanket_order.report_blanketorder_document.add_payment_term.xml create mode 100644 snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml diff --git a/snippets/hr.view_employee_form.user_id_domain.xml b/snippets/hr.view_employee_form.user_id_domain.xml new file mode 100644 index 00000000..f2c64e6c --- /dev/null +++ b/snippets/hr.view_employee_form.user_id_domain.xml @@ -0,0 +1,8 @@ + + + + + [] + + + diff --git a/snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml b/snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml new file mode 100644 index 00000000..75afc79c --- /dev/null +++ b/snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/snippets/ir_model.sale_order.x_as4import.xml b/snippets/ir_model.sale_order.x_as4import.xml new file mode 100644 index 00000000..30768c3d --- /dev/null +++ b/snippets/ir_model.sale_order.x_as4import.xml @@ -0,0 +1,15 @@ + + + + + AS4 Import + sale.order + + x_as4import + + + + boolean + + + diff --git a/snippets/project.edit_project.show_collaborator_ids.xml b/snippets/project.edit_project.show_collaborator_ids.xml new file mode 100644 index 00000000..e7a9cf35 --- /dev/null +++ b/snippets/project.edit_project.show_collaborator_ids.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/project.view_task_form2.show_partner_mobile.xml b/snippets/project.view_task_form2.show_partner_mobile.xml new file mode 100644 index 00000000..c9e9f845 --- /dev/null +++ b/snippets/project.view_task_form2.show_partner_mobile.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.append_incoterm.xml b/snippets/purchase.report_purchaseorder_document.append_incoterm.xml new file mode 100644 index 00000000..ca8c8826 --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.append_incoterm.xml @@ -0,0 +1,14 @@ + + + + +
      +
      + + Lieferbedingungen: + +
      +
      +       + +       \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.format_date.xml b/snippets/purchase.report_purchaseorder_document.format_date.xml new file mode 100644 index 00000000..8055f448 --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.format_date.xml @@ -0,0 +1,8 @@ + +> + + + "date" + + + diff --git a/snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml b/snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml new file mode 100644 index 00000000..e23a6230 --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml b/snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml new file mode 100644 index 00000000..9d159b75 --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml @@ -0,0 +1,17 @@ + + + + + + Taxes + + + + + + + + + + + \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.round_price.xml b/snippets/purchase.report_purchaseorder_document.round_price.xml index 07b3c0fd..3175a53a 100644 --- a/snippets/purchase.report_purchaseorder_document.round_price.xml +++ b/snippets/purchase.report_purchaseorder_document.round_price.xml @@ -1,7 +1,7 @@ - + diff --git a/snippets/purchase.report_purchaseorder_document.style_tissa.xml b/snippets/purchase.report_purchaseorder_document.style_tissa.xml new file mode 100644 index 00000000..e7cd0a1a --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.style_tissa.xml @@ -0,0 +1,30 @@ + + + + + + + + + {"widget": "contact", "fields": ["address"], "no_marker": True, "phone_icons": False} + + + + {"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False} + + + \ No newline at end of file diff --git a/snippets/purchase.report_purchasequotation_document.format_date.xml b/snippets/purchase.report_purchasequotation_document.format_date.xml index bc1741a5..53e5795f 100644 --- a/snippets/purchase.report_purchasequotation_document.format_date.xml +++ b/snippets/purchase.report_purchasequotation_document.format_date.xml @@ -1,7 +1,7 @@ - + "date" diff --git a/snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml b/snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml new file mode 100644 index 00000000..297dda13 --- /dev/null +++ b/snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_quotation_tree.show_​delivery_status.xml b/snippets/sale.view_quotation_tree.show_​delivery_status.xml new file mode 100644 index 00000000..86d823da --- /dev/null +++ b/snippets/sale.view_quotation_tree.show_​delivery_status.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term copy.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term copy.xml new file mode 100644 index 00000000..98f1c842 --- /dev/null +++ b/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term copy.xml @@ -0,0 +1,9 @@ + +
      +
      + + Zahlungsbedingungen: + +
      +
      +       \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term.xml new file mode 100644 index 00000000..98f1c842 --- /dev/null +++ b/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term.xml @@ -0,0 +1,9 @@ + +
      +
      + + Zahlungsbedingungen: + +
      +
      +       \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml new file mode 100644 index 00000000..910d7912 --- /dev/null +++ b/snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml @@ -0,0 +1,14 @@ + + + + + ME + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml index e8ea7335..1ef9737c 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml @@ -6,8 +6,6 @@
      -

      VAT: -

      From 1fe9d50ec6aea7a1cfc5c824192ac06f787373c6 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 31 Jul 2023 17:00:07 +0200 Subject: [PATCH 044/147] ref --- addons/product_attribute | 2 +- addons/vertical_saas | 2 +- enterprise | 2 +- oca/project | 2 +- oca/server-tools | 2 +- oca/timesheet | 2 +- oca/web | 2 +- odoo | 2 +- themes | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/product_attribute b/addons/product_attribute index ffabae97..8731ca4e 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit ffabae9703902a3329b257db46fc7c32d3d964b9 +Subproject commit 8731ca4e34eeaf06f8c67cad936d6116d2aea7c2 diff --git a/addons/vertical_saas b/addons/vertical_saas index 8bc3242f..4102468c 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 8bc3242ff4040abf708af3e7d0790bd2760d76af +Subproject commit 4102468c141b3c329321c4184df8f28426c019ae diff --git a/enterprise b/enterprise index 99df5b69..59cfadfa 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 99df5b6936b0593b1c9a91067bd22f5aa7387259 +Subproject commit 59cfadfabc246d782e4a359d365efb11b8af7ae7 diff --git a/oca/project b/oca/project index 91fcc8cc..83326b9a 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 91fcc8cc7d50018814b16d20e1031f30fb497d8c +Subproject commit 83326b9a330e89ea9662a0327669e59b647d5f96 diff --git a/oca/server-tools b/oca/server-tools index 2f8f08f2..50c551bb 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 2f8f08f27bb943cf137bdd0491351897e7c02bc0 +Subproject commit 50c551bb40cf474d35ec087970053aef889286a7 diff --git a/oca/timesheet b/oca/timesheet index 755dabca..57813f7d 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit 755dabca271fd2568a193463179656892686833c +Subproject commit 57813f7d48c13dcffa8b927a3168c5e163cf3889 diff --git a/oca/web b/oca/web index c6f10535..81e0ce57 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit c6f105356efc2d4eb87cb71105a9bd0363e1331e +Subproject commit 81e0ce57b27eebb8accb6acd21253916ba552834 diff --git a/odoo b/odoo index 08f2ed7a..7718e4c3 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 08f2ed7a132b8df4cc6c1863b9cc1e75ab4ddf32 +Subproject commit 7718e4c382c4bc844ae914307ae76c71da94ef07 diff --git a/themes b/themes index ed2fdd45..598fcffb 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit ed2fdd45f2cfeec1aae785ea7d73f43f2ca62cdb +Subproject commit 598fcffbae57c0eab422db669e75f52dd5c267e4 From a747e3f7c3d2dcc97f98ae00d6ff443bb55365bf Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 2 Aug 2023 11:13:18 +0200 Subject: [PATCH 045/147] snippets --- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/l10n-switzerland | 2 +- snippets/account.md | 45 ++++++ ...ort_invoice_document.round_price_unit.xml} | 0 ...t.portal_br_page.show_scenario_and_gap.xml | 22 +++ snippets/hr.md | 15 ++ snippets/hr_timesheet.md | 16 +++ ...et_view_tree_user.show_product_uom_id.xml} | 0 snippets/ir_model.md | 22 +++ snippets/project.md | 48 +++++++ ...w_task_form2.x_business_requirement_id.xml | 2 +- snippets/purchase.md | 129 +++++++++++++++++- snippets/sale.md | 14 ++ ...rder_line_view_form_readonly.edit_form.xml | 42 ++++++ ...w_quotation_tree.show_delivery_status.xml} | 0 snippets/sale_blanket_order.md | 22 ++- ...etorder_document.add_payment_term copy.xml | 9 -- ...blanketorder_document.add_payment_term.xml | 9 -- task | 22 +++ task.md | 11 +- 21 files changed, 403 insertions(+), 31 deletions(-) rename snippets/{account.report_invoice_document.round_price_unit..xml => account.report_invoice_document.round_price_unit.xml} (100%) create mode 100644 snippets/business_requirement.portal_br_page.show_scenario_and_gap.xml rename snippets/{hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml => hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml} (100%) create mode 100644 snippets/sale.sale_order_line_view_form_readonly.edit_form.xml rename snippets/{sale.view_quotation_tree.show_​delivery_status.xml => sale.view_quotation_tree.show_delivery_status.xml} (100%) delete mode 100644 snippets/sale_blanket_order.report_blanketorder_document.add_payment_term copy.xml delete mode 100644 snippets/sale_blanket_order.report_blanketorder_document.add_payment_term.xml diff --git a/oca/hr-attendance b/oca/hr-attendance index 96b8dbcc..5a0dddbc 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 +Subproject commit 5a0dddbc1ae8213958457cb0a0c3dd73474c24e5 diff --git a/oca/hr-holidays b/oca/hr-holidays index 9005d54d..d7e53901 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit 9005d54de02fc8477365a6fd1ad67636f7a51066 +Subproject commit d7e5390134d2ff71c1e3497c95307f6c36afa4f5 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index bb7affa6..97f98d96 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 +Subproject commit 97f98d96c7b2bf87dd5d9d4285ff59ec37fd9f07 diff --git a/snippets/account.md b/snippets/account.md index 282a9063..cfdbfe24 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -1834,6 +1834,21 @@ ID: `mint_system.account.report_invoice_document.reset_address` ``` Source: [snippets/account.report_invoice_document.reset_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.reset_address.xml) +### Round Price Unit +ID: `mint_system.account.report_invoice_document.round_price_unit` +```xml + + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.round_price_unit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.round_price_unit.xml) + ### Round Price ID: `mint_system.account.report_invoice_document.round_price` ```xml @@ -4408,6 +4423,21 @@ ID: `mint_system.account.report_invoice_document.reset_address` ``` Source: [snippets/account.report_invoice_document.reset_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.reset_address.xml) +### Round Price Unit +ID: `mint_system.account.report_invoice_document.round_price_unit` +```xml + + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.round_price_unit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.round_price_unit.xml) + ### Round Price ID: `mint_system.account.report_invoice_document.round_price` ```xml @@ -5736,6 +5766,21 @@ ID: `mint_system.account.view_move_line_tree_grouped_general.amount_currency_opt ``` Source: [snippets/account.view_move_line_tree_grouped_general.amount_currency_optional.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_line_tree_grouped_general.amount_currency_optional.xml) +## View Move Line Tree +### Show Cumulated Balance +ID: `mint_system.account.view_move_line_tree.show_cumulated_balance` +```xml + + + + + + + + +``` +Source: [snippets/account.view_move_line_tree.show_cumulated_balance.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_line_tree.show_cumulated_balance.xml) + ## View Move Tree ### X Account Codes ID: `mint_system.account.view_move_tree.x_account_codes` diff --git a/snippets/account.report_invoice_document.round_price_unit..xml b/snippets/account.report_invoice_document.round_price_unit.xml similarity index 100% rename from snippets/account.report_invoice_document.round_price_unit..xml rename to snippets/account.report_invoice_document.round_price_unit.xml diff --git a/snippets/business_requirement.portal_br_page.show_scenario_and_gap.xml b/snippets/business_requirement.portal_br_page.show_scenario_and_gap.xml new file mode 100644 index 00000000..f8377000 --- /dev/null +++ b/snippets/business_requirement.portal_br_page.show_scenario_and_gap.xml @@ -0,0 +1,22 @@ + + + +
      +
      +
      +
      + Scenario +
      +
      +
      +
      +
      +
      + Gap +
      +
      +
      +
      + \ No newline at end of file diff --git a/snippets/hr.md b/snippets/hr.md index bb9cb495..b3f02143 100644 --- a/snippets/hr.md +++ b/snippets/hr.md @@ -155,6 +155,21 @@ ID: `mint_system.hr.view_employee_form.plan_permission` ``` Source: [snippets/hr.view_employee_form.plan_permission.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr.view_employee_form.plan_permission.xml) +### User Id Domain +ID: `mint_system.hr.view_employee_form.user_id_domain` +```xml + + + + + [] + + + + +``` +Source: [snippets/hr.view_employee_form.user_id_domain.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr.view_employee_form.user_id_domain.xml) + ## View Employee Tree ### Add Mobile Phone ID: `mint_system.hr.view_employee_tree.add_mobile_phone` diff --git a/snippets/hr_timesheet.md b/snippets/hr_timesheet.md index cc2e89d5..9f6b9aac 100644 --- a/snippets/hr_timesheet.md +++ b/snippets/hr_timesheet.md @@ -423,6 +423,22 @@ ID: `mint_system.hr_timesheet.timesheet_view_tree_user.show_billable_type` ``` Source: [snippets/hr_timesheet.timesheet_view_tree_user.show_billable_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.timesheet_view_tree_user.show_billable_type.xml) +### Show ​Product Uom Id +ID: `mint_system.hr_timesheet.timesheet_view_tree_user.show_​product_uom_id` +```xml + + + + + + + + + + +``` +Source: [snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml) + ### X Timesheet Invoice Type ID: `mint_system.hr_timesheet.timesheet_view_tree_user.x_timesheet_invoice_type` ```xml diff --git a/snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml b/snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml similarity index 100% rename from snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml rename to snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml diff --git a/snippets/ir_model.md b/snippets/ir_model.md index f37e3494..3bd0f061 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -2139,6 +2139,28 @@ ID: `mint_system.ir_model.sale_order_line.x_weight_delivered` Source: [snippets/ir_model.sale_order_line.x_weight_delivered.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order_line.x_weight_delivered.xml) ## Sale Order +### X As4import +ID: `mint_system.ir_model.sale_order.x_as4import` +```xml + + + + + AS4 Import + sale.order + + x_as4import + + + + boolean + + + + +``` +Source: [snippets/ir_model.sale_order.x_as4import.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_as4import.xml) + ### X Client Project Ref ID: `mint_system.ir_model.sale_order.x_client_project_ref` ```xml diff --git a/snippets/project.md b/snippets/project.md index 3a60382d..720430b7 100644 --- a/snippets/project.md +++ b/snippets/project.md @@ -15,6 +15,21 @@ ID: `mint_system.project.edit_project.domain_action_view_so` ``` Source: [snippets/project.edit_project.domain_action_view_so.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.edit_project.domain_action_view_so.xml) +### Show Collaborator Ids +ID: `mint_system.project.edit_project.show_collaborator_ids` +```xml + + + + + + + + + +``` +Source: [snippets/project.edit_project.show_collaborator_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.edit_project.show_collaborator_ids.xml) + ### Show Date Start ID: `mint_system.project.edit_project.show_date_start` ```xml @@ -364,6 +379,19 @@ ID: `mint_system.project.view_task_form2.show_key` ``` Source: [snippets/project.view_task_form2.show_key.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.view_task_form2.show_key.xml) +### Show Partner Mobile +ID: `mint_system.project.view_task_form2.show_partner_mobile` +```xml + + + + + + + +``` +Source: [snippets/project.view_task_form2.show_partner_mobile.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.view_task_form2.show_partner_mobile.xml) + ### Timesheet Sort Date Desc ID: `mint_system.project.view_task_form2.timesheet_sort_date_desc` ```xml @@ -464,6 +492,26 @@ ID: `mint_system.project.view_task_form2.x_vehicle_id` ``` Source: [snippets/project.view_task_form2.x_vehicle_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.view_task_form2.x_vehicle_id.xml) +## View Task Kanban +### Show Planned Date Begin +ID: `mint_system.project.view_task_kanban.show_planned_date_begin` +```xml + + + +
      + +
      + +
      + +
      + +       + +``` +Source: [snippets/project.view_task_kanban.show_planned_date_begin.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.view_task_kanban.show_planned_date_begin.xml) + ## View Task Tree2 ### Sale Line Optional ID: `mint_system.project.view_task_tree2.sale_line_optional` diff --git a/snippets/project.view_task_form2.x_business_requirement_id.xml b/snippets/project.view_task_form2.x_business_requirement_id.xml index 3c811f0b..69508255 100644 --- a/snippets/project.view_task_form2.x_business_requirement_id.xml +++ b/snippets/project.view_task_form2.x_business_requirement_id.xml @@ -2,7 +2,7 @@ - + diff --git a/snippets/purchase.md b/snippets/purchase.md index 562d935e..d13018ba 100644 --- a/snippets/purchase.md +++ b/snippets/purchase.md @@ -480,6 +480,26 @@ ID: `mint_system.purchase.report_purchaseorder_document.add_taxes` ``` Source: [snippets/purchase.report_purchaseorder_document.add_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.add_taxes.xml) +### Append Incoterm +ID: `mint_system.purchase.report_purchaseorder_document.append_incoterm` +```xml + + + + +
      +
      + + Lieferbedingungen: + +
      +
      +       + +       +``` +Source: [snippets/purchase.report_purchaseorder_document.append_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.append_incoterm.xml) + ### Append Payment Terms ID: `mint_system.purchase.report_purchaseorder_document.append_payment_terms` ```xml @@ -565,6 +585,21 @@ ID: `mint_system.purchase.report_purchaseorder_document.format_as_date` ``` Source: [snippets/purchase.report_purchaseorder_document.format_as_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.format_as_date.xml) +### Format Date +ID: `mint_system.purchase.report_purchaseorder_document.format_date` +```xml + +> + + + "date" + + + + +``` +Source: [snippets/purchase.report_purchaseorder_document.format_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.format_date.xml) + ### Format Qty With Decimal ID: `mint_system.purchase.report_purchaseorder_document.format_qty_with_decimal` ```xml @@ -840,6 +875,21 @@ ID: `mint_system.purchase.report_purchaseorder_document.product_description_repl ``` Source: [snippets/purchase.report_purchaseorder_document.product_description_replace.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.product_description_replace.xml) +### Product Hide Bracket Description +ID: `mint_system.purchase.report_purchaseorder_document.product_hide_bracket_description` +```xml + + + + + + + + + +``` +Source: [snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml) + ### Qty Remaining ID: `mint_system.purchase.report_purchaseorder_document.qty_remaining` ```xml @@ -1195,13 +1245,36 @@ ID: `mint_system.purchase.report_purchaseorder_document.replace_representative` ``` Source: [snippets/purchase.report_purchaseorder_document.replace_representative.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.replace_representative.xml) +### Replace Taxes Id +ID: `mint_system.purchase.report_purchaseorder_document.replace_taxes_id` +```xml + + + + + + Taxes + + + + + + + + + + + +``` +Source: [snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml) + ### Round Price ID: `mint_system.purchase.report_purchaseorder_document.round_price` ```xml - + @@ -1376,6 +1449,42 @@ ID: `mint_system.purchase.report_purchaseorder_document.style_moser` ``` Source: [snippets/purchase.report_purchaseorder_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_moser.xml) +### Style Tissa +ID: `mint_system.purchase.report_purchaseorder_document.style_tissa` +```xml + + + + + + + + + {"widget": "contact", "fields": ["address"], "no_marker": True, "phone_icons": False} + + + + {"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False} + + + +``` +Source: [snippets/purchase.report_purchaseorder_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_tissa.xml) + ### Terms And Conditions ID: `mint_system.purchase.report_purchaseorder_document.terms_and_conditions` ```xml @@ -1676,7 +1785,7 @@ ID: `mint_system.purchase.report_purchasequotation_document.format_date` - + "date" @@ -1875,6 +1984,22 @@ ID: `mint_system.purchase.report_purchasequotation_document.modify_main_table` ``` Source: [snippets/purchase.report_purchasequotation_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchasequotation_document.modify_main_table.xml) +### Product Hide Bracket Description +ID: `mint_system.purchase.report_purchasequotation_document.product_hide_bracket_description` +```xml + + + + + + + + + + +``` +Source: [snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml) + ### Remove Date Planned ID: `mint_system.purchase.report_purchasequotation_document.remove_date_planned` ```xml diff --git a/snippets/sale.md b/snippets/sale.md index 710f0eda..c898e800 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -4264,6 +4264,20 @@ ID: `mint_system.sale.view_quotation_tree.replace_create_date` ``` Source: [snippets/sale.view_quotation_tree.replace_create_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.replace_create_date.xml) +### Show ​Delivery Status +ID: `mint_system.sale.view_quotation_tree.show_​delivery_status` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_quotation_tree.show_​delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_​delivery_status.xml) + ### Show ​Payment Term Id ID: `mint_system.sale.view_quotation_tree.show_​payment_term_id` ```xml diff --git a/snippets/sale.sale_order_line_view_form_readonly.edit_form.xml b/snippets/sale.sale_order_line_view_form_readonly.edit_form.xml new file mode 100644 index 00000000..b5c61420 --- /dev/null +++ b/snippets/sale.sale_order_line_view_form_readonly.edit_form.xml @@ -0,0 +1,42 @@ + + + +
      + + +
      +

      + +

      +
      + + + + + + + + + + + + + + + + + + + + + + + + + +       +
      + + +       \ No newline at end of file diff --git a/snippets/sale.view_quotation_tree.show_​delivery_status.xml b/snippets/sale.view_quotation_tree.show_delivery_status.xml similarity index 100% rename from snippets/sale.view_quotation_tree.show_​delivery_status.xml rename to snippets/sale.view_quotation_tree.show_delivery_status.xml diff --git a/snippets/sale_blanket_order.md b/snippets/sale_blanket_order.md index 6d42b555..6ed0dc99 100644 --- a/snippets/sale_blanket_order.md +++ b/snippets/sale_blanket_order.md @@ -213,6 +213,26 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_infotable` ``` Source: [snippets/sale_blanket_order.report_blanketorder_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.add_infotable.xml) +### Add Product Uom +ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_product_uom` +```xml + + + + + ME + + + + + + + + + +``` +Source: [snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml) + ### Address Block ID: `mint_system.sale_blanket_order.report_blanketorder_document.address_block` ```xml @@ -449,8 +469,6 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_address
      -

      VAT: -

      diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term copy.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term copy.xml deleted file mode 100644 index 98f1c842..00000000 --- a/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term copy.xml +++ /dev/null @@ -1,9 +0,0 @@ - -
      -
      - - Zahlungsbedingungen: - -
      -
      -       \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term.xml deleted file mode 100644 index 98f1c842..00000000 --- a/snippets/sale_blanket_order.report_blanketorder_document.add_payment_term.xml +++ /dev/null @@ -1,9 +0,0 @@ - -
      -
      - - Zahlungsbedingungen: - -
      -
      -       \ No newline at end of file diff --git a/task b/task index c49243bc..4ae63a78 100755 --- a/task +++ b/task @@ -448,6 +448,25 @@ function clear-assets() { docker exec db psql postgres://odoo:odoo@localhost/$DATABASE -c "delete from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';" } +function reset-views() { + if test -z "$1"; then echo "\$1 is empty."; exit; fi + + DATABASE=$1 + KEY=$(basename $2) + + # Use default database if second param is not given + if test -z "$2"; then + DATABASE="$GIT_BRANCH" + KEY=$(basename $1) + fi + + locale + activate-venv + echo "Reset views for key $KEY" + echo "self.env['ir.ui.view'].search([('key', 'ilike', '$KEY')]).reset_arch(mode='hard')" | + odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --no-http +} + function convert-database() { if test -z "$1"; then echo "\$1 is empty."; exit; fi @@ -1124,6 +1143,9 @@ case "$1" in source) activate-venv ;; + reset-views) + reset-views $2 $3 + ;; *) help task exit 1 diff --git a/task.md b/task.md index dceaffae..575e3014 100644 --- a/task.md +++ b/task.md @@ -7,7 +7,7 @@ | checkout-revision | [revision] | Switch to a different Odoo revision by tag name. | | clear-assets | [db] | Clear all assets of Odoo database. | | clear-filestore | [db] | Clear local filestore folder. No param will clear all filestores. Default is branch name. | -| convert-database | [db] | Convert database backup file from postgres 9.5 to latest. Default is branch name. | +| convert-database | [db] | Convert database backup file from postgres 9.5 to latest. Default is branch name. | | create-module | [path] | Create new Odoo module from template. | | disable-auto-install | | Disable auto install for enterprise modules. | | disable-mailserver | [env] | Disable mail server settings via xmlrpc. | @@ -41,20 +41,21 @@ | release-module | [path] | Create GitHub release for a module. | | remove-module | [db][name] | Remove target Odoo module. | | remove-submodule | [path] | Remove git submodule. | +| reset-views | [db][key] | Execute hard reset on views matching keys. | | restart | [name] | Restart docker container. | | save-config | [name] | Save Odoo database config | | send-support-mail | | Sends an mail for support@local to smtp://localhost | -| set-admin | [db] | Sets the password for the first user in database. Default is branch name. | +| set-admin | [db] | Sets the password for the first user in database. Default is branch name. | | source | | Source the Python virtual env. | | start | [name] [db] | Start docker container. Options: none, db, admin, odoo, native, mail. | -| start-psql | [db] | Start PSQL shell in Docker container. Default is branch name. | -| start-shell | [db] | Start Odoo shell from source folder. Default is branch name. | +| start-psql | [db] | Start PSQL shell in Docker container. Default is branch name. | +| start-shell | [db] | Start Odoo shell from source folder. Default is branch name. | | stop | [name] | Stop docker containers. | | switch-branch | [branch] | Switch submodules to target branch. | | test-jsonrpc | [env] | Test json rpc connection. | | test-module | [db][name,path] | Test target Odoo module. | | update-app-list | [db] | Update app list. | -| update-config | | Update odoo config. | +| update-config | | Update Odoo native and docker config files. | | update-docs | | Update project docs. | | update-module | [db][name,path] | Update target Odoo module. | | update-readme | [path] | Update Readme file of Odoo module collection. | From 65171d15a6e86030e7fba2b88654cbc454967418 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 2 Aug 2023 12:24:02 +0200 Subject: [PATCH 046/147] snippets --- ...t.portal_br_page.show_scenario_and_gap.xml | 22 ------------------- ...w_task_form2.x_business_requirement_id.xml | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 snippets/business_requirement.portal_br_page.show_scenario_and_gap.xml diff --git a/snippets/business_requirement.portal_br_page.show_scenario_and_gap.xml b/snippets/business_requirement.portal_br_page.show_scenario_and_gap.xml deleted file mode 100644 index f8377000..00000000 --- a/snippets/business_requirement.portal_br_page.show_scenario_and_gap.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - -
      -
      -
      -
      - Scenario -
      -
      -
      -
      -
      -
      - Gap -
      -
      -
      -
      - \ No newline at end of file diff --git a/snippets/project.view_task_form2.x_business_requirement_id.xml b/snippets/project.view_task_form2.x_business_requirement_id.xml index 69508255..3c811f0b 100644 --- a/snippets/project.view_task_form2.x_business_requirement_id.xml +++ b/snippets/project.view_task_form2.x_business_requirement_id.xml @@ -2,7 +2,7 @@ - + From 3caeff72d2eb1ecc1d5c7510f56aaacffbf798a1 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 3 Aug 2023 12:44:37 +0200 Subject: [PATCH 047/147] sync --- snippets/account.md | 18 +++-- ...t.report_invoice_document.show_lot_ids.xml | 9 ++- snippets/base.md | 15 ++++ ...view_partner_form.x_privacy_visibility.xml | 8 +++ snippets/hr_timesheet.md | 6 +- snippets/ir_model.md | 22 ++++++ ...model.res_partner.x_privacy_visibility.xml | 16 +++++ snippets/sale.md | 69 ++++++++++++++++++- snippets/sale.view_order_form.x_as4import.xml | 8 +++ snippets/stock.md | 38 +++++++--- ...delivery_document.replace_informations.xml | 3 +- ...rt_delivery_document.show_default_code.xml | 13 +++- ....report_delivery_document.show_lot_ids.xml | 22 ++++-- 13 files changed, 210 insertions(+), 37 deletions(-) create mode 100644 snippets/base.view_partner_form.x_privacy_visibility.xml create mode 100644 snippets/ir_model.res_partner.x_privacy_visibility.xml create mode 100644 snippets/sale.view_order_form.x_as4import.xml diff --git a/snippets/account.md b/snippets/account.md index cfdbfe24..11d1dadb 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -2133,9 +2133,12 @@ ID: `mint_system.account.report_invoice_document.show_lot_ids`
      Seriennummern: -
        -
      • -
      + + @@ -4722,9 +4725,12 @@ ID: `mint_system.account.report_invoice_document.show_lot_ids`
      Seriennummern: -
        -
      • -
      + + diff --git a/snippets/account.report_invoice_document.show_lot_ids.xml b/snippets/account.report_invoice_document.show_lot_ids.xml index fefffb35..149f55fe 100644 --- a/snippets/account.report_invoice_document.show_lot_ids.xml +++ b/snippets/account.report_invoice_document.show_lot_ids.xml @@ -6,9 +6,12 @@
      Seriennummern: -
        -
      • -
      + + diff --git a/snippets/base.md b/snippets/base.md index 9083342a..b2526f53 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -441,6 +441,21 @@ ID: `mint_system.base.view_partner_form.x_packaging_ref` ``` Source: [snippets/base.view_partner_form.x_packaging_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_packaging_ref.xml) +### X Privacy Visibility +ID: `mint_system.base.view_partner_form.x_privacy_visibility` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_form.x_privacy_visibility.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_privacy_visibility.xml) + ### X Vst ID: `mint_system.base.view_partner_form.x_vst` ```xml diff --git a/snippets/base.view_partner_form.x_privacy_visibility.xml b/snippets/base.view_partner_form.x_privacy_visibility.xml new file mode 100644 index 00000000..59eb39a6 --- /dev/null +++ b/snippets/base.view_partner_form.x_privacy_visibility.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/hr_timesheet.md b/snippets/hr_timesheet.md index 9f6b9aac..aed1bdf8 100644 --- a/snippets/hr_timesheet.md +++ b/snippets/hr_timesheet.md @@ -423,8 +423,8 @@ ID: `mint_system.hr_timesheet.timesheet_view_tree_user.show_billable_type` ``` Source: [snippets/hr_timesheet.timesheet_view_tree_user.show_billable_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.timesheet_view_tree_user.show_billable_type.xml) -### Show ​Product Uom Id -ID: `mint_system.hr_timesheet.timesheet_view_tree_user.show_​product_uom_id` +### Show Product Uom Id +ID: `mint_system.hr_timesheet.timesheet_view_tree_user.show_product_uom_id` ```xml @@ -437,7 +437,7 @@ ID: `mint_system.hr_timesheet.timesheet_view_tree_user.show_​product_uom_id` ``` -Source: [snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.timesheet_view_tree_user.show_​product_uom_id.xml) +Source: [snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml) ### X Timesheet Invoice Type ID: `mint_system.hr_timesheet.timesheet_view_tree_user.x_timesheet_invoice_type` diff --git a/snippets/ir_model.md b/snippets/ir_model.md index 3bd0f061..5c84e142 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -1730,6 +1730,28 @@ ID: `mint_system.ir_model.res_partner.x_packaging_ref` ``` Source: [snippets/ir_model.res_partner.x_packaging_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_packaging_ref.xml) +### X Privacy Visibility +ID: `mint_system.ir_model.res_partner.x_privacy_visibility` +```xml + + + + + [] + Sichtbarkeit + res.partner + + x_privacy_visibility + + + + boolean + + + +``` +Source: [snippets/ir_model.res_partner.x_privacy_visibility.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_privacy_visibility.xml) + ### X Stock Move Ids ID: `mint_system.ir_model.res_partner.x_stock_move_ids` ```xml diff --git a/snippets/ir_model.res_partner.x_privacy_visibility.xml b/snippets/ir_model.res_partner.x_privacy_visibility.xml new file mode 100644 index 00000000..216645da --- /dev/null +++ b/snippets/ir_model.res_partner.x_privacy_visibility.xml @@ -0,0 +1,16 @@ + + + + + [] + Sichtbarkeit + res.partner + + x_privacy_visibility + + + + boolean + + + \ No newline at end of file diff --git a/snippets/sale.md b/snippets/sale.md index c898e800..1749996b 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -3026,6 +3026,54 @@ ID: `mint_system.sale.report_saleorder_pro_forma.append_signature` Source: [snippets/sale.report_saleorder_pro_forma.append_signature.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_pro_forma.append_signature.xml) ## Sale Order Line View Form Readonly +### Edit Form +ID: `mint_system.sale.sale_order_line_view_form_readonly.edit_form` +```xml + + + +
      + + +
      +

      + +

      +
      + + + + + + + + + + + + + + + + + + + + + + + + + +       +
      + + +       +``` +Source: [snippets/sale.sale_order_line_view_form_readonly.edit_form.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.edit_form.xml) + ### Edit Price Unit ID: `mint_system.sale.sale_order_line_view_form_readonly.edit_price_unit` ```xml @@ -3724,6 +3772,21 @@ ID: `mint_system.sale.view_order_form.show_stock_purchase_line_ids` ``` Source: [snippets/sale.view_order_form.show_stock_purchase_line_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_stock_purchase_line_ids.xml) +### X As4import +ID: `mint_system.sale.view_order_form.x_as4import` +```xml + + + + + + + + + +``` +Source: [snippets/sale.view_order_form.x_as4import.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_as4import.xml) + ### X Client Project Ref ID: `mint_system.sale.view_order_form.x_client_project_ref` ```xml @@ -4264,8 +4327,8 @@ ID: `mint_system.sale.view_quotation_tree.replace_create_date` ``` Source: [snippets/sale.view_quotation_tree.replace_create_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.replace_create_date.xml) -### Show ​Delivery Status -ID: `mint_system.sale.view_quotation_tree.show_​delivery_status` +### Show Delivery Status +ID: `mint_system.sale.view_quotation_tree.show_delivery_status` ```xml @@ -4276,7 +4339,7 @@ ID: `mint_system.sale.view_quotation_tree.show_​delivery_status` ``` -Source: [snippets/sale.view_quotation_tree.show_​delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_​delivery_status.xml) +Source: [snippets/sale.view_quotation_tree.show_delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_delivery_status.xml) ### Show ​Payment Term Id ID: `mint_system.sale.view_quotation_tree.show_​payment_term_id` diff --git a/snippets/sale.view_order_form.x_as4import.xml b/snippets/sale.view_order_form.x_as4import.xml new file mode 100644 index 00000000..0c0f7d15 --- /dev/null +++ b/snippets/sale.view_order_form.x_as4import.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/stock.md b/snippets/stock.md index 11578346..a17ec52c 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -2299,8 +2299,7 @@ ID: `mint_system.stock.report_delivery_document.replace_informations`  Unsere Referenz: - - + Ihre Referenz: @@ -2920,8 +2919,17 @@ ID: `mint_system.stock.report_delivery_document.show_default_code` + + + + - + Referenz @@ -2933,7 +2941,7 @@ ID: `mint_system.stock.report_delivery_document.show_default_code` --> - + @@ -2949,20 +2957,28 @@ ID: `mint_system.stock.report_delivery_document.show_lot_ids` - + - - -
        + + +
        + Seriennummern: + + + + + + + +         diff --git a/snippets/stock.report_delivery_document.replace_informations.xml b/snippets/stock.report_delivery_document.replace_informations.xml index 539cef58..2388eeca 100644 --- a/snippets/stock.report_delivery_document.replace_informations.xml +++ b/snippets/stock.report_delivery_document.replace_informations.xml @@ -37,8 +37,7 @@  Unsere Referenz: - - + Ihre Referenz: diff --git a/snippets/stock.report_delivery_document.show_default_code.xml b/snippets/stock.report_delivery_document.show_default_code.xml index 967b7a2f..df435dd8 100644 --- a/snippets/stock.report_delivery_document.show_default_code.xml +++ b/snippets/stock.report_delivery_document.show_default_code.xml @@ -1,8 +1,17 @@ + + + + - + Referenz @@ -14,7 +23,7 @@ --> - + diff --git a/snippets/stock.report_delivery_document.show_lot_ids.xml b/snippets/stock.report_delivery_document.show_lot_ids.xml index d7a96f25..be75cfaa 100644 --- a/snippets/stock.report_delivery_document.show_lot_ids.xml +++ b/snippets/stock.report_delivery_document.show_lot_ids.xml @@ -1,20 +1,28 @@ - + - - -
          + + +
          + Seriennummern: + + + + + + + +           \ No newline at end of file From fb69d4d14857c12e4af496d904bff446ee569559 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 3 Aug 2023 14:08:36 +0200 Subject: [PATCH 048/147] ref --- addons/partner_contact | 2 +- addons/sale_workflow | 2 +- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/l10n-switzerland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/partner_contact b/addons/partner_contact index aedc2a9d..443af12c 160000 --- a/addons/partner_contact +++ b/addons/partner_contact @@ -1 +1 @@ -Subproject commit aedc2a9dde8f0cc3cf1f5243f10393cecb239333 +Subproject commit 443af12c52ed8efc0338be2793a9d5c839f72b16 diff --git a/addons/sale_workflow b/addons/sale_workflow index c7e5482b..865d2321 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit c7e5482be8c6cbfa9cd54fbbe721c162a971bbf4 +Subproject commit 865d2321913549314b393af05a3c460267c3bcf1 diff --git a/oca/hr-attendance b/oca/hr-attendance index 5a0dddbc..96b8dbcc 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 5a0dddbc1ae8213958457cb0a0c3dd73474c24e5 +Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 diff --git a/oca/hr-holidays b/oca/hr-holidays index d7e53901..9005d54d 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit d7e5390134d2ff71c1e3497c95307f6c36afa4f5 +Subproject commit 9005d54de02fc8477365a6fd1ad67636f7a51066 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 97f98d96..bb7affa6 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 97f98d96c7b2bf87dd5d9d4285ff59ec37fd9f07 +Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 From 71cb8a0a0d2813ca054192fb61e2fb0edbe438f5 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 16 Aug 2023 12:18:16 +0200 Subject: [PATCH 049/147] sync --- snippets/account.md | 122 ++++++++++++++++++ ....report_invoice_document.move_incoterm.xml | 4 +- ....report_invoice_document.show_categ_id.xml | 10 ++ ....report_invoice_document.show_order_id.xml | 16 +++ ...rt_invoice_document.show_sale_line_ids.xml | 16 +++ snippets/base.md | 84 ++++++++++++ .../base.view_partner_form.show_color.xml | 8 ++ snippets/base.view_partner_form.show_type.xml | 8 ++ ...se.view_partner_tree.format_decoration.xml | 3 + snippets/base.view_partner_tree.x_bexioid.xml | 8 ++ ..._partner_tree.x_global_location_number.xml | 8 ++ snippets/base.view_partner_tree.x_vst.xml | 8 ++ snippets/calendar.md | 105 +++++++++++++++ ...view_calendar_event_calendar.set_color.xml | 8 ++ ...r.view_calendar_event_calendar.x_color.xml | 8 ++ ...endar.view_calendar_event_form.x_color.xml | 8 ++ snippets/industry_fsm.md | 15 +++ ...fsm.project_task_view_list_fsm.show_id.xml | 8 ++ snippets/ir_model.calendar_event.x_color.xml | 15 +++ snippets/ir_model.md | 70 ++++++++++ ...ale_order.x_payment_term_blanket_order.xml | 17 +++ ...ir_model.stock_quant.x_expiration_date.xml | 17 +++ snippets/mrp.md | 111 ++++++++++++---- ...ee_view.show_format_date_planned_start.xml | 8 ++ ...p_production_components.remove_barcode.xml | 5 + ...rp_production_components.show_expected.xml | 11 ++ ...t_mrp_production_components.show_stock.xml | 17 +++ snippets/mrp.report_mrporder.add_padding.xml | 21 +-- .../mrp.report_mrporder.remove_barcode.xml | 4 +- ...mrp.report_mrporder.show_lot_producing.xml | 8 ++ snippets/mrp.report_mrporder.show_stock.xml | 5 - snippets/purchase.md | 14 ++ ...hase_order_kpis_tree.format_date_order.xml | 8 ++ snippets/purchase_requisition.md | 57 +++++++- ...port_purchaserequisitions.add_date_end.xml | 12 ++ ..._purchaserequisitions.add_payment_term.xml | 13 ++ ...eport_purchaserequisitions.style_gelso.xml | 20 ++- snippets/sale.md | 91 ++++++++++--- ..._saleorder_document.add_signature_note.xml | 16 ++- ...eport_saleorder_document.show_categ_id.xml | 10 ++ ...e.view_order_form.show_commitment_date.xml | 8 ++ ...rder_form.x_payment_term_blanket_order.xml | 8 ++ ...view_order_tree.format_delivery_status.xml | 11 ++ ...ew_quotation_tree.show_delivery_status.xml | 8 -- snippets/stock.md | 47 +++++++ ....report_delivery_document.replace_name.xml | 10 ++ ...earch_product_lot_filter.filter_active.xml | 8 ++ ..._quant_tree_editable.x_expiration_date.xml | 8 ++ 48 files changed, 1007 insertions(+), 98 deletions(-) create mode 100644 snippets/account.report_invoice_document.show_categ_id.xml create mode 100644 snippets/account.report_invoice_document.show_order_id.xml create mode 100644 snippets/account.report_invoice_document.show_sale_line_ids.xml create mode 100644 snippets/base.view_partner_form.show_color.xml create mode 100644 snippets/base.view_partner_form.show_type.xml create mode 100644 snippets/base.view_partner_tree.format_decoration.xml create mode 100644 snippets/base.view_partner_tree.x_bexioid.xml create mode 100644 snippets/base.view_partner_tree.x_global_location_number.xml create mode 100644 snippets/base.view_partner_tree.x_vst.xml create mode 100644 snippets/calendar.view_calendar_event_calendar.set_color.xml create mode 100644 snippets/calendar.view_calendar_event_calendar.x_color.xml create mode 100644 snippets/calendar.view_calendar_event_form.x_color.xml create mode 100644 snippets/industry_fsm.project_task_view_list_fsm.show_id.xml create mode 100644 snippets/ir_model.calendar_event.x_color.xml create mode 100644 snippets/ir_model.sale_order.x_payment_term_blanket_order.xml create mode 100644 snippets/ir_model.stock_quant.x_expiration_date.xml create mode 100644 snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml create mode 100644 snippets/mrp.report_mrp_production_components.remove_barcode.xml create mode 100644 snippets/mrp.report_mrp_production_components.show_expected.xml create mode 100644 snippets/mrp.report_mrp_production_components.show_stock.xml create mode 100644 snippets/mrp.report_mrporder.show_lot_producing.xml create mode 100644 snippets/purchase.purchase_order_kpis_tree.format_date_order.xml create mode 100644 snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml create mode 100644 snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml create mode 100644 snippets/sale.report_saleorder_document.show_categ_id.xml create mode 100644 snippets/sale.view_order_form.show_commitment_date.xml create mode 100644 snippets/sale.view_order_form.x_payment_term_blanket_order.xml create mode 100644 snippets/sale.view_order_tree.format_delivery_status.xml delete mode 100644 snippets/sale.view_quotation_tree.show_delivery_status.xml create mode 100644 snippets/stock.report_delivery_document.replace_name.xml create mode 100644 snippets/stock.search_product_lot_filter.filter_active.xml create mode 100644 snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml diff --git a/snippets/account.md b/snippets/account.md index 11d1dadb..82069884 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -2052,6 +2052,22 @@ ID: `mint_system.account.report_invoice_document.set_title_font_size` ``` Source: [snippets/account.report_invoice_document.set_title_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.set_title_font_size.xml) +### Show Categ Id +ID: `mint_system.account.report_invoice_document.show_categ_id` +```xml + + + + +
          + +
          +           + +           +``` +Source: [snippets/account.report_invoice_document.show_categ_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_categ_id.xml) + ### Show Customer Info Product Code ID: `mint_system.account.report_invoice_document.show_customer_info_product_code` ```xml @@ -2146,6 +2162,29 @@ ID: `mint_system.account.report_invoice_document.show_lot_ids` ``` Source: [snippets/account.report_invoice_document.show_lot_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_lot_ids.xml) +### Show Order Id +ID: `mint_system.account.report_invoice_document.show_order_id` +```xml + + + + + + + + + + + Dienstleistung gemäss Rapport # + + + + + + +``` +Source: [snippets/account.report_invoice_document.show_order_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_order_id.xml) + ### Show Product Name ID: `mint_system.account.report_invoice_document.show_product_name` ```xml @@ -2167,6 +2206,28 @@ ID: `mint_system.account.report_invoice_document.show_product_name` ``` Source: [snippets/account.report_invoice_document.show_product_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_product_name.xml) +### Show Sale Line Ids +ID: `mint_system.account.report_invoice_document.show_sale_line_ids` +```xml + + + + + + H.S. Code + + + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.show_sale_line_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_sale_line_ids.xml) + ### Show Shipping Address ID: `mint_system.account.report_invoice_document.show_shipping_address` ```xml @@ -4644,6 +4705,22 @@ ID: `mint_system.account.report_invoice_document.set_title_font_size` ``` Source: [snippets/account.report_invoice_document.set_title_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.set_title_font_size.xml) +### Show Categ Id +ID: `mint_system.account.report_invoice_document.show_categ_id` +```xml + + + + +
          + +
          +           + +           +``` +Source: [snippets/account.report_invoice_document.show_categ_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_categ_id.xml) + ### Show Customer Info Product Code ID: `mint_system.account.report_invoice_document.show_customer_info_product_code` ```xml @@ -4738,6 +4815,29 @@ ID: `mint_system.account.report_invoice_document.show_lot_ids` ``` Source: [snippets/account.report_invoice_document.show_lot_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_lot_ids.xml) +### Show Order Id +ID: `mint_system.account.report_invoice_document.show_order_id` +```xml + + + + + + + + + + + Dienstleistung gemäss Rapport # + + + + + + +``` +Source: [snippets/account.report_invoice_document.show_order_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_order_id.xml) + ### Show Product Name ID: `mint_system.account.report_invoice_document.show_product_name` ```xml @@ -4759,6 +4859,28 @@ ID: `mint_system.account.report_invoice_document.show_product_name` ``` Source: [snippets/account.report_invoice_document.show_product_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_product_name.xml) +### Show Sale Line Ids +ID: `mint_system.account.report_invoice_document.show_sale_line_ids` +```xml + + + + + + H.S. Code + + + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.show_sale_line_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_sale_line_ids.xml) + ### Show Shipping Address ID: `mint_system.account.report_invoice_document.show_shipping_address` ```xml diff --git a/snippets/account.report_invoice_document.move_incoterm.xml b/snippets/account.report_invoice_document.move_incoterm.xml index 72689579..116aeb91 100644 --- a/snippets/account.report_invoice_document.move_incoterm.xml +++ b/snippets/account.report_invoice_document.move_incoterm.xml @@ -4,8 +4,8 @@

          Incoterm: - - - +

          + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.show_categ_id.xml b/snippets/account.report_invoice_document.show_categ_id.xml new file mode 100644 index 00000000..0ff9d930 --- /dev/null +++ b/snippets/account.report_invoice_document.show_categ_id.xml @@ -0,0 +1,10 @@ + + + + +
          + +
          +           + +           \ No newline at end of file diff --git a/snippets/account.report_invoice_document.show_order_id.xml b/snippets/account.report_invoice_document.show_order_id.xml new file mode 100644 index 00000000..b7f5a8c2 --- /dev/null +++ b/snippets/account.report_invoice_document.show_order_id.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + Dienstleistung gemäss Rapport # + + + + + diff --git a/snippets/account.report_invoice_document.show_sale_line_ids.xml b/snippets/account.report_invoice_document.show_sale_line_ids.xml new file mode 100644 index 00000000..0968bbdb --- /dev/null +++ b/snippets/account.report_invoice_document.show_sale_line_ids.xml @@ -0,0 +1,16 @@ + + + + + + H.S. Code + + + + + + + + + + \ No newline at end of file diff --git a/snippets/base.md b/snippets/base.md index b2526f53..15a6aec5 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -322,6 +322,21 @@ ID: `mint_system.base.view_partner_form.move_ref` ``` Source: [snippets/base.view_partner_form.move_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_ref.xml) +### Show Color +ID: `mint_system.base.view_partner_form.show_color` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_form.show_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.show_color.xml) + ### Show Industry ID: `mint_system.base.view_partner_form.show_industry` ```xml @@ -337,6 +352,21 @@ ID: `mint_system.base.view_partner_form.show_industry` ``` Source: [snippets/base.view_partner_form.show_industry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.show_industry.xml) +### Show Type +ID: `mint_system.base.view_partner_form.show_type` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_form.show_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.show_type.xml) + ### Show User Id ID: `mint_system.base.view_partner_form.show_user_id` ```xml @@ -494,6 +524,15 @@ ID: `mint_system.base.view_partner_tree.add_ref_zip_type` ``` Source: [snippets/base.view_partner_tree.add_ref_zip_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.add_ref_zip_type.xml) +### Format Decoration +ID: `mint_system.base.view_partner_tree.format_decoration` +```xml + + is_company + +``` +Source: [snippets/base.view_partner_tree.format_decoration.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.format_decoration.xml) + ### Move Zip And City ID: `mint_system.base.view_partner_tree.move_zip_and_city` ```xml @@ -602,6 +641,51 @@ ID: `mint_system.base.view_partner_tree.show_type` ``` Source: [snippets/base.view_partner_tree.show_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_type.xml) +### X Bexioid +ID: `mint_system.base.view_partner_tree.x_bexioid` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_tree.x_bexioid.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_bexioid.xml) + +### X Global Location Number +ID: `mint_system.base.view_partner_tree.x_global_location_number` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_tree.x_global_location_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_global_location_number.xml) + +### X Vst +ID: `mint_system.base.view_partner_tree.x_vst` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_tree.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_vst.xml) + ## View Res Bank Tree ### Add Zip ID: `mint_system.base.view_res_bank_tree.add_zip` diff --git a/snippets/base.view_partner_form.show_color.xml b/snippets/base.view_partner_form.show_color.xml new file mode 100644 index 00000000..00245ff5 --- /dev/null +++ b/snippets/base.view_partner_form.show_color.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/base.view_partner_form.show_type.xml b/snippets/base.view_partner_form.show_type.xml new file mode 100644 index 00000000..b626c284 --- /dev/null +++ b/snippets/base.view_partner_form.show_type.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/base.view_partner_tree.format_decoration.xml b/snippets/base.view_partner_tree.format_decoration.xml new file mode 100644 index 00000000..7c4afaac --- /dev/null +++ b/snippets/base.view_partner_tree.format_decoration.xml @@ -0,0 +1,3 @@ + + is_company + \ No newline at end of file diff --git a/snippets/base.view_partner_tree.x_bexioid.xml b/snippets/base.view_partner_tree.x_bexioid.xml new file mode 100644 index 00000000..c7ace11d --- /dev/null +++ b/snippets/base.view_partner_tree.x_bexioid.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/base.view_partner_tree.x_global_location_number.xml b/snippets/base.view_partner_tree.x_global_location_number.xml new file mode 100644 index 00000000..b33ccd47 --- /dev/null +++ b/snippets/base.view_partner_tree.x_global_location_number.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/base.view_partner_tree.x_vst.xml b/snippets/base.view_partner_tree.x_vst.xml new file mode 100644 index 00000000..cea40014 --- /dev/null +++ b/snippets/base.view_partner_tree.x_vst.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/calendar.md b/snippets/calendar.md index 8decb82b..1941af5a 100644 --- a/snippets/calendar.md +++ b/snippets/calendar.md @@ -15,6 +15,21 @@ ID: `mint_system.calendar.view_calendar_event_calendar.default_mode_week` ``` Source: [snippets/calendar.view_calendar_event_calendar.default_mode_week.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.default_mode_week.xml) +### Set Color +ID: `mint_system.calendar.view_calendar_event_calendar.set_color` +```xml + + + + + user_id + + + + +``` +Source: [snippets/calendar.view_calendar_event_calendar.set_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.set_color.xml) + ### Show Location ID: `mint_system.calendar.view_calendar_event_calendar.show_location` ```xml @@ -30,6 +45,21 @@ ID: `mint_system.calendar.view_calendar_event_calendar.show_location` ``` Source: [snippets/calendar.view_calendar_event_calendar.show_location.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.show_location.xml) +### X Color +ID: `mint_system.calendar.view_calendar_event_calendar.x_color` +```xml + + + + + x_color + + + + +``` +Source: [snippets/calendar.view_calendar_event_calendar.x_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.x_color.xml) + ## View Calendar Event Calendar Timeline ### View ID: `mint_system.calendar.view_calendar_event_calendar_timeline.view` @@ -51,6 +81,67 @@ ID: `mint_system.calendar.view_calendar_event_calendar_timeline.view` ``` Source: [snippets/calendar.view_calendar_event_calendar_timeline.view.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar_timeline.view.xml) +## View Calendar Event Calendar +### Default Mode Week +ID: `mint_system.calendar.view_calendar_event_calendar.default_mode_week` +```xml + + + + + week + + + + +``` +Source: [snippets/calendar.view_calendar_event_calendar.default_mode_week.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.default_mode_week.xml) + +### Set Color +ID: `mint_system.calendar.view_calendar_event_calendar.set_color` +```xml + + + + + user_id + + + + +``` +Source: [snippets/calendar.view_calendar_event_calendar.set_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.set_color.xml) + +### Show Location +ID: `mint_system.calendar.view_calendar_event_calendar.show_location` +```xml + + + + + + + + + +``` +Source: [snippets/calendar.view_calendar_event_calendar.show_location.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.show_location.xml) + +### X Color +ID: `mint_system.calendar.view_calendar_event_calendar.x_color` +```xml + + + + + x_color + + + + +``` +Source: [snippets/calendar.view_calendar_event_calendar.x_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.x_color.xml) + ## View Calendar Event Form ### Show Res Model And Id ID: `mint_system.calendar.view_calendar_event_form.show_res_model_and_id` @@ -67,3 +158,17 @@ ID: `mint_system.calendar.view_calendar_event_form.show_res_model_and_id` ``` Source: [snippets/calendar.view_calendar_event_form.show_res_model_and_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_form.show_res_model_and_id.xml) +### X Color +ID: `mint_system.calendar.view_calendar_event_form.x_color` +```xml + + + + + + + + +``` +Source: [snippets/calendar.view_calendar_event_form.x_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_form.x_color.xml) + diff --git a/snippets/calendar.view_calendar_event_calendar.set_color.xml b/snippets/calendar.view_calendar_event_calendar.set_color.xml new file mode 100644 index 00000000..983e0449 --- /dev/null +++ b/snippets/calendar.view_calendar_event_calendar.set_color.xml @@ -0,0 +1,8 @@ + + + + + user_id + + + diff --git a/snippets/calendar.view_calendar_event_calendar.x_color.xml b/snippets/calendar.view_calendar_event_calendar.x_color.xml new file mode 100644 index 00000000..88fcfc9a --- /dev/null +++ b/snippets/calendar.view_calendar_event_calendar.x_color.xml @@ -0,0 +1,8 @@ + + + + + x_color + + + diff --git a/snippets/calendar.view_calendar_event_form.x_color.xml b/snippets/calendar.view_calendar_event_form.x_color.xml new file mode 100644 index 00000000..0d0a360e --- /dev/null +++ b/snippets/calendar.view_calendar_event_form.x_color.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/industry_fsm.md b/snippets/industry_fsm.md index bf45ea56..54b7987d 100644 --- a/snippets/industry_fsm.md +++ b/snippets/industry_fsm.md @@ -1,4 +1,19 @@ # Industry Fsm +## Project Task View List Fsm +### Show Id +ID: `mint_system.industry_fsm.project_task_view_list_fsm.show_id` +```xml + + + + + + + + +``` +Source: [snippets/industry_fsm.project_task_view_list_fsm.show_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/industry_fsm.project_task_view_list_fsm.show_id.xml) + ## Worksheet Custom ### Add Info ID: `mint_system.industry_fsm.worksheet_custom.add_info` diff --git a/snippets/industry_fsm.project_task_view_list_fsm.show_id.xml b/snippets/industry_fsm.project_task_view_list_fsm.show_id.xml new file mode 100644 index 00000000..c740aad5 --- /dev/null +++ b/snippets/industry_fsm.project_task_view_list_fsm.show_id.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/ir_model.calendar_event.x_color.xml b/snippets/ir_model.calendar_event.x_color.xml new file mode 100644 index 00000000..7d398768 --- /dev/null +++ b/snippets/ir_model.calendar_event.x_color.xml @@ -0,0 +1,15 @@ + + + + + Farbkennzeichnung + calendar.event + + x_color + + + + integer + + + diff --git a/snippets/ir_model.md b/snippets/ir_model.md index 5c84e142..6706fecd 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -513,6 +513,29 @@ ID: `mint_system.ir_model.business_requirement.x_task_id` ``` Source: [snippets/ir_model.business_requirement.x_task_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.business_requirement.x_task_id.xml) +## Calendar Event +### X Color +ID: `mint_system.ir_model.calendar_event.x_color` +```xml + + + + + Farbkennzeichnung + calendar.event + + x_color + + + + integer + + + + +``` +Source: [snippets/ir_model.calendar_event.x_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.calendar_event.x_color.xml) + ## Crm Lead ### X Date Start ID: `mint_system.ir_model.crm_lead.x_date_start` @@ -2251,6 +2274,30 @@ ID: `mint_system.ir_model.sale_order.x_order_number` ``` Source: [snippets/ir_model.sale_order.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_order_number.xml) +### X Payment Term Blanket Order +ID: `mint_system.ir_model.sale_order.x_payment_term_blanket_order` +```xml + + + + + Zahlungsbedingungen Rahmenauftrag + sale.order + + x_payment_term_blanket_order + + + + many2one + account.payment.terms + order_line.blanket_order_line.order_id.payment_term_id + + + + +``` +Source: [snippets/ir_model.sale_order.x_payment_term_blanket_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_payment_term_blanket_order.xml) + ### X Product Uom Qty ID: `mint_system.ir_model.sale_order.x_product_uom_qty` ```xml @@ -2698,6 +2745,29 @@ ID: `mint_system.ir_model.stock_production_lot.x_weight_uom` Source: [snippets/ir_model.stock_production_lot.x_weight_uom.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_production_lot.x_weight_uom.xml) ## Stock Quant +### X Expiration Date +ID: `mint_system.ir_model.stock_quant.x_expiration_date` +```xml + + + + + Ablaufdatum + stock.quant + + x_expiration_date + + + + datetime + stock.lot + lot_id.x_expiration_date + + + +``` +Source: [snippets/ir_model.stock_quant.x_expiration_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_quant.x_expiration_date.xml) + ### X Last Delivery Partner Id ID: `mint_system.ir_model.stock_quant.x_last_delivery_partner_id` ```xml diff --git a/snippets/ir_model.sale_order.x_payment_term_blanket_order.xml b/snippets/ir_model.sale_order.x_payment_term_blanket_order.xml new file mode 100644 index 00000000..91f7c8a0 --- /dev/null +++ b/snippets/ir_model.sale_order.x_payment_term_blanket_order.xml @@ -0,0 +1,17 @@ + + + + + Zahlungsbedingungen Rahmenauftrag + sale.order + + x_payment_term_blanket_order + + + + many2one + account.payment.terms + order_line.blanket_order_line.order_id.payment_term_id + + + diff --git a/snippets/ir_model.stock_quant.x_expiration_date.xml b/snippets/ir_model.stock_quant.x_expiration_date.xml new file mode 100644 index 00000000..4df3cf59 --- /dev/null +++ b/snippets/ir_model.stock_quant.x_expiration_date.xml @@ -0,0 +1,17 @@ + + + + + Ablaufdatum + stock.quant + + x_expiration_date + + + + datetime + stock.lot + lot_id.x_expiration_date + + + \ No newline at end of file diff --git a/snippets/mrp.md b/snippets/mrp.md index 6bc6ab5c..7cc4e9e2 100644 --- a/snippets/mrp.md +++ b/snippets/mrp.md @@ -729,6 +729,21 @@ ID: `mint_system.mrp.mrp_production_tree_view.hide_date_deadline` ``` Source: [snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml) +### Show Format Date Planned Start +ID: `mint_system.mrp.mrp_production_tree_view.show_format_date_planned_start` +```xml + + + + + date + + + + +``` +Source: [snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml) + ### Show X Date Deadline ID: `mint_system.mrp.mrp_production_tree_view.show_x_date_deadline` ```xml @@ -822,30 +837,11 @@ ID: `mint_system.mrp.report_mrporder.add_padding` - - - - col-5 - - - col-5 - - - col-5 - - - col-5 - - - - - padding-top: 2rem - - + padding-top: 2rem @@ -1192,10 +1188,8 @@ Source: [snippets/mrp.report_mrporder.quality_points.xml](https://github.com/Min ID: `mint_system.mrp.report_mrporder.remove_barcode` ```xml - - - + ``` Source: [snippets/mrp.report_mrporder.remove_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrporder.remove_barcode.xml) @@ -1284,6 +1278,20 @@ ID: `mint_system.mrp.report_mrporder.show_expected` ``` Source: [snippets/mrp.report_mrporder.show_expected.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrporder.show_expected.xml) +### Show Lot Producing +ID: `mint_system.mrp.report_mrporder.show_lot_producing` +```xml + + + + +
          Los: + +           +           +``` +Source: [snippets/mrp.report_mrporder.show_lot_producing.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrporder.show_lot_producing.xml) + ### Show Lot ID: `mint_system.mrp.report_mrporder.show_lot` ```xml @@ -1396,15 +1404,62 @@ ID: `mint_system.mrp.report_mrporder.show_stock`           - - -
          Los: - -           ``` Source: [snippets/mrp.report_mrporder.show_stock.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrporder.show_stock.xml) +## Report Mrp Production Components +### Remove Barcode +ID: `mint_system.mrp.report_mrp_production_components.remove_barcode` +```xml + + + + + +``` +Source: [snippets/mrp.report_mrp_production_components.remove_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrp_production_components.remove_barcode.xml) + +### Show Expected +ID: `mint_system.mrp.report_mrp_production_components.show_expected` +```xml + + + + +
          + Expected date: + +
          +           +           +           +``` +Source: [snippets/mrp.report_mrp_production_components.show_expected.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrp_production_components.show_expected.xml) + +### Show Stock +ID: `mint_system.mrp.report_mrp_production_components.show_stock` +```xml + + + + + Lagerort (Los) + + + + + + + () +
          +           + +           +           +``` +Source: [snippets/mrp.report_mrp_production_components.show_stock.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrp_production_components.show_stock.xml) + ## Stock Report Delivery Kit Sections ### Expand Section Heading ID: `mint_system.mrp.stock_report_delivery_kit_sections.expand_section_heading` diff --git a/snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml b/snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml new file mode 100644 index 00000000..8580f01b --- /dev/null +++ b/snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml @@ -0,0 +1,8 @@ + + + + + date + + + diff --git a/snippets/mrp.report_mrp_production_components.remove_barcode.xml b/snippets/mrp.report_mrp_production_components.remove_barcode.xml new file mode 100644 index 00000000..bbb36193 --- /dev/null +++ b/snippets/mrp.report_mrp_production_components.remove_barcode.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/snippets/mrp.report_mrp_production_components.show_expected.xml b/snippets/mrp.report_mrp_production_components.show_expected.xml new file mode 100644 index 00000000..ef15bc08 --- /dev/null +++ b/snippets/mrp.report_mrp_production_components.show_expected.xml @@ -0,0 +1,11 @@ + + + + +
          + Expected date: + +
          +           +           +           \ No newline at end of file diff --git a/snippets/mrp.report_mrp_production_components.show_stock.xml b/snippets/mrp.report_mrp_production_components.show_stock.xml new file mode 100644 index 00000000..953b0ad9 --- /dev/null +++ b/snippets/mrp.report_mrp_production_components.show_stock.xml @@ -0,0 +1,17 @@ + + + + + Lagerort (Los) + + + + + + + () +
          +           + +           +           \ No newline at end of file diff --git a/snippets/mrp.report_mrporder.add_padding.xml b/snippets/mrp.report_mrporder.add_padding.xml index 1ad4c40f..2e757476 100644 --- a/snippets/mrp.report_mrporder.add_padding.xml +++ b/snippets/mrp.report_mrporder.add_padding.xml @@ -1,30 +1,11 @@ - - - - col-5 - - - col-5 - - - col-5 - - - col-5 - - - - - padding-top: 2rem - - + padding-top: 2rem diff --git a/snippets/mrp.report_mrporder.remove_barcode.xml b/snippets/mrp.report_mrporder.remove_barcode.xml index f0d951f5..3afcc6f8 100644 --- a/snippets/mrp.report_mrporder.remove_barcode.xml +++ b/snippets/mrp.report_mrporder.remove_barcode.xml @@ -1,6 +1,4 @@ - - - + \ No newline at end of file diff --git a/snippets/mrp.report_mrporder.show_lot_producing.xml b/snippets/mrp.report_mrporder.show_lot_producing.xml new file mode 100644 index 00000000..76fda748 --- /dev/null +++ b/snippets/mrp.report_mrporder.show_lot_producing.xml @@ -0,0 +1,8 @@ + + + + +
          Los: + +           +           \ No newline at end of file diff --git a/snippets/mrp.report_mrporder.show_stock.xml b/snippets/mrp.report_mrporder.show_stock.xml index 3027bf32..e8838ead 100644 --- a/snippets/mrp.report_mrporder.show_stock.xml +++ b/snippets/mrp.report_mrporder.show_stock.xml @@ -15,9 +15,4 @@           - - -
          Los: - -           \ No newline at end of file diff --git a/snippets/purchase.md b/snippets/purchase.md index d13018ba..bfe4358c 100644 --- a/snippets/purchase.md +++ b/snippets/purchase.md @@ -275,6 +275,20 @@ ID: `mint_system.purchase.purchase_order_kpis_tree.add_mail_reception_confirmed` ``` Source: [snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml) +### Format Date Order +ID: `mint_system.purchase.purchase_order_kpis_tree.format_date_order` +```xml + + + + + date + + + +``` +Source: [snippets/purchase.purchase_order_kpis_tree.format_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml) + ## Purchase Order Line Tree ### Reset View ID: `mint_system.purchase.purchase_order_line_tree.reset_view` diff --git a/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml b/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml new file mode 100644 index 00000000..20f60979 --- /dev/null +++ b/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml @@ -0,0 +1,8 @@ + + + + + date + + + \ No newline at end of file diff --git a/snippets/purchase_requisition.md b/snippets/purchase_requisition.md index b5f2d3d4..116af5c7 100644 --- a/snippets/purchase_requisition.md +++ b/snippets/purchase_requisition.md @@ -52,6 +52,24 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_address_bl ``` Source: [snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml) +### Add Date End +ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_date_end` +```xml + + + + +
          + Agreement Deadline: +
          + +
          +           + +           +``` +Source: [snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml) + ### Add Description ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_description` ```xml @@ -233,6 +251,25 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_infotable` ``` Source: [snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml) +### Add Payment Term +ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_payment_term` +```xml + + + + +
          +
          + Payment Terms: + +
          +
          +           + +           +``` +Source: [snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml) + ### Add Price Subtotal ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_price_subtotal` ```xml @@ -876,8 +913,8 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_gelso` .o_report_layout_boxed strong { color: #000000; } - .col-3 { - margin-bottom: 1rem !important; + div#info_table { + margin-bottom: 1rem; } div#address { font-size: 16px; @@ -886,6 +923,22 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_gelso`           + + col-auto + + + + col-auto + + + + col-auto + + + + col-auto + + ``` Source: [snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml) diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml new file mode 100644 index 00000000..64d6ee47 --- /dev/null +++ b/snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml @@ -0,0 +1,12 @@ + + + + +
          + Agreement Deadline: +
          + +
          +           + +           \ No newline at end of file diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml new file mode 100644 index 00000000..f3d99349 --- /dev/null +++ b/snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml @@ -0,0 +1,13 @@ + + + + +
          +
          + Payment Terms: + +
          +
          +           + +           \ No newline at end of file diff --git a/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml b/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml index 8e6a136b..e9840fc4 100644 --- a/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml +++ b/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml @@ -16,8 +16,8 @@ .o_report_layout_boxed strong { color: #000000; } - .col-3 { - margin-bottom: 1rem !important; + div#info_table { + margin-bottom: 1rem; } div#address { font-size: 16px; @@ -26,4 +26,20 @@ + + col-auto + + + + col-auto + + + + col-auto + + + + col-auto + + \ No newline at end of file diff --git a/snippets/sale.md b/snippets/sale.md index 1749996b..f03205d9 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -1371,19 +1371,21 @@ ID: `mint_system.sale.report_saleorder_document.add_signature_note`

          - -

          -

          Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.
          -
          -
          + +

          +

          Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.
          +
          +
          Ort/Datum: _________________ Unterschrift Kunde: __________________________________

          -
          +
          +

          @@ -2560,6 +2562,22 @@ ID: `mint_system.sale.report_saleorder_document.set_title_font_size` ``` Source: [snippets/sale.report_saleorder_document.set_title_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.set_title_font_size.xml) +### Show Categ Id +ID: `mint_system.sale.report_saleorder_document.show_categ_id` +```xml + + + + +
          + +
          +           + +           +``` +Source: [snippets/sale.report_saleorder_document.show_categ_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.show_categ_id.xml) + ### Show Default Code ID: `mint_system.sale.report_saleorder_document.show_default_code` ```xml @@ -3685,6 +3703,20 @@ ID: `mint_system.sale.view_order_form.show_carrier_method` ``` Source: [snippets/sale.view_order_form.show_carrier_method.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_carrier_method.xml) +### Show Commitment Date +ID: `mint_system.sale.view_order_form.show_commitment_date` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_order_form.show_commitment_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_commitment_date.xml) + ### Show Order Line Project Id ID: `mint_system.sale.view_order_form.show_order_line_project_id` ```xml @@ -3865,6 +3897,20 @@ ID: `mint_system.sale.view_order_form.x_order_number` ``` Source: [snippets/sale.view_order_form.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_order_number.xml) +### X Payment Term Blanket Order +ID: `mint_system.sale.view_order_form.x_payment_term_blanket_order` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_order_form.x_payment_term_blanket_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_payment_term_blanket_order.xml) + ### X Sudio Description ID: `mint_system.sale.view_order_form.x_sudio_description` ```xml @@ -4239,6 +4285,23 @@ ID: `mint_system.sale.view_order_tree.add_comment` ``` Source: [snippets/sale.view_order_tree.add_comment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.add_comment.xml) +### Format Delivery Status +ID: `mint_system.sale.view_order_tree.format_delivery_status` +```xml + + + + + badge + delivery_status=='full' + delivery_status=='pending' + delivery_status=='partial' + + + +``` +Source: [snippets/sale.view_order_tree.format_delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.format_delivery_status.xml) + ### Show Partner Shipping ID: `mint_system.sale.view_order_tree.show_partner_shipping` ```xml @@ -4327,20 +4390,6 @@ ID: `mint_system.sale.view_quotation_tree.replace_create_date` ``` Source: [snippets/sale.view_quotation_tree.replace_create_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.replace_create_date.xml) -### Show Delivery Status -ID: `mint_system.sale.view_quotation_tree.show_delivery_status` -```xml - - - - - - - - -``` -Source: [snippets/sale.view_quotation_tree.show_delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_delivery_status.xml) - ### Show ​Payment Term Id ID: `mint_system.sale.view_quotation_tree.show_​payment_term_id` ```xml diff --git a/snippets/sale.report_saleorder_document.add_signature_note.xml b/snippets/sale.report_saleorder_document.add_signature_note.xml index 69fc59ae..94bf4be1 100644 --- a/snippets/sale.report_saleorder_document.add_signature_note.xml +++ b/snippets/sale.report_saleorder_document.add_signature_note.xml @@ -2,19 +2,21 @@

          - -

          -

          Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.
          -
          -
          + +

          +

          Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.
          +
          +
          Ort/Datum: _________________ Unterschrift Kunde: __________________________________

          -
          +
          +

          \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.show_categ_id.xml b/snippets/sale.report_saleorder_document.show_categ_id.xml new file mode 100644 index 00000000..b1a9d77a --- /dev/null +++ b/snippets/sale.report_saleorder_document.show_categ_id.xml @@ -0,0 +1,10 @@ + + + + +
          + +
          +           + +           \ No newline at end of file diff --git a/snippets/sale.view_order_form.show_commitment_date.xml b/snippets/sale.view_order_form.show_commitment_date.xml new file mode 100644 index 00000000..5e728a1d --- /dev/null +++ b/snippets/sale.view_order_form.show_commitment_date.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_order_form.x_payment_term_blanket_order.xml b/snippets/sale.view_order_form.x_payment_term_blanket_order.xml new file mode 100644 index 00000000..a5f4d556 --- /dev/null +++ b/snippets/sale.view_order_form.x_payment_term_blanket_order.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_order_tree.format_delivery_status.xml b/snippets/sale.view_order_tree.format_delivery_status.xml new file mode 100644 index 00000000..071be569 --- /dev/null +++ b/snippets/sale.view_order_tree.format_delivery_status.xml @@ -0,0 +1,11 @@ + + + + + badge + delivery_status=='full' + delivery_status=='pending' + delivery_status=='partial' + + + \ No newline at end of file diff --git a/snippets/sale.view_quotation_tree.show_delivery_status.xml b/snippets/sale.view_quotation_tree.show_delivery_status.xml deleted file mode 100644 index 86d823da..00000000 --- a/snippets/sale.view_quotation_tree.show_delivery_status.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/snippets/stock.md b/snippets/stock.md index a17ec52c..fd4c3f8e 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -2469,6 +2469,22 @@ ID: `mint_system.stock.report_delivery_document.replace_infotable` ``` Source: [snippets/stock.report_delivery_document.replace_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_infotable.xml) +### Replace Name +ID: `mint_system.stock.report_delivery_document.replace_name` +```xml + + + + +

          + Delivery slip +

          +           + +           +``` +Source: [snippets/stock.report_delivery_document.replace_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_name.xml) + ### Replace Order Definition ID: `mint_system.stock.report_delivery_document.replace_order_definition` ```xml @@ -5907,6 +5923,22 @@ ID: `mint_system.stock.report_picking.x_packaging_uom_id` ``` Source: [snippets/stock.report_picking.x_packaging_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.x_packaging_uom_id.xml) +## Search Product Lot Filter +### Filter Active +ID: `mint_system.stock.search_product_lot_filter.filter_active` +```xml + + + + + + + + + +``` +Source: [snippets/stock.search_product_lot_filter.filter_active.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.search_product_lot_filter.filter_active.xml) + ## Stock Report Delivery Aggregated Move Lines ### Add Country Of Origin And Hs Code ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.add_country_of_origin_and_hs_code` @@ -7053,6 +7085,21 @@ ID: `mint_system.stock.view_stock_quant_tree_editable.show_reserved_quantity` ``` Source: [snippets/stock.view_stock_quant_tree_editable.show_reserved_quantity.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_stock_quant_tree_editable.show_reserved_quantity.xml) +### X Expiration Date +ID: `mint_system.stock.view_stock_quant_tree_editable.x_expiration_date` +```xml + + + + + + + + + +``` +Source: [snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml) + ## View Stock Quant Tree ### Show Reserved Quantity ID: `mint_system.stock.view_stock_quant_tree.show_reserved_quantity` diff --git a/snippets/stock.report_delivery_document.replace_name.xml b/snippets/stock.report_delivery_document.replace_name.xml new file mode 100644 index 00000000..e6f175b5 --- /dev/null +++ b/snippets/stock.report_delivery_document.replace_name.xml @@ -0,0 +1,10 @@ + + + + +

          + Delivery slip +

          +           + +           \ No newline at end of file diff --git a/snippets/stock.search_product_lot_filter.filter_active.xml b/snippets/stock.search_product_lot_filter.filter_active.xml new file mode 100644 index 00000000..477e354c --- /dev/null +++ b/snippets/stock.search_product_lot_filter.filter_active.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml b/snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml new file mode 100644 index 00000000..1e33f66a --- /dev/null +++ b/snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml @@ -0,0 +1,8 @@ + + + + + + + + From bfe65406d2b2f27f3f59edf69755a9963861a411 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 16 Aug 2023 12:36:12 +0200 Subject: [PATCH 050/147] ref + new submdoule --- .gitmodules | 4 ++++ addons/vertical_job_portal | 2 +- config/odoo-native.conf | 2 +- config/odoo.conf | 2 +- enterprise | 2 +- oca/account-closing | 2 +- oca/account-financial-reporting | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/bank-payment | 2 +- oca/bank-statement-import | 2 +- oca/brand | 2 +- oca/business-requirement | 2 +- oca/community-data-files | 2 +- oca/connector | 2 +- oca/contract | 2 +- oca/credit-control | 2 +- oca/crm | 2 +- oca/edi | 2 +- oca/hr | 2 +- oca/hr-holidays | 2 +- oca/knowledge | 2 +- oca/management-system | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-backend | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/social | 2 +- oca/stock-logistics-warehouse | 2 +- oca/timesheet | 2 +- oca/web | 2 +- oca/website | 2 +- odoo | 2 +- 40 files changed, 43 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index ed3a9dc2..272ec10b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -218,3 +218,7 @@ path = oca/management-system url = git@github.com:OCA/management-system.git branch = 16.0 +[submodule "oca/hr-holidays"] + path = oca/hr-holidays + url = git@github.com:OCA/hr-holidays.git + branch = 16.0 diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 31c8c70b..2ded3fc7 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 31c8c70b687bff11960c68843df3200dec84dd96 +Subproject commit 2ded3fc7bdbc49bfc138b6373d59e17996a7702a diff --git a/config/odoo-native.conf b/config/odoo-native.conf index c95a0847..ba0c194a 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system +addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system,oca/hr-holidays admin_passwd = $pbkdf2-sha512$25000$uBdCaA2hNAbA.B9DSOldiw$0HKIxJeRHdT6T10YSulefVHY6MGQUn5seDGJmOkY6eyKEVAfY9oqbkSw1BLZK2PYe51YGAmNoDMdoXmB7d6cpw limit_time_real = 600 dbfilter = .* diff --git a/config/odoo.conf b/config/odoo.conf index 941ee1ef..df26ad5e 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system +addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays admin_passwd = admin data_dir = /var/lib/odoo limit_time_real = 480 diff --git a/enterprise b/enterprise index 59cfadfa..e74eda3c 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 59cfadfabc246d782e4a359d365efb11b8af7ae7 +Subproject commit e74eda3c716df2dd84f62309fca24addc39bb989 diff --git a/oca/account-closing b/oca/account-closing index ab30edc2..72da376d 160000 --- a/oca/account-closing +++ b/oca/account-closing @@ -1 +1 @@ -Subproject commit ab30edc2aca805805ff91283344d81313d993c9c +Subproject commit 72da376da6407c8f7867cbd9584261de21ad6307 diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting index eb9148ed..0d2bcce3 160000 --- a/oca/account-financial-reporting +++ b/oca/account-financial-reporting @@ -1 +1 @@ -Subproject commit eb9148ed7064f4523ea0b6fa79fea5c2048451f0 +Subproject commit 0d2bcce35e277847b2fea8217bdbee070610b589 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index cf5a2e9b..cebdf328 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit cf5a2e9bd56b0d37e54c379cd883cedf93820b39 +Subproject commit cebdf3287f26cca048be468e72c1887035ec3139 diff --git a/oca/account-invoicing b/oca/account-invoicing index d9d2b545..6ddc91cc 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit d9d2b545e78fffe5bc535054ef5a2aef674a657d +Subproject commit 6ddc91cc8a0a64b2974f042b3388d5811c5e957b diff --git a/oca/bank-payment b/oca/bank-payment index 35e5de1d..e6fdaa38 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 35e5de1ddea0af9e19df2180bbd3512c23f35d0a +Subproject commit e6fdaa3809ff3547cec15265823e76d9d7142166 diff --git a/oca/bank-statement-import b/oca/bank-statement-import index fb2f434b..408b163d 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit fb2f434b2941d887466e1cc6a2cd78d9bf6aff92 +Subproject commit 408b163da3932691df06f60a41b39a4901c4110b diff --git a/oca/brand b/oca/brand index 96169606..6eae42f7 160000 --- a/oca/brand +++ b/oca/brand @@ -1 +1 @@ -Subproject commit 961696064d0fb30fe12efc4d927bebf071fe44f3 +Subproject commit 6eae42f7885a80baddb6c4ab2ca31d51ac21d943 diff --git a/oca/business-requirement b/oca/business-requirement index 6fd2e144..f970f8f1 160000 --- a/oca/business-requirement +++ b/oca/business-requirement @@ -1 +1 @@ -Subproject commit 6fd2e1444d132682080c29d94a66b80ead29adc8 +Subproject commit f970f8f19c18fe175276de39bb51152c1dd7d6c4 diff --git a/oca/community-data-files b/oca/community-data-files index f30be9a4..73f2d67c 160000 --- a/oca/community-data-files +++ b/oca/community-data-files @@ -1 +1 @@ -Subproject commit f30be9a406b8bdcd845d391f381a625957b6fdcb +Subproject commit 73f2d67cba7f9fc70266443b1e7aa779075b1757 diff --git a/oca/connector b/oca/connector index 6ee1fe0e..a7c73625 160000 --- a/oca/connector +++ b/oca/connector @@ -1 +1 @@ -Subproject commit 6ee1fe0eec8dd23ce1cd2079e214883b07971ad6 +Subproject commit a7c7362582d49355e84e0530d60ee5726ea62d5d diff --git a/oca/contract b/oca/contract index 06e18aa0..5cde4670 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit 06e18aa08ce25b0555a41761a70fb6cac9a5d7b9 +Subproject commit 5cde46708d685462e463d1aba755f43afc82ed87 diff --git a/oca/credit-control b/oca/credit-control index 51c3dcaf..5874de2c 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 51c3dcafbab78b75f1cb472cf814e10864e2cac0 +Subproject commit 5874de2cd3ad69cafbfe1bca6e7593552f47744a diff --git a/oca/crm b/oca/crm index 4015316d..09ba1575 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit 4015316dcfdbc2252c4c6df06468d1e5ed17ed47 +Subproject commit 09ba15753e3c6e17bdcda94036f33f446318ceca diff --git a/oca/edi b/oca/edi index 7bc140a6..d49b6cd2 160000 --- a/oca/edi +++ b/oca/edi @@ -1 +1 @@ -Subproject commit 7bc140a69423685b11e66c7776ff702b02e484b0 +Subproject commit d49b6cd2811b52b0ab5a35113e3b090d17e76820 diff --git a/oca/hr b/oca/hr index 36827fd7..2a5870a1 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit 36827fd7cc9255f938ac83a26c04bdc6f0b8f485 +Subproject commit 2a5870a1615d3578247c4325391cd957dd506fab diff --git a/oca/hr-holidays b/oca/hr-holidays index 9005d54d..8d7a684b 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit 9005d54de02fc8477365a6fd1ad67636f7a51066 +Subproject commit 8d7a684b125c98856f093af9fbd6e98e02b38497 diff --git a/oca/knowledge b/oca/knowledge index 2d90c953..7b2ecf93 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit 2d90c953c3fe324abc5d08d3844f67218d1bcc5c +Subproject commit 7b2ecf9340a14c072fafe1fd82ea3d91a79c52cc diff --git a/oca/management-system b/oca/management-system index f84bf207..32c62afb 160000 --- a/oca/management-system +++ b/oca/management-system @@ -1 +1 @@ -Subproject commit f84bf2079a7a0f970317fd645d3e3c1ca39b8eb7 +Subproject commit 32c62afb0b868a04215d2fde3ab0d366b0ef7f46 diff --git a/oca/partner-contact b/oca/partner-contact index 1c9fc793..66ddc93f 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 1c9fc793e52daefd6bd097319dcdb744a9449342 +Subproject commit 66ddc93faac418f37a66f549207260076a4c9a9f diff --git a/oca/product-attribute b/oca/product-attribute index a4f05938..f18c21c5 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit a4f05938f0782c709246d7ace9c9bd0ac8a453a2 +Subproject commit f18c21c552d09afd3b38b837958257c52ea400bc diff --git a/oca/project b/oca/project index 83326b9a..624bd498 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 83326b9a330e89ea9662a0327669e59b647d5f96 +Subproject commit 624bd4980ad5da3fd932ab3ff63f4b0ac3fe629c diff --git a/oca/purchase-workflow b/oca/purchase-workflow index 79a74079..fbc07667 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit 79a74079457eda30c19acf3e4cffb228263611cc +Subproject commit fbc076672fb43b196628d6ad9983ca7ab0d02d54 diff --git a/oca/reporting-engine b/oca/reporting-engine index fd083f7f..646cb053 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit fd083f7fde6e47327acd1ea209807ec1b22b416c +Subproject commit 646cb0531c58ffe40e4dcfcda470d6094052e998 diff --git a/oca/rest-framework b/oca/rest-framework index b834273f..23dabc98 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit b834273fcca8c34f791f1b07ddec0eb2fb453faf +Subproject commit 23dabc98c4b828f67f7d7c263502fcab0c1f5a52 diff --git a/oca/sale-workflow b/oca/sale-workflow index c52b9a28..0b84ffc5 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit c52b9a2885a142dead3c53e4b6f62b7d14e74b95 +Subproject commit 0b84ffc5abfd3ae47da2d1897aadf55e85e255a3 diff --git a/oca/server-auth b/oca/server-auth index db19eab7..f12a1af7 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit db19eab7e7c31c2dba3dbaced00eb98e18aa0548 +Subproject commit f12a1af7f891b0e49b8ec045832c965329ae5205 diff --git a/oca/server-backend b/oca/server-backend index 4cc8c0f7..c275ccbf 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 4cc8c0f7b14da59470429cdd76678fbc4f1f198d +Subproject commit c275ccbf81f74ed16d5e00aba50a91efa7158ca3 diff --git a/oca/server-tools b/oca/server-tools index 50c551bb..8bd0565e 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 50c551bb40cf474d35ec087970053aef889286a7 +Subproject commit 8bd0565ee30882524bfe1a61139c2843d7993a33 diff --git a/oca/server-ux b/oca/server-ux index 7d7b14b6..fc3c4e7f 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit 7d7b14b672748858dfe6d5c3ad29b4ce81fdab5c +Subproject commit fc3c4e7f222dd17b86f52b3e9fa13d911815fb13 diff --git a/oca/social b/oca/social index a5a5485d..c7ed17a4 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit a5a5485d8b69bdbc069c3b14391f7de433c6414d +Subproject commit c7ed17a466bc6db3d4e24db756bcda61cf7b7530 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index b644a8e7..98bd7414 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit b644a8e7b6c6dae30549bb73b2133db3d297ddb1 +Subproject commit 98bd7414739bb67889a17eba42fefd40ee2d0ed4 diff --git a/oca/timesheet b/oca/timesheet index 57813f7d..c6ceaad3 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit 57813f7d48c13dcffa8b927a3168c5e163cf3889 +Subproject commit c6ceaad3f39001a74b4d904e0299df714cef5a5f diff --git a/oca/web b/oca/web index 81e0ce57..9494dab9 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 81e0ce57b27eebb8accb6acd21253916ba552834 +Subproject commit 9494dab91eb5a3227903aa08bd21d1043ab1cb17 diff --git a/oca/website b/oca/website index db98c3b2..af22daaf 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit db98c3b2ed7b6de069b3924f969595bd2edc8cad +Subproject commit af22daaf99178a7064d94b2e359b4968cf10eb33 diff --git a/odoo b/odoo index 7718e4c3..9d2d3911 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 7718e4c382c4bc844ae914307ae76c71da94ef07 +Subproject commit 9d2d3911a3ac6711d3040d22e146f9eb18de2197 From b86c6040e880498b03076995865eb4dfb47074d2 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 16 Aug 2023 12:46:29 +0200 Subject: [PATCH 051/147] remove app logo from template --- template/module/README.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/template/module/README.rst b/template/module/README.rst index de2d10d5..5e711fe4 100644 --- a/template/module/README.rst +++ b/template/module/README.rst @@ -10,11 +10,6 @@ Module summary. For a detailed documentation have a look at https://www.odoo-wiki.org/{{ (name|replace('_','-')) }}.html -.. image:: https://raw.githubusercontent.com/Mint-System/Wiki/master/assets/icon-box.png - :height: 100 - :width: 100 - :alt: Icon - Usage ~~~~~ From 088f6ca782d977f559838637b770d73f17139923 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 17 Aug 2023 13:49:35 +0200 Subject: [PATCH 052/147] snippet, default password and ref --- addons/vertical_saas | 2 +- config/odoo-native.conf | 2 +- snippets/mrp.report_mrp_production_components.show_stock.xml | 3 ++- snippets/mrp.report_mrporder.show_stock.xml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 4102468c..16829351 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 4102468c141b3c329321c4184df8f28426c019ae +Subproject commit 1682935160ff7581ff5321eed45cc49830c2dc32 diff --git a/config/odoo-native.conf b/config/odoo-native.conf index ba0c194a..8670cbd0 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,6 +1,6 @@ [options] addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system,oca/hr-holidays -admin_passwd = $pbkdf2-sha512$25000$uBdCaA2hNAbA.B9DSOldiw$0HKIxJeRHdT6T10YSulefVHY6MGQUn5seDGJmOkY6eyKEVAfY9oqbkSw1BLZK2PYe51YGAmNoDMdoXmB7d6cpw +admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA limit_time_real = 600 dbfilter = .* db_host = localhost diff --git a/snippets/mrp.report_mrp_production_components.show_stock.xml b/snippets/mrp.report_mrp_production_components.show_stock.xml index 953b0ad9..0492e19c 100644 --- a/snippets/mrp.report_mrp_production_components.show_stock.xml +++ b/snippets/mrp.report_mrp_production_components.show_stock.xml @@ -2,7 +2,7 @@ - Lagerort (Los) + Lagerort (Los) Menge @@ -10,6 +10,7 @@ () +
          diff --git a/snippets/mrp.report_mrporder.show_stock.xml b/snippets/mrp.report_mrporder.show_stock.xml index e8838ead..30a64cbb 100644 --- a/snippets/mrp.report_mrporder.show_stock.xml +++ b/snippets/mrp.report_mrporder.show_stock.xml @@ -10,7 +10,7 @@ () - +
          From 79ab3480a4a84c8ed6c61a22e052787a6a5dfdcc Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 17 Aug 2023 15:48:57 +0200 Subject: [PATCH 053/147] ref --- addons/vertical_saas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 16829351..4a12152e 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 1682935160ff7581ff5321eed45cc49830c2dc32 +Subproject commit 4a12152e7e427f0c8de6964e30e4524b5499133c From ae0a2101e8c6a024eb48ff0a5aba9b9b24fda5a0 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 18 Aug 2023 13:31:48 +0200 Subject: [PATCH 054/147] update odoo config --- config/odoo-native.conf | 2 -- config/odoo.conf | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/odoo-native.conf b/config/odoo-native.conf index 8670cbd0..d378a21f 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -2,8 +2,6 @@ addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system,oca/hr-holidays admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA limit_time_real = 600 -dbfilter = .* db_host = localhost db_password = odoo db_user = odoo - diff --git a/config/odoo.conf b/config/odoo.conf index df26ad5e..bb32b0d8 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,6 +1,6 @@ [options] addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays -admin_passwd = admin +admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA data_dir = /var/lib/odoo -limit_time_real = 480 +limit_time_real = 600 worker = 2 \ No newline at end of file From 52ac6936d003fc5efc1fcb100875a3fee2eb8863 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 18 Aug 2023 13:31:49 +0200 Subject: [PATCH 055/147] ref --- addons/vertical_saas | 2 +- enterprise | 2 +- oca/connector | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/survey | 1 + odoo | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) create mode 160000 oca/survey diff --git a/addons/vertical_saas b/addons/vertical_saas index 4a12152e..66948ae2 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 4a12152e7e427f0c8de6964e30e4524b5499133c +Subproject commit 66948ae2b49a5cb5add80734a589100b185d5d58 diff --git a/enterprise b/enterprise index e74eda3c..aee7cb5e 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit e74eda3c716df2dd84f62309fca24addc39bb989 +Subproject commit aee7cb5ec3da65a3c91fd841fd3ac60ccf754ef6 diff --git a/oca/connector b/oca/connector index a7c73625..c571c3a4 160000 --- a/oca/connector +++ b/oca/connector @@ -1 +1 @@ -Subproject commit a7c7362582d49355e84e0530d60ee5726ea62d5d +Subproject commit c571c3a4a5fcab71fd15102cb70d6045aad9adad diff --git a/oca/hr-attendance b/oca/hr-attendance index 96b8dbcc..9591a63a 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 +Subproject commit 9591a63af4b26db9a9e591fd9718a4b0a4295364 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index bb7affa6..1be7f963 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 +Subproject commit 1be7f9631fa6a255eae9928d8417b549c3a73461 diff --git a/oca/survey b/oca/survey new file mode 160000 index 00000000..e92e7144 --- /dev/null +++ b/oca/survey @@ -0,0 +1 @@ +Subproject commit e92e714420e6421d52b73359c7a51b9872c82c78 diff --git a/odoo b/odoo index 9d2d3911..d952e011 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 9d2d3911a3ac6711d3040d22e146f9eb18de2197 +Subproject commit d952e0117a68dd19e86c45ae75250807231e82ad From c6118fbbfe5b25af9ba35fa8696bf69aa15d4ba1 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 21 Aug 2023 08:51:37 +0200 Subject: [PATCH 056/147] new submmodule --- .gitmodules | 4 ++++ oca/sale-reporting | 1 + 2 files changed, 5 insertions(+) create mode 160000 oca/sale-reporting diff --git a/.gitmodules b/.gitmodules index 272ec10b..e91505ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -222,3 +222,7 @@ path = oca/hr-holidays url = git@github.com:OCA/hr-holidays.git branch = 16.0 +[submodule "oca/sale-reporting"] + path = oca/sale-reporting + url = https://github.com/OCA/sale-reporting.git + branch = 16.0 diff --git a/oca/sale-reporting b/oca/sale-reporting new file mode 160000 index 00000000..c2f9c2a5 --- /dev/null +++ b/oca/sale-reporting @@ -0,0 +1 @@ +Subproject commit c2f9c2a5e56b02faac83ea6037989d1a0cb1bc2d From d8adae247ddcd05814b207eb00d3f76c834d3110 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 21 Aug 2023 09:17:02 +0200 Subject: [PATCH 057/147] sync --- snippets/account.md | 8 ++++---- snippets/mrp.md | 5 +++-- snippets/sale.md | 14 ++++++++++++++ ...le.view_quotation_tree.show_delivery_status.xml | 8 ++++++++ 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 snippets/sale.view_quotation_tree.show_delivery_status.xml diff --git a/snippets/account.md b/snippets/account.md index 82069884..c6497bc2 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -1040,10 +1040,10 @@ ID: `mint_system.account.report_invoice_document.move_incoterm`

          Incoterm: - - - +

          +           ``` Source: [snippets/account.report_invoice_document.move_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.move_incoterm.xml) @@ -3693,10 +3693,10 @@ ID: `mint_system.account.report_invoice_document.move_incoterm`

          Incoterm: - - - +

          + ``` Source: [snippets/account.report_invoice_document.move_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.move_incoterm.xml) diff --git a/snippets/mrp.md b/snippets/mrp.md index 7cc4e9e2..47d39f1b 100644 --- a/snippets/mrp.md +++ b/snippets/mrp.md @@ -1399,7 +1399,7 @@ ID: `mint_system.mrp.report_mrporder.show_stock` () - +
          @@ -1444,7 +1444,7 @@ ID: `mint_system.mrp.report_mrp_production_components.show_stock` - Lagerort (Los) + Lagerort (Los) Menge @@ -1452,6 +1452,7 @@ ID: `mint_system.mrp.report_mrp_production_components.show_stock` () +
          diff --git a/snippets/sale.md b/snippets/sale.md index f03205d9..612afffc 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -4390,6 +4390,20 @@ ID: `mint_system.sale.view_quotation_tree.replace_create_date` ``` Source: [snippets/sale.view_quotation_tree.replace_create_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.replace_create_date.xml) +### Show Delivery Status +ID: `mint_system.sale.view_quotation_tree.show_delivery_status` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_quotation_tree.show_delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_delivery_status.xml) + ### Show ​Payment Term Id ID: `mint_system.sale.view_quotation_tree.show_​payment_term_id` ```xml diff --git a/snippets/sale.view_quotation_tree.show_delivery_status.xml b/snippets/sale.view_quotation_tree.show_delivery_status.xml new file mode 100644 index 00000000..f8554b6a --- /dev/null +++ b/snippets/sale.view_quotation_tree.show_delivery_status.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From f99eab6ff9a48f181be89bdb3d8675ba0e9b1b7d Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 21 Aug 2023 10:33:36 +0200 Subject: [PATCH 058/147] update submodules --- .gitmodules | 4 ++++ config/odoo-native.conf | 2 +- config/odoo.conf | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/survey | 2 +- task | 13 +++++++++---- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index e91505ae..001bada9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -226,3 +226,7 @@ path = oca/sale-reporting url = https://github.com/OCA/sale-reporting.git branch = 16.0 +[submodule "oca/survey"] + path = oca/survey + url = git@github.com:OCA/survey.git + branch = 16.0 diff --git a/config/odoo-native.conf b/config/odoo-native.conf index d378a21f..f1a239de 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system,oca/hr-holidays +addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system,oca/hr-holidays,oca/sale-reporting,oca/survey admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA limit_time_real = 600 db_host = localhost diff --git a/config/odoo.conf b/config/odoo.conf index bb32b0d8..27d1b399 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays +addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays,/mnt/oca/sale-reporting,/mnt/oca/survey admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA data_dir = /var/lib/odoo limit_time_real = 600 diff --git a/oca/hr-attendance b/oca/hr-attendance index 9591a63a..96b8dbcc 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 9591a63af4b26db9a9e591fd9718a4b0a4295364 +Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 1be7f963..bb7affa6 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 1be7f9631fa6a255eae9928d8417b549c3a73461 +Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 diff --git a/oca/survey b/oca/survey index e92e7144..4bfbf839 160000 --- a/oca/survey +++ b/oca/survey @@ -1 +1 @@ -Subproject commit e92e714420e6421d52b73359c7a51b9872c82c78 +Subproject commit 4bfbf839b78357827d31c4276f2cbbebf311f617 diff --git a/task b/task index 4ae63a78..c394cb22 100755 --- a/task +++ b/task @@ -382,14 +382,19 @@ function install-module() { } function test-module() { - if test -z "$1"; then echo "\$1 is empty."; exit; fi - if test -z "$2"; then echo "\$2 is empty."; exit; fi - + DATABASE=$1 MODULE_NAME=$(basename $2) + # Use default database if second param is not given + if test -z "$2"; then + DATABASE="$GIT_BRANCH" + MODULE_NAME=$(basename $1) + fi + locale activate-venv - odoo-bin -d $1 -i $MODULE_NAME --config 'config/odoo-native.conf' --stop-after-init --log-level=test --test-enable + echo "Testing module $MODULE_NAME on $DATABASE ..." + odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --stop-after-init --log-level=test --test-enable } function remove-module() { From 019ce33de8940ade55131c8be4cd4368f60c1c6a Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 21 Aug 2023 10:39:02 +0200 Subject: [PATCH 059/147] update lint config --- template/.editorconfig | 20 ++++++++++++++++++++ template/.pre-commit-config.yaml | 11 +++++++++++ template/.prettierrc.yml | 8 ++++++++ template/.pylintrc | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 template/.editorconfig create mode 100644 template/.prettierrc.yml diff --git a/template/.editorconfig b/template/.editorconfig new file mode 100644 index 00000000..bfd7ac53 --- /dev/null +++ b/template/.editorconfig @@ -0,0 +1,20 @@ +# Configuration for known file extensions +[*.{css,js,json,less,md,py,rst,sass,scss,xml,yaml,yml}] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{json,yml,yaml,rst,md}] +indent_size = 2 + +# Do not configure editor for libs and autogenerated content +[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}] +charset = unset +end_of_line = unset +indent_size = unset +indent_style = unset +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/template/.pre-commit-config.yaml b/template/.pre-commit-config.yaml index 2718392d..b4962e02 100644 --- a/template/.pre-commit-config.yaml +++ b/template/.pre-commit-config.yaml @@ -46,6 +46,17 @@ repos: rev: 22.8.0 hooks: - id: black + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v2.7.1 + hooks: + - id: prettier + name: prettier (with plugin-xml) + additional_dependencies: + - "prettier@2.7.1" + - "@prettier/plugin-xml@2.2.0" + args: + - --plugin=@prettier/plugin-xml + files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.3.0 hooks: diff --git a/template/.prettierrc.yml b/template/.prettierrc.yml new file mode 100644 index 00000000..5b6d4b36 --- /dev/null +++ b/template/.prettierrc.yml @@ -0,0 +1,8 @@ +# Defaults for all prettier-supported languages. +# Prettier will complete this with settings from .editorconfig file. +bracketSpacing: false +printWidth: 88 +proseWrap: always +semi: true +trailingComma: "es5" +xmlWhitespaceSensitivity: "strict" diff --git a/template/.pylintrc b/template/.pylintrc index c046432b..49292140 100644 --- a/template/.pylintrc +++ b/template/.pylintrc @@ -8,7 +8,7 @@ manifest_required_authors=Mint System GmbH manifest_required_keys=license manifest_deprecated_keys=description,active license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid_odoo_versions=15.0 +valid_odoo_versions=16.0 [MESSAGES CONTROL] disable=all From 5a28cbbdf6e58f7b78976cb5d377348722aa3152 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 21 Aug 2023 14:53:44 +0200 Subject: [PATCH 060/147] ref --- addons/vertical_saas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 66948ae2..19c18c20 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 66948ae2b49a5cb5add80734a589100b185d5d58 +Subproject commit 19c18c20c986d46479d9eec1c284eb85d547cac1 From 7f1a03412e62b6693e051eca4a4244fe1f14a78f Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 21 Aug 2023 18:22:01 +0200 Subject: [PATCH 061/147] ref --- addons/vertical_job_portal | 2 +- addons/vertical_saas | 2 +- enterprise | 2 +- oca/bank-payment | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/maintenance | 2 +- oca/manufacture | 2 +- oca/sale-workflow | 2 +- oca/server-backend | 2 +- oca/survey | 2 +- odoo | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 2ded3fc7..5e6fc186 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 2ded3fc7bdbc49bfc138b6373d59e17996a7702a +Subproject commit 5e6fc186c6de555ca35e68823ba93d4a414bd974 diff --git a/addons/vertical_saas b/addons/vertical_saas index 19c18c20..6e334f3e 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 19c18c20c986d46479d9eec1c284eb85d547cac1 +Subproject commit 6e334f3e34209cdcd128840d513980636e3affaa diff --git a/enterprise b/enterprise index aee7cb5e..bb39e4e9 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit aee7cb5ec3da65a3c91fd841fd3ac60ccf754ef6 +Subproject commit bb39e4e960c56bc5e69f614055d3c4c3671fc393 diff --git a/oca/bank-payment b/oca/bank-payment index e6fdaa38..94e8f27f 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit e6fdaa3809ff3547cec15265823e76d9d7142166 +Subproject commit 94e8f27fef3cf01b56eea7dc9e18b5740893f2f4 diff --git a/oca/hr-attendance b/oca/hr-attendance index 96b8dbcc..9591a63a 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 +Subproject commit 9591a63af4b26db9a9e591fd9718a4b0a4295364 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index bb7affa6..1be7f963 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 +Subproject commit 1be7f9631fa6a255eae9928d8417b549c3a73461 diff --git a/oca/maintenance b/oca/maintenance index 43d86421..49345ab8 160000 --- a/oca/maintenance +++ b/oca/maintenance @@ -1 +1 @@ -Subproject commit 43d8642130713d9ffe0b851386bbf976d4df2aa9 +Subproject commit 49345ab86240bb953a89c231c5da6e9b5a601a92 diff --git a/oca/manufacture b/oca/manufacture index d66d57c3..3ee9f060 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit d66d57c35c565b285b9e55cbc8121b64e62765d4 +Subproject commit 3ee9f0600561df61f3b3141da3fbe8d2add80aa6 diff --git a/oca/sale-workflow b/oca/sale-workflow index 0b84ffc5..fb8f3933 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 0b84ffc5abfd3ae47da2d1897aadf55e85e255a3 +Subproject commit fb8f39330869845401847ca0ec2b2c1725053265 diff --git a/oca/server-backend b/oca/server-backend index c275ccbf..8292cc6a 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit c275ccbf81f74ed16d5e00aba50a91efa7158ca3 +Subproject commit 8292cc6aab19cc1ce5b4fd10836438ad0b230323 diff --git a/oca/survey b/oca/survey index 4bfbf839..a62aa822 160000 --- a/oca/survey +++ b/oca/survey @@ -1 +1 @@ -Subproject commit 4bfbf839b78357827d31c4276f2cbbebf311f617 +Subproject commit a62aa82284f266bd3127d2155e17db4a5992bca5 diff --git a/odoo b/odoo index d952e011..871a988f 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit d952e0117a68dd19e86c45ae75250807231e82ad +Subproject commit 871a988f91e7f4190999a89afa854f4ed83a4fa2 From e020739046ed9dcfbd3778cf192eb0d0d8494d9b Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 22 Aug 2023 15:33:12 +0200 Subject: [PATCH 062/147] snippets --- ...order_line_view_form_readonly.show_subscription_id.xml | 8 ++++++++ ...le.view_order_form.show_order_line_subscription_id.xml | 8 ++++++++ ...oduct_set.view_order_stock_form.show_button_always.xml | 8 ++++++++ 3 files changed, 24 insertions(+) create mode 100644 snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml create mode 100644 snippets/sale.view_order_form.show_order_line_subscription_id.xml create mode 100644 snippets/sale_product_set.view_order_stock_form.show_button_always.xml diff --git a/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml b/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml new file mode 100644 index 00000000..f27f12d4 --- /dev/null +++ b/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_order_form.show_order_line_subscription_id.xml b/snippets/sale.view_order_form.show_order_line_subscription_id.xml new file mode 100644 index 00000000..63077736 --- /dev/null +++ b/snippets/sale.view_order_form.show_order_line_subscription_id.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale_product_set.view_order_stock_form.show_button_always.xml b/snippets/sale_product_set.view_order_stock_form.show_button_always.xml new file mode 100644 index 00000000..e7c48db6 --- /dev/null +++ b/snippets/sale_product_set.view_order_stock_form.show_button_always.xml @@ -0,0 +1,8 @@ + + + + + + From 921cb11b3353c5edbda0e28a25568684f600e3c4 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 22 Aug 2023 15:57:36 +0200 Subject: [PATCH 063/147] ref + new submodule --- .gitmodules | 4 ++++ addons/partner_contact | 2 +- addons/product_attribute | 2 +- addons/vertical_saas | 2 +- config/odoo-native.conf | 2 +- config/odoo.conf | 2 +- enterprise | 2 +- oca/account-reconcile | 1 + oca/partner-contact | 2 +- oca/server-auth | 2 +- oca/website | 2 +- odoo | 2 +- 12 files changed, 15 insertions(+), 10 deletions(-) create mode 160000 oca/account-reconcile diff --git a/.gitmodules b/.gitmodules index 001bada9..b062fe87 100644 --- a/.gitmodules +++ b/.gitmodules @@ -230,3 +230,7 @@ path = oca/survey url = git@github.com:OCA/survey.git branch = 16.0 +[submodule "oca/account-reconcile"] + path = oca/account-reconcile + url = git@github.com:OCA/account-reconcile.git + branch = 16.0 diff --git a/addons/partner_contact b/addons/partner_contact index 443af12c..f8b55232 160000 --- a/addons/partner_contact +++ b/addons/partner_contact @@ -1 +1 @@ -Subproject commit 443af12c52ed8efc0338be2793a9d5c839f72b16 +Subproject commit f8b552324f79bf613b7131bbe7cbc10684de11ac diff --git a/addons/product_attribute b/addons/product_attribute index 8731ca4e..16c22247 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit 8731ca4e34eeaf06f8c67cad936d6116d2aea7c2 +Subproject commit 16c2224776df8ba57b1b55ddc5a04a2ef4aef360 diff --git a/addons/vertical_saas b/addons/vertical_saas index 6e334f3e..f128b9f7 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 6e334f3e34209cdcd128840d513980636e3affaa +Subproject commit f128b9f788ef1f161b26b1cabbf0f60d85f6e9d2 diff --git a/config/odoo-native.conf b/config/odoo-native.conf index f1a239de..d022c038 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system,oca/hr-holidays,oca/sale-reporting,oca/survey +addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system,oca/hr-holidays,oca/sale-reporting,oca/survey,oca/account-reconcile admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA limit_time_real = 600 db_host = localhost diff --git a/config/odoo.conf b/config/odoo.conf index 27d1b399..75a8d8f8 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays,/mnt/oca/sale-reporting,/mnt/oca/survey +addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays,/mnt/oca/sale-reporting,/mnt/oca/survey,/mnt/oca/account-reconcile admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA data_dir = /var/lib/odoo limit_time_real = 600 diff --git a/enterprise b/enterprise index bb39e4e9..14c03d3e 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit bb39e4e960c56bc5e69f614055d3c4c3671fc393 +Subproject commit 14c03d3e710786e1f138546b57ab0874d161917f diff --git a/oca/account-reconcile b/oca/account-reconcile new file mode 160000 index 00000000..afed064a --- /dev/null +++ b/oca/account-reconcile @@ -0,0 +1 @@ +Subproject commit afed064a0fcf81ee6da62d9beeff963d84fda176 diff --git a/oca/partner-contact b/oca/partner-contact index 66ddc93f..5cb359c1 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 66ddc93faac418f37a66f549207260076a4c9a9f +Subproject commit 5cb359c1874387bfbd35cfe439992336ec3b2b2e diff --git a/oca/server-auth b/oca/server-auth index f12a1af7..b264c1af 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit f12a1af7f891b0e49b8ec045832c965329ae5205 +Subproject commit b264c1af4fe863f65d2ee40e48306aed071b5527 diff --git a/oca/website b/oca/website index af22daaf..62c69fc7 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit af22daaf99178a7064d94b2e359b4968cf10eb33 +Subproject commit 62c69fc71070da031c345a64b86be4ab8804b58e diff --git a/odoo b/odoo index 871a988f..1ef67b67 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 871a988f91e7f4190999a89afa854f4ed83a4fa2 +Subproject commit 1ef67b6734a14c97ef85d757f27cfc8946983f48 From d0b9ee1765eeb27ebaadba4e887d3f299e0a95b4 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 25 Aug 2023 18:16:44 +0200 Subject: [PATCH 064/147] sync --- snippets/account.md | 14 ++++ ...ount.view_move_form.show_payment_state.xml | 8 ++ snippets/ir_model.md | 68 +++++++++++++++++ .../ir_model.sale_order.x_payment_state.xml | 35 +++++++++ snippets/ir_model.stock_move.x_label_qty.xml | 19 +++++ snippets/sale.md | 73 ++++++++++++++++++- .../sale.view_order_form.x_order_number.xml | 2 +- .../sale.view_order_form.x_payment_state.xml | 8 ++ ...ew_quotation_tree.show_delivery_status.xml | 3 +- ...ale.view_quotation_tree.x_order_number.xml | 7 ++ ...le.view_quotation_tree.x_payment_state.xml | 7 ++ snippets/sale_product_set.md | 16 ++++ snippets/stock.md | 60 +++++++++++++++ ...ort_reception_report_label.aersolution.xml | 38 ++++++++++ .../stock.view_picking_form.x_label_qty.xml | 8 ++ 15 files changed, 360 insertions(+), 6 deletions(-) create mode 100644 snippets/account.view_move_form.show_payment_state.xml create mode 100644 snippets/ir_model.sale_order.x_payment_state.xml create mode 100644 snippets/ir_model.stock_move.x_label_qty.xml create mode 100644 snippets/sale.view_order_form.x_payment_state.xml create mode 100644 snippets/sale.view_quotation_tree.x_order_number.xml create mode 100644 snippets/sale.view_quotation_tree.x_payment_state.xml create mode 100644 snippets/stock.report_reception_report_label.aersolution.xml create mode 100644 snippets/stock.view_picking_form.x_label_qty.xml diff --git a/snippets/account.md b/snippets/account.md index c6497bc2..dc405e20 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -5712,6 +5712,20 @@ ID: `mint_system.account.view_move_form.show_line_partner_id` ``` Source: [snippets/account.view_move_form.show_line_partner_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.show_line_partner_id.xml) +### Show Payment State +ID: `mint_system.account.view_move_form.show_payment_state` +```xml + + + + + + + + +``` +Source: [snippets/account.view_move_form.show_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.show_payment_state.xml) + ### Show Posted Before ID: `mint_system.account.view_move_form.show_posted_before` ```xml diff --git a/snippets/account.view_move_form.show_payment_state.xml b/snippets/account.view_move_form.show_payment_state.xml new file mode 100644 index 00000000..8e3bbde4 --- /dev/null +++ b/snippets/account.view_move_form.show_payment_state.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/ir_model.md b/snippets/ir_model.md index 6706fecd..dcc6d464 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -2274,6 +2274,48 @@ ID: `mint_system.ir_model.sale_order.x_order_number` ``` Source: [snippets/ir_model.sale_order.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_order_number.xml) +### X Payment State +ID: `mint_system.ir_model.sale_order.x_payment_state` +```xml + + + + + Zahlungsstatus + sale.order + + x_payment_state + + + + selection + [ + {'value':'not_paid','name':'Nicht Bezahlt'}, + {'value':'in_payment','name':'In Zahlung'}, + {'value':'paid','name':'Bezahlt'}, + ] + invoice_ids,invoice_ids.payment_state + for rec in self: + if rec.invoice_ids: + has_only_paid_invoices = all(rec.invoice_ids.mapped(lambda i: i.payment_state == 'paid')) + has_in_payment_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'in_payment')) + has_not_paid_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'not_paid')) + + if has_only_paid_invoices: + rec['x_payment_state'] = 'paid' + elif has_in_payment_invoices: + rec['x_payment_state'] = 'in_payment' + elif has_not_paid_invoices: + rec['x_payment_state'] = 'not_paid' + else: + rec['x_payment_state'] = 'not_paid' + + + + +``` +Source: [snippets/ir_model.sale_order.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_payment_state.xml) + ### X Payment Term Blanket Order ID: `mint_system.ir_model.sale_order.x_payment_term_blanket_order` ```xml @@ -2473,6 +2515,32 @@ ID: `mint_system.ir_model.stock_move.x_count_packaging` ``` Source: [snippets/ir_model.stock_move.x_count_packaging.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_move.x_count_packaging.xml) +### X Label Qty +ID: `mint_system.ir_model.stock_move.x_label_qty` +```xml + + + + + Anzahl Etiketten + stock.move + + x_label_qty + + + + int + product_uom_qty + for rec in self: + rec['x_label_qty'] = 1 + + + + + +``` +Source: [snippets/ir_model.stock_move.x_label_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_move.x_label_qty.xml) + ### X Operation Qty ID: `mint_system.ir_model.stock_move.x_operation_qty` ```xml diff --git a/snippets/ir_model.sale_order.x_payment_state.xml b/snippets/ir_model.sale_order.x_payment_state.xml new file mode 100644 index 00000000..f000c1b9 --- /dev/null +++ b/snippets/ir_model.sale_order.x_payment_state.xml @@ -0,0 +1,35 @@ + + + + + Zahlungsstatus + sale.order + + x_payment_state + + + + selection + [ + {'value':'not_paid','name':'Nicht Bezahlt'}, + {'value':'in_payment','name':'In Zahlung'}, + {'value':'paid','name':'Bezahlt'}, + ] + invoice_ids,invoice_ids.payment_state + for rec in self: + if rec.invoice_ids: + has_only_paid_invoices = all(rec.invoice_ids.mapped(lambda i: i.payment_state == 'paid')) + has_in_payment_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'in_payment')) + has_not_paid_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'not_paid')) + + if has_only_paid_invoices: + rec['x_payment_state'] = 'paid' + elif has_in_payment_invoices: + rec['x_payment_state'] = 'in_payment' + elif has_not_paid_invoices: + rec['x_payment_state'] = 'not_paid' + else: + rec['x_payment_state'] = 'not_paid' + + + diff --git a/snippets/ir_model.stock_move.x_label_qty.xml b/snippets/ir_model.stock_move.x_label_qty.xml new file mode 100644 index 00000000..35d67dd2 --- /dev/null +++ b/snippets/ir_model.stock_move.x_label_qty.xml @@ -0,0 +1,19 @@ + + + + + Anzahl Etiketten + stock.move + + x_label_qty + + + + int + product_uom_qty + for rec in self: + rec['x_label_qty'] = 1 + + + + diff --git a/snippets/sale.md b/snippets/sale.md index 612afffc..4b77b7bc 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -3148,6 +3148,20 @@ ID: `mint_system.sale.sale_order_line_view_form_readonly.show_project_id` ``` Source: [snippets/sale.sale_order_line_view_form_readonly.show_project_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_project_id.xml) +### Show Subscription Id +ID: `mint_system.sale.sale_order_line_view_form_readonly.show_subscription_id` +```xml + + + + + + + + +``` +Source: [snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml) + ## Sale Order Portal Content ### Convert Html Note ID: `mint_system.sale.sale_order_portal_content.convert_html_note` @@ -3731,6 +3745,20 @@ ID: `mint_system.sale.view_order_form.show_order_line_project_id` ``` Source: [snippets/sale.view_order_form.show_order_line_project_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_order_line_project_id.xml) +### Show Order Line Subscription Id +ID: `mint_system.sale.view_order_form.show_order_line_subscription_id` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_order_form.show_order_line_subscription_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_order_line_subscription_id.xml) + ### Show Product Template Id ID: `mint_system.sale.view_order_form.show_product_template_id` ```xml @@ -3889,7 +3917,7 @@ ID: `mint_system.sale.view_order_form.x_order_number` - + @@ -3897,6 +3925,20 @@ ID: `mint_system.sale.view_order_form.x_order_number` ``` Source: [snippets/sale.view_order_form.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_order_number.xml) +### X Payment State +ID: `mint_system.sale.view_order_form.x_payment_state` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_order_form.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_payment_state.xml) + ### X Payment Term Blanket Order ID: `mint_system.sale.view_order_form.x_payment_term_blanket_order` ```xml @@ -4393,11 +4435,10 @@ Source: [snippets/sale.view_quotation_tree.replace_create_date.xml](https://gith ### Show Delivery Status ID: `mint_system.sale.view_quotation_tree.show_delivery_status` ```xml - - + @@ -4418,6 +4459,32 @@ ID: `mint_system.sale.view_quotation_tree.show_​payment_term_id` ``` Source: [snippets/sale.view_quotation_tree.show_​payment_term_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_​payment_term_id.xml) +### X Order Number +ID: `mint_system.sale.view_quotation_tree.x_order_number` +```xml + + + + + + + +``` +Source: [snippets/sale.view_quotation_tree.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.x_order_number.xml) + +### X Payment State +ID: `mint_system.sale.view_quotation_tree.x_payment_state` +```xml + + + + + + + +``` +Source: [snippets/sale.view_quotation_tree.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.x_payment_state.xml) + ## View Sales Order Filter ### Add Invoice Status ID: `mint_system.sale.view_sales_order_filter.add_invoice_status` diff --git a/snippets/sale.view_order_form.x_order_number.xml b/snippets/sale.view_order_form.x_order_number.xml index cd6974d3..e049af37 100644 --- a/snippets/sale.view_order_form.x_order_number.xml +++ b/snippets/sale.view_order_form.x_order_number.xml @@ -1,7 +1,7 @@ - + diff --git a/snippets/sale.view_order_form.x_payment_state.xml b/snippets/sale.view_order_form.x_payment_state.xml new file mode 100644 index 00000000..bd1cd570 --- /dev/null +++ b/snippets/sale.view_order_form.x_payment_state.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_quotation_tree.show_delivery_status.xml b/snippets/sale.view_quotation_tree.show_delivery_status.xml index f8554b6a..d69f1f5d 100644 --- a/snippets/sale.view_quotation_tree.show_delivery_status.xml +++ b/snippets/sale.view_quotation_tree.show_delivery_status.xml @@ -1,8 +1,7 @@ - - + \ No newline at end of file diff --git a/snippets/sale.view_quotation_tree.x_order_number.xml b/snippets/sale.view_quotation_tree.x_order_number.xml new file mode 100644 index 00000000..56e4f315 --- /dev/null +++ b/snippets/sale.view_quotation_tree.x_order_number.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_quotation_tree.x_payment_state.xml b/snippets/sale.view_quotation_tree.x_payment_state.xml new file mode 100644 index 00000000..31471ad4 --- /dev/null +++ b/snippets/sale.view_quotation_tree.x_payment_state.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/sale_product_set.md b/snippets/sale_product_set.md index e7f89498..2711f6eb 100644 --- a/snippets/sale_product_set.md +++ b/snippets/sale_product_set.md @@ -1,4 +1,20 @@ # Sale Product Set +## View Order Stock Form +### Show Button Always +ID: `mint_system.sale_product_set.view_order_stock_form.show_button_always` +```xml + + + + + + + +``` +Source: [snippets/sale_product_set.view_order_stock_form.show_button_always.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_product_set.view_order_stock_form.show_button_always.xml) + ## View Product Set Form ### X Categ Id ID: `mint_system.sale_product_set.view_product_set_form.x_categ_id` diff --git a/snippets/stock.md b/snippets/stock.md index fd4c3f8e..3f431662 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -5923,6 +5923,51 @@ ID: `mint_system.stock.report_picking.x_packaging_uom_id` ``` Source: [snippets/stock.report_picking.x_packaging_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.x_packaging_uom_id.xml) +## Report Reception Report Label +### Aersolution +ID: `mint_system.stock.report_reception_report_label.aersolution` +```xml + + +
          + + + + + + +
          +
          + Logo +
          +
          +
          + -           +
          +
          + +
          + +

          + +

          LS/SN:

          + +

          EXP:

          + + +

          LOC:

          + +

          + + + + +

          +           +           +``` +Source: [snippets/stock.report_reception_report_label.aersolution.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_reception_report_label.aersolution.xml) + ## Search Product Lot Filter ### Filter Active ID: `mint_system.stock.search_product_lot_filter.filter_active` @@ -6961,6 +7006,21 @@ ID: `mint_system.stock.view_picking_form.x_count_boxes` ``` Source: [snippets/stock.view_picking_form.x_count_boxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_count_boxes.xml) +### X Label Qty +ID: `mint_system.stock.view_picking_form.x_label_qty` +```xml + + + + + + + + + +``` +Source: [snippets/stock.view_picking_form.x_label_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_label_qty.xml) + ## View Picking Internal Search ### Filter Groupby Expected Date ID: `mint_system.stock.view_picking_internal_search.filter_groupby_expected_date` diff --git a/snippets/stock.report_reception_report_label.aersolution.xml b/snippets/stock.report_reception_report_label.aersolution.xml new file mode 100644 index 00000000..997b6d5a --- /dev/null +++ b/snippets/stock.report_reception_report_label.aersolution.xml @@ -0,0 +1,38 @@ + + +
          + + + + + + +
          +
          + Logo +
          +
          +
          + -           +
          +
          + +
          + +

          + +

          LS/SN:

          + +

          EXP:

          + + +

          LOC:

          + +

          + + + + +

          +           +           \ No newline at end of file diff --git a/snippets/stock.view_picking_form.x_label_qty.xml b/snippets/stock.view_picking_form.x_label_qty.xml new file mode 100644 index 00000000..9b11d137 --- /dev/null +++ b/snippets/stock.view_picking_form.x_label_qty.xml @@ -0,0 +1,8 @@ + + + + + + + + From fc21cdde51e491144a652bf446f059e6d5cc4664 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 28 Aug 2023 09:31:41 +0200 Subject: [PATCH 065/147] refactor addons path --- .gitmodules | 12 +++------ README.md | 8 ++++++ addons/website | 2 +- config/odoo-native.conf | 1 - enterprise | 2 +- oca/dms | 1 - oca/survey | 2 +- odoo | 2 +- task | 60 ++++++++++++++++++++++------------------- 9 files changed, 48 insertions(+), 42 deletions(-) delete mode 160000 oca/dms diff --git a/.gitmodules b/.gitmodules index b062fe87..19adda9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -82,10 +82,6 @@ path = oca/sale-workflow url = git@github.com:OCA/sale-workflow.git branch = 16.0 -[submodule "oca/dms"] - path = oca/dms - url = git@github.com:OCA/dms.git - branch = 16.0 [submodule "oca/social"] path = oca/social url = git@github.com:OCA/social.git @@ -226,11 +222,11 @@ path = oca/sale-reporting url = https://github.com/OCA/sale-reporting.git branch = 16.0 -[submodule "oca/survey"] - path = oca/survey - url = git@github.com:OCA/survey.git - branch = 16.0 [submodule "oca/account-reconcile"] path = oca/account-reconcile url = git@github.com:OCA/account-reconcile.git branch = 16.0 +[submodule "oca/survey"] + path = oca/survey + url = git@github.com:OCA/survey.git + branch = 16.0 diff --git a/README.md b/README.md index c44f2a23..c1a77fbe 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,14 @@ Scaffold a new module. task create-module addons/project_report ``` +**Add custom module path** + +Update the `.env` file with the module path. + +```bash +ODOO_ADDONS_PATH=,addons/survey +``` + ### Docker Run Odoo with Docker container. diff --git a/addons/website b/addons/website index 8b7f3dcd..15bd68c6 160000 --- a/addons/website +++ b/addons/website @@ -1 +1 @@ -Subproject commit 8b7f3dcd300ff406bb9564cca0b29d3fcf4eab17 +Subproject commit 15bd68c6f29f7deac4e6eb4a59a37579818dad92 diff --git a/config/odoo-native.conf b/config/odoo-native.conf index d022c038..bf8ee383 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,4 @@ [options] -addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas,addons/social,addons/vertical_job_portal,oca/management-system,oca/hr-holidays,oca/sale-reporting,oca/survey,oca/account-reconcile admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA limit_time_real = 600 db_host = localhost diff --git a/enterprise b/enterprise index 14c03d3e..807666b0 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 14c03d3e710786e1f138546b57ab0874d161917f +Subproject commit 807666b0e62e96d97e48a7739d7315ffda9a50bc diff --git a/oca/dms b/oca/dms deleted file mode 160000 index c4a707a5..00000000 --- a/oca/dms +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4a707a565b783a841d61fb11a9988a5acde1691 diff --git a/oca/survey b/oca/survey index a62aa822..4bfbf839 160000 --- a/oca/survey +++ b/oca/survey @@ -1 +1 @@ -Subproject commit a62aa82284f266bd3127d2155e17db4a5992bca5 +Subproject commit 4bfbf839b78357827d31c4276f2cbbebf311f617 diff --git a/odoo b/odoo index 1ef67b67..5fee3538 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 1ef67b6734a14c97ef85d757f27cfc8946983f48 +Subproject commit 5fee3538adb8705378cffc84311143c06e88e053 diff --git a/task b/task index c394cb22..14c35f0b 100755 --- a/task +++ b/task @@ -27,6 +27,28 @@ if [[ -a ".env" ]]; then export $(cat .env | sed 's/#.*//g' | xargs) fi +function set-addons-path() { + # Read addons path list + ADDONS_PATH="$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ',' | sed 's/,*$//g')" + + # Append env var + ADDONS_PATH="${ADDONS_PATH}${ODOO_ADDONS_PATH}" + + # Check if dir exists + for ADDON in $ADDONS_PATH; do + if [ -d "$ADDON" ]; then + echo "Path does not exist: $ADDON" + exit 1 + fi + done + + # Convert to docker paths + DOCKER_ADDONS_PATH="$(echo "$ADDONS_PATH" | sed 's|,|,/mnt/|g' | sed 's|,/mnt/odoo||g')" + + # Replace odoo path + ADDONS_PATH="$(echo "$ADDONS_PATH" | sed 's|,odoo,|,odoo/addons,|g')" +} + function update-readme() { if test -z "$1"; then echo "\$1 is empty."; exit; fi FILE_NAME=$(basename "$1") @@ -169,13 +191,11 @@ function open-url-with-delay(){ xdg-open $1 } -# function share-filestore(){ -# sudo chmod o+rwx -R ~/.local/share/Odoo/filestore -# } - function start() { - DATABASE=$2 + set-addons-path + # Use default database if second param is not given + DATABASE=$2 if test -z "$2"; then DATABASE="$GIT_BRANCH" fi @@ -216,8 +236,9 @@ function start() { locale activate-venv echo "Open http://localhost:8069 url in your browser." + echo $ADDONS_PATH open-url-with-delay "http://localhost:8069/web?db=$DATABASE" & - odoo-bin --config 'config/odoo-native.conf' --dev=all --log-handler odoo.tools.convert:DEBUG + odoo-bin --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG fi if [[ "$1" =~ "mail" ]]; then @@ -278,7 +299,7 @@ function init-db() { locale activate-venv - # share-filestore + echo "Make sure only one odoo process is running when initalizing the database." odoo-bin --init base -d $DATABASE --config 'config/odoo-native.conf' --stop-after-init --no-http --load-language $ODOO_LANGUAGE } @@ -300,13 +321,6 @@ function lint-module() { find $1 -type d -exec chmod u=rwx,go=rx {} \; find $1 -type f -exec chmod u=rw,go=r {} \; - # echo "Copy default configuration files" - # cp template/{.flake8,.gitignore,.isort.cfg,.pre-commit-config.yaml,.pylintrc} $1/../ - - # echo "Run pylint in $1" - # cd $1 - # pylint --load-plugins=pylint_odoo -d all -e odoolint $1 --valid-odoo-versions=$GIT_BRANCH - echo "Run pre-commit in $1" cd $1 pre-commit run --files ./* @@ -320,7 +334,6 @@ function lint-module() { function update-module() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - # if test -z "$2"; then echo "\$2 is empty."; exit; fi DATABASE=$1 MODULE_NAME=$(basename $2) @@ -339,7 +352,6 @@ function update-module() { function generate-module-translation() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - # if test -z "$2"; then echo "\$2 is empty."; exit; fi DATABASE=$1 MODULE_PATH=$2 @@ -838,21 +850,13 @@ function remove-submodule() { function update-config() { - # Read addons path list - ADDONS="$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ',' | sed 's/,*$//g')" + set-addons-path - # Check if dir exists - for ADDON in $ADDONS; do - if [ -d "$ADDON" ]; then - echo "Path does not exist: $ADDON" - exit 1 - fi - done # Update native config - sed -i'' -e "s|addons_path.*|addons_path = odoo/addons,$ADDONS|g" "./config/odoo-native.conf" - ADDONS="$(echo "$ADDONS" | sed 's|,|,/mnt/|g' | sed 's|,/mnt/odoo||g')" + sed -i'' -e "s|addons_path.*|addons_path = $ADDONS_PATH|g" "./config/odoo-native.conf" + # Update docker config - sed -i'' -e "s|addons_path.*|addons_path = /mnt/$ADDONS|g" "./config/odoo.conf" + sed -i'' -e "s|addons_path.*|addons_path = /mnt/$DOCKER_ADDONS_PATH|g" "./config/odoo.conf" echo "Config updated." } From ad5b1a1ff04d6263e37cc0b8c77caeeec215fa11 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 28 Aug 2023 12:01:33 +0200 Subject: [PATCH 066/147] ref --- addons/website | 2 +- enterprise | 2 +- oca/account-financial-tools | 2 +- oca/hr | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/partner-contact | 2 +- oca/reporting-engine | 2 +- oca/sale-workflow | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/web | 2 +- odoo | 2 +- ....report_invoice_document.show_customer_info_product_code.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/website b/addons/website index 15bd68c6..4eff2b2d 160000 --- a/addons/website +++ b/addons/website @@ -1 +1 @@ -Subproject commit 15bd68c6f29f7deac4e6eb4a59a37579818dad92 +Subproject commit 4eff2b2dc217e49e098155994a2b3b61bb399b91 diff --git a/enterprise b/enterprise index 807666b0..4fa5af5a 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 807666b0e62e96d97e48a7739d7315ffda9a50bc +Subproject commit 4fa5af5a61456e3153967413b026a8d38c314a83 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index cebdf328..aaa79556 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit cebdf3287f26cca048be468e72c1887035ec3139 +Subproject commit aaa7955626ba4247761b2ac6a12d2c5cc64c0c2e diff --git a/oca/hr b/oca/hr index 2a5870a1..efca073a 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit 2a5870a1615d3578247c4325391cd957dd506fab +Subproject commit efca073a3b424daafa50aeb73b23cacd430ab529 diff --git a/oca/hr-attendance b/oca/hr-attendance index 9591a63a..96b8dbcc 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 9591a63af4b26db9a9e591fd9718a4b0a4295364 +Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 1be7f963..bb7affa6 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 1be7f9631fa6a255eae9928d8417b549c3a73461 +Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 diff --git a/oca/partner-contact b/oca/partner-contact index 5cb359c1..3024d58e 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 5cb359c1874387bfbd35cfe439992336ec3b2b2e +Subproject commit 3024d58edb99fdf668000ef9737a834418b0dab2 diff --git a/oca/reporting-engine b/oca/reporting-engine index 646cb053..585ca5d4 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 646cb0531c58ffe40e4dcfcda470d6094052e998 +Subproject commit 585ca5d4b47a09240fdb6d20d1ddb77f96dd6cf5 diff --git a/oca/sale-workflow b/oca/sale-workflow index fb8f3933..8bc0f01b 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit fb8f39330869845401847ca0ec2b2c1725053265 +Subproject commit 8bc0f01b7ba7706bbca8a5f46d839293267657b6 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 98bd7414..bcfb25f3 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 98bd7414739bb67889a17eba42fefd40ee2d0ed4 +Subproject commit bcfb25f3865c43285ddbb836779961af1d6efb6a diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index 196155ae..f0f35a28 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit 196155ae89b0b4d5b2e7e3e42ae6e087fd2b1eee +Subproject commit f0f35a281ad11ba0ac6f6bcc83b7dfe7776cfa80 diff --git a/oca/web b/oca/web index 9494dab9..8b258c8d 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 9494dab91eb5a3227903aa08bd21d1043ab1cb17 +Subproject commit 8b258c8d47ebc1f80c7dbc33fb854c5e67a49fc8 diff --git a/odoo b/odoo index 5fee3538..14d2ddb8 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 5fee3538adb8705378cffc84311143c06e88e053 +Subproject commit 14d2ddb8b75bc3a169e9b7417d92d9ef88acc551 diff --git a/snippets/account.report_invoice_document.show_customer_info_product_code.xml b/snippets/account.report_invoice_document.show_customer_info_product_code.xml index a612b9c8..2d8c9f29 100644 --- a/snippets/account.report_invoice_document.show_customer_info_product_code.xml +++ b/snippets/account.report_invoice_document.show_customer_info_product_code.xml @@ -2,7 +2,7 @@ - + From da78c74db7228f62c2616d64ac1f85e8ad99c0a2 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 28 Aug 2023 12:45:30 +0200 Subject: [PATCH 067/147] remove jenkins --- build/cd.Dockerfile | 7 ------- docker-compose.yml | 25 ------------------------- package.json | 2 +- task | 11 ----------- 4 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 build/cd.Dockerfile diff --git a/build/cd.Dockerfile b/build/cd.Dockerfile deleted file mode 100644 index 3130f921..00000000 --- a/build/cd.Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM jenkins/jenkins -USER root -RUN apt-get update \ -&& DEBIAN_FRONTEND=noninteractive \ -apt-get install --no-install-recommends --assume-yes \ -docker.io -USER jenkins \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 280599ec..09addc59 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,33 +50,8 @@ services: ports: - "1025:1025" - "8025:8025" - dind: - image: docker:dind - container_name: dind - hostname: dind - privileged: true - environment: - DOCKER_TLS_CERTDIR: '' - volumes: - - cd-data:/var/jenkins_home - cd: - build: - context: build - dockerfile: cd.Dockerfile - container_name: cd - hostname: cd - depends_on: - - dind - privileged: true - ports: - - "8080:8080" - environment: - DOCKER_HOST: tcp://dind:2375 - volumes: - - cd-data:/var/jenkins_home volumes: odoo-data: db-data: admin-data: mail-data: - cd-data: diff --git a/package.json b/package.json index 334d7b26..be5d442c 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "build" ], "author": "Mint System", - "license": "GPL3", + "license": "GPL-3.0", "bugs": { "url": "https://github.com/Mint-System/Odoo-Build/issues" }, diff --git a/task b/task index 14c35f0b..b1d62404 100755 --- a/task +++ b/task @@ -205,17 +205,6 @@ function start() { docker-compose up -d fi - if [[ "$1" =~ "dind" ]]; then - docker-compose up -d dind - fi - - if [[ "$1" =~ "cd" ]]; then - docker-compose up -d cd - echo "Open http://localhost:8080 url in your browser." - INIT_PASSWORD=$(docker exec cd cat /var/jenkins_home/secrets/initialAdminPassword) - echo "The initial password is: $INIT_PASSWORD" - fi - if [[ "$1" =~ "db" ]]; then docker-compose up -d db echo "Open http://localhost:8000 url in your browser." From 1ef9c76d34542b4dc69c13da3dd8f9e2780d7e0e Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 28 Aug 2023 18:49:44 +0200 Subject: [PATCH 068/147] add snippet --- ....report_saleorder_document.add_proforma_note.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 snippets/sale.report_saleorder_document.add_proforma_note.xml diff --git a/snippets/sale.report_saleorder_document.add_proforma_note.xml b/snippets/sale.report_saleorder_document.add_proforma_note.xml new file mode 100644 index 00000000..2418c13f --- /dev/null +++ b/snippets/sale.report_saleorder_document.add_proforma_note.xml @@ -0,0 +1,13 @@ + + + + + + +

          Der Unterzeichner erklärt, dass die in diesem Dokument aufgeführten Waren und Ursprungserzeugnisse der Schweiz sind und den Ursprungsregeln im Präferenzverkehr mit der EU entsprechen.

          +

          Unterschrift: _______________________    Datum: _______________________
                                  Aersolution Interior AG

          +           +           +           + +           From f8bed61b702b02bf01468505a46b42eb3aabcccb Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 28 Aug 2023 18:49:51 +0200 Subject: [PATCH 069/147] ref --- addons/product_attribute | 2 +- addons/vertical_saas | 2 +- enterprise | 2 +- oca/partner-contact | 2 +- odoo | 2 +- task | 39 ++++++++++++++------------------------- 6 files changed, 19 insertions(+), 30 deletions(-) diff --git a/addons/product_attribute b/addons/product_attribute index 16c22247..42658a80 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit 16c2224776df8ba57b1b55ddc5a04a2ef4aef360 +Subproject commit 42658a8004d255dcb1016471e6be5f36b1ec55ee diff --git a/addons/vertical_saas b/addons/vertical_saas index f128b9f7..3eaaa5eb 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit f128b9f788ef1f161b26b1cabbf0f60d85f6e9d2 +Subproject commit 3eaaa5eb88bb9c1da0b3fb6078fcef6ec2dc0a49 diff --git a/enterprise b/enterprise index 4fa5af5a..9e719d46 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 4fa5af5a61456e3153967413b026a8d38c314a83 +Subproject commit 9e719d46e1c56117ef55b829f9a4508fb7b3f0d5 diff --git a/oca/partner-contact b/oca/partner-contact index 3024d58e..c57dfbeb 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 3024d58edb99fdf668000ef9737a834418b0dab2 +Subproject commit c57dfbebd4d50d5f57729894932a1c85678e43f6 diff --git a/odoo b/odoo index 14d2ddb8..c880a295 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 14d2ddb8b75bc3a169e9b7417d92d9ef88acc551 +Subproject commit c880a295d0f7feff48b08fd00723a41b8d564d2d diff --git a/task b/task index b1d62404..570ca299 100755 --- a/task +++ b/task @@ -22,6 +22,8 @@ export POSTGRES_PASSWORD=odoo export ODOO_REVISION=$GIT_BRANCH export ODOO_LANGUAGE=de_CH export ODOO_DEVELOPMENT_CONFIG_DIR="$HOME/.config/odoo-build" +export LC_ALL=en_US.UTF-8 +export LANG=en_US.UTF-8 if [[ -a ".env" ]]; then export $(cat .env | sed 's/#.*//g' | xargs) @@ -116,11 +118,6 @@ function activate-venv() { echo "$(python --version) is active." } -function locale() { - export LC_ALL=en_US.UTF-8 - export LANG=en_US.UTF-8 -} - function load-env() { ENV_FILE="$ODOO_DEVELOPMENT_CONFIG_DIR/.env.$1" echo "Load env file $ENV_FILE" @@ -222,7 +219,6 @@ function start() { fi if [[ "$1" =~ "native" ]]; then - locale activate-venv echo "Open http://localhost:8069 url in your browser." echo $ADDONS_PATH @@ -270,7 +266,6 @@ function start-shell() { DATABASE=$1 DATABASE=${DATABASE:="$GIT_BRANCH"} - locale activate-venv odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --no-http } @@ -286,18 +281,16 @@ function init-db() { DATABASE=$1 DATABASE=${DATABASE:="$GIT_BRANCH"} - locale activate-venv - + set-addons-path echo "Make sure only one odoo process is running when initalizing the database." - odoo-bin --init base -d $DATABASE --config 'config/odoo-native.conf' --stop-after-init --no-http --load-language $ODOO_LANGUAGE + odoo-bin --init base -d $DATABASE --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http --load-language $ODOO_LANGUAGE } function odoo-cloc() { DATABASE=$1 DATABASE=${DATABASE:="$GIT_BRANCH"} - locale activate-venv odoo-bin cloc -d $DATABASE --config 'config/odoo-native.conf' --stop-after-init --no-http } @@ -333,10 +326,10 @@ function update-module() { MODULE_NAME=$(basename $1) fi - locale activate-venv + set-addons-path echo "Updating module $MODULE_NAME on $DATABASE ..." - odoo-bin -d $DATABASE -u $MODULE_NAME --config 'config/odoo-native.conf' --stop-after-init --no-http + odoo-bin -d $DATABASE -u $MODULE_NAME --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http } function generate-module-translation() { @@ -357,11 +350,11 @@ function generate-module-translation() { LANGUAGE="$ODOO_LANGUAGE" fi - locale activate-venv + set-addons-path echo "Generate $LANGUAGE tranlsation file for $MODULE_NAME on $DATABASE ..." mkdir -p "$MODULE_PATH/i18n/" - odoo-bin -d $DATABASE --config 'config/odoo-native.conf' --modules $MODULE_NAME -l $LANGUAGE --i18n-export "$MODULE_PATH/i18n/$LANGUAGE.po" + odoo-bin -d $DATABASE --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --modules $MODULE_NAME -l $LANGUAGE --i18n-export "$MODULE_PATH/i18n/$LANGUAGE.po" } function install-module() { @@ -376,10 +369,10 @@ function install-module() { MODULE_NAME=$(basename $1) fi - locale activate-venv + set-addons-path echo "Installing module $MODULE_NAME on $DATABASE ..." - odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --stop-after-init --no-http + odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http } function test-module() { @@ -392,10 +385,10 @@ function test-module() { MODULE_NAME=$(basename $1) fi - locale activate-venv + set-addons-path echo "Testing module $MODULE_NAME on $DATABASE ..." - odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --stop-after-init --log-level=test --test-enable + odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --log-level=test --test-enable } function remove-module() { @@ -410,11 +403,11 @@ function remove-module() { MODULE_NAME=$(basename $1) fi - locale activate-venv + set-addons-path echo "Remove module $MODULE_NAME" echo "self.env['ir.module.module'].search([('name', '=', '$MODULE_NAME')]).button_immediate_uninstall()" | - odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --no-http + odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --no-http } function create-module() { @@ -423,7 +416,6 @@ function create-module() { MODULE_NAME=$(basename "$1") PARENT_DIR=$(dirname "$1") - locale activate-venv echo "Scaffolding module $MODULE_NAME in $PARENT_DIR ..." odoo-bin scaffold "$MODULE_NAME" "$PARENT_DIR" -t template/module @@ -466,7 +458,6 @@ function reset-views() { KEY=$(basename $1) fi - locale activate-venv echo "Reset views for key $KEY" echo "self.env['ir.ui.view'].search([('key', 'ilike', '$KEY')]).reset_arch(mode='hard')" | @@ -733,7 +724,6 @@ function lint-snippets() { function update-app-list() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - locale activate-venv echo "env['ir.module.module'].update_list()" | odoo-bin shell -d $1 --config 'config/odoo-native.conf' --no-http } @@ -813,7 +803,6 @@ function upload-module() { function save-config() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - locale activate-venv odoo-bin -s -d $1 --config 'config/odoo-native.conf' --stop-after-init --no-http } From 1baaa84f2c9fb0d0efe0de0c71e46a77ef162ab3 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 30 Aug 2023 08:59:28 +0200 Subject: [PATCH 070/147] ref --- addons/product_attribute | 2 +- addons/vertical_saas | 2 +- addons/website | 2 +- enterprise | 2 +- oca/community-data-files | 2 +- odoo | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/product_attribute b/addons/product_attribute index 42658a80..cb860193 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit 42658a8004d255dcb1016471e6be5f36b1ec55ee +Subproject commit cb860193fe87ef6451b0bbd2a1e770523b3586fe diff --git a/addons/vertical_saas b/addons/vertical_saas index 3eaaa5eb..eb221f58 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 3eaaa5eb88bb9c1da0b3fb6078fcef6ec2dc0a49 +Subproject commit eb221f584b039836b1770fdec0f9d4023e1744e3 diff --git a/addons/website b/addons/website index 4eff2b2d..721d02df 160000 --- a/addons/website +++ b/addons/website @@ -1 +1 @@ -Subproject commit 4eff2b2dc217e49e098155994a2b3b61bb399b91 +Subproject commit 721d02dfaf2d75d31308ec64269417b7f050b062 diff --git a/enterprise b/enterprise index 9e719d46..29f49d55 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 9e719d46e1c56117ef55b829f9a4508fb7b3f0d5 +Subproject commit 29f49d5585d96caeabcd9a75b110c23a0da5a492 diff --git a/oca/community-data-files b/oca/community-data-files index 73f2d67c..861759ad 160000 --- a/oca/community-data-files +++ b/oca/community-data-files @@ -1 +1 @@ -Subproject commit 73f2d67cba7f9fc70266443b1e7aa779075b1757 +Subproject commit 861759ad394470d192e16ce88473dfef2676992c diff --git a/odoo b/odoo index c880a295..24414c67 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit c880a295d0f7feff48b08fd00723a41b8d564d2d +Subproject commit 24414c673137d11ed80befe9a7be430b8b7c3cbb From 785d073002ca1e2ebba4ab79489c1306dff56311 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 31 Aug 2023 16:41:02 +0200 Subject: [PATCH 071/147] update test path --- task | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task b/task index 570ca299..90fdc0b2 100755 --- a/task +++ b/task @@ -388,7 +388,7 @@ function test-module() { activate-venv set-addons-path echo "Testing module $MODULE_NAME on $DATABASE ..." - odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --log-level=test --test-enable + odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --test-tags /$MODULE_NAME } function remove-module() { From 571a23473e1bd36e7bf3122b6103251833459089 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 31 Aug 2023 18:11:48 +0200 Subject: [PATCH 072/147] snippets --- addons/product_attribute | 2 +- addons/vertical_saas | 2 +- snippets/web.login.remove_login_form.xml | 33 ++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 snippets/web.login.remove_login_form.xml diff --git a/addons/product_attribute b/addons/product_attribute index cb860193..f4e9da51 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit cb860193fe87ef6451b0bbd2a1e770523b3586fe +Subproject commit f4e9da51f8b6582de3fc186a7a832ed6d112b123 diff --git a/addons/vertical_saas b/addons/vertical_saas index eb221f58..93ceefca 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit eb221f584b039836b1770fdec0f9d4023e1744e3 +Subproject commit 93ceefcaa99986c264dbc59c8d8bbae27af343be diff --git a/snippets/web.login.remove_login_form.xml b/snippets/web.login.remove_login_form.xml new file mode 100644 index 00000000..50033a84 --- /dev/null +++ b/snippets/web.login.remove_login_form.xml @@ -0,0 +1,33 @@ + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + + + + \ No newline at end of file From c432ef487f696eb9083691f64028e8faf1e2f020 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 1 Sep 2023 11:14:17 +0200 Subject: [PATCH 073/147] sync --- README.md | 8 --- config/checkout_files | 3 +- snippets/account.md | 4 +- ...se.view_partner_form.move_zip_and_city.xml | 14 +++++ snippets/base.view_partner_tree.show_type.xml | 2 +- snippets/purchase.md | 40 +++++++++++++++ ...chase_order_kpis_tree.add_date_planned.xml | 7 +++ ...ase_order_kpis_tree.add_receipt_status.xml | 7 +++ ...rchase_order_kpis_tree.x_payment_state.xml | 8 +++ snippets/sale.md | 51 +++++++++++++++++++ ...t_quotation.remove_filter_my_quotation.xml | 6 +++ .../sale.view_order_form.location_in_name.xml | 10 ++++ .../sale.view_order_tree.x_payment_state.xml | 8 +++ .../stock.view_location_form.show_barcode.xml | 8 +++ snippets/stock.view_location_form.show_id.xml | 8 +++ snippets/stock.view_move_tree.show_date.xml | 4 +- snippets/web.login.remove_login_form.xml | 2 +- snippets/web.md | 40 +++++++++++++++ 18 files changed, 214 insertions(+), 16 deletions(-) create mode 100644 snippets/base.view_partner_form.move_zip_and_city.xml create mode 100644 snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml create mode 100644 snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml create mode 100644 snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml create mode 100644 snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml create mode 100644 snippets/sale.view_order_form.location_in_name.xml create mode 100644 snippets/sale.view_order_tree.x_payment_state.xml create mode 100644 snippets/stock.view_location_form.show_barcode.xml create mode 100644 snippets/stock.view_location_form.show_id.xml diff --git a/README.md b/README.md index c1a77fbe..c44f2a23 100644 --- a/README.md +++ b/README.md @@ -100,14 +100,6 @@ Scaffold a new module. task create-module addons/project_report ``` -**Add custom module path** - -Update the `.env` file with the module path. - -```bash -ODOO_ADDONS_PATH=,addons/survey -``` - ### Docker Run Odoo with Docker container. diff --git a/config/checkout_files b/config/checkout_files index 11b4382c..25375dae 100644 --- a/config/checkout_files +++ b/config/checkout_files @@ -11,5 +11,4 @@ package-lock.json config/checkout_files logo.png docker-compose.yml -snippets.md -build \ No newline at end of file +snippets.md \ No newline at end of file diff --git a/snippets/account.md b/snippets/account.md index dc405e20..49eeec09 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -2075,7 +2075,7 @@ ID: `mint_system.account.report_invoice_document.show_customer_info_product_code - + @@ -4728,7 +4728,7 @@ ID: `mint_system.account.report_invoice_document.show_customer_info_product_code - + diff --git a/snippets/base.view_partner_form.move_zip_and_city.xml b/snippets/base.view_partner_form.move_zip_and_city.xml new file mode 100644 index 00000000..c9c320fc --- /dev/null +++ b/snippets/base.view_partner_form.move_zip_and_city.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/snippets/base.view_partner_tree.show_type.xml b/snippets/base.view_partner_tree.show_type.xml index 0039e04c..8cf91cac 100644 --- a/snippets/base.view_partner_tree.show_type.xml +++ b/snippets/base.view_partner_tree.show_type.xml @@ -2,7 +2,7 @@ - + diff --git a/snippets/purchase.md b/snippets/purchase.md index bfe4358c..1ceeb5cc 100644 --- a/snippets/purchase.md +++ b/snippets/purchase.md @@ -260,6 +260,19 @@ ID: `mint_system.purchase.purchase_order_kpis_tree.add_comment` ``` Source: [snippets/purchase.purchase_order_kpis_tree.add_comment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_comment.xml) +### Add Date Planned +ID: `mint_system.purchase.purchase_order_kpis_tree.add_date_planned` +```xml + + + + + + + +``` +Source: [snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml) + ### Add Mail Reception Confirmed ID: `mint_system.purchase.purchase_order_kpis_tree.add_mail_reception_confirmed` ```xml @@ -275,6 +288,19 @@ ID: `mint_system.purchase.purchase_order_kpis_tree.add_mail_reception_confirmed` ``` Source: [snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml) +### Add Receipt Status +ID: `mint_system.purchase.purchase_order_kpis_tree.add_receipt_status` +```xml + + + + + + + +``` +Source: [snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml) + ### Format Date Order ID: `mint_system.purchase.purchase_order_kpis_tree.format_date_order` ```xml @@ -289,6 +315,20 @@ ID: `mint_system.purchase.purchase_order_kpis_tree.format_date_order` ``` Source: [snippets/purchase.purchase_order_kpis_tree.format_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml) +### X Payment State +ID: `mint_system.purchase.purchase_order_kpis_tree.x_payment_state` +```xml + + + + + + + + +``` +Source: [snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml) + ## Purchase Order Line Tree ### Reset View ID: `mint_system.purchase.purchase_order_line_tree.reset_view` diff --git a/snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml b/snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml new file mode 100644 index 00000000..0b4ef648 --- /dev/null +++ b/snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml b/snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml new file mode 100644 index 00000000..6657ab8d --- /dev/null +++ b/snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml b/snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml new file mode 100644 index 00000000..d5042dac --- /dev/null +++ b/snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.md b/snippets/sale.md index 4b77b7bc..60d91f5c 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -1274,6 +1274,26 @@ ID: `mint_system.sale.report_saleorder_document.add_product_uom` ``` Source: [snippets/sale.report_saleorder_document.add_product_uom.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_product_uom.xml) +### Add Proforma Note +ID: `mint_system.sale.report_saleorder_document.add_proforma_note` +```xml + + + + + + +

          Der Unterzeichner erklärt, dass die in diesem Dokument aufgeführten Waren und Ursprungserzeugnisse der Schweiz sind und den Ursprungsregeln im Präferenzverkehr mit der EU entsprechen.

          +

          Unterschrift: _______________________    Datum: _______________________
                                  Aersolution Interior AG

          +           +           +           + +           + +``` +Source: [snippets/sale.report_saleorder_document.add_proforma_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_proforma_note.xml) + ### Address Block ID: `mint_system.sale.report_saleorder_document.address_block` ```xml @@ -3593,6 +3613,23 @@ ID: `mint_system.sale.view_order_form.hide_validity_date` ``` Source: [snippets/sale.view_order_form.hide_validity_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.hide_validity_date.xml) +### Location In Name +ID: `mint_system.sale.view_order_form.location_in_name` +```xml + + + + + + {'res_partner_search_mode': 'customer', 'show_address': 1, 'show_vat': True, 'show_zip_and_city': True} + + + + + +``` +Source: [snippets/sale.view_order_form.location_in_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.location_in_name.xml) + ### Modify Readonly Date Order ID: `mint_system.sale.view_order_form.modify_readonly_date_order` ```xml @@ -4374,6 +4411,20 @@ ID: `mint_system.sale.view_order_tree.show_state` ``` Source: [snippets/sale.view_order_tree.show_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.show_state.xml) +### X Payment State +ID: `mint_system.sale.view_order_tree.x_payment_state` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_order_tree.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.x_payment_state.xml) + ### X Product Uom Qty ID: `mint_system.sale.view_order_tree.x_product_uom_qty` ```xml diff --git a/snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml b/snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml new file mode 100644 index 00000000..a2b04a57 --- /dev/null +++ b/snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_order_form.location_in_name.xml b/snippets/sale.view_order_form.location_in_name.xml new file mode 100644 index 00000000..206b02c9 --- /dev/null +++ b/snippets/sale.view_order_form.location_in_name.xml @@ -0,0 +1,10 @@ + + + + + + {'res_partner_search_mode': 'customer', 'show_address': 1, 'show_vat': True, 'show_zip_and_city': True} + + + + diff --git a/snippets/sale.view_order_tree.x_payment_state.xml b/snippets/sale.view_order_tree.x_payment_state.xml new file mode 100644 index 00000000..cd6d9de1 --- /dev/null +++ b/snippets/sale.view_order_tree.x_payment_state.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.view_location_form.show_barcode.xml b/snippets/stock.view_location_form.show_barcode.xml new file mode 100644 index 00000000..90937bb0 --- /dev/null +++ b/snippets/stock.view_location_form.show_barcode.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.view_location_form.show_id.xml b/snippets/stock.view_location_form.show_id.xml new file mode 100644 index 00000000..b20dd1f8 --- /dev/null +++ b/snippets/stock.view_location_form.show_id.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.view_move_tree.show_date.xml b/snippets/stock.view_move_tree.show_date.xml index ceacce2a..174f2249 100644 --- a/snippets/stock.view_move_tree.show_date.xml +++ b/snippets/stock.view_move_tree.show_date.xml @@ -1,8 +1,8 @@ - - + + diff --git a/snippets/web.login.remove_login_form.xml b/snippets/web.login.remove_login_form.xml index 50033a84..6487c0da 100644 --- a/snippets/web.login.remove_login_form.xml +++ b/snippets/web.login.remove_login_form.xml @@ -1,4 +1,4 @@ - + 'debug=1' in request.httprequest.url diff --git a/snippets/web.md b/snippets/web.md index efc87720..51007d06 100644 --- a/snippets/web.md +++ b/snippets/web.md @@ -779,6 +779,46 @@ ID: `mint_system.web.login_layout.disable_footer` ``` Source: [snippets/web.login_layout.disable_footer.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.login_layout.disable_footer.xml) +## Login +### Remove Login Form +ID: `mint_system.web.login.remove_login_form` +```xml + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + 'debug=1' in request.httprequest.url + + + + + + + +``` +Source: [snippets/web.login.remove_login_form.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.login.remove_login_form.xml) + ## Styles Company Report ### Set Font ID: `mint_system.web.styles_company_report.set_font` From 1540df97b71aba04fb92b3b2d84271372821843b Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 1 Sep 2023 17:03:39 +0200 Subject: [PATCH 074/147] remove survey --- .gitmodules | 4 ---- oca/survey | 1 - 2 files changed, 5 deletions(-) delete mode 160000 oca/survey diff --git a/.gitmodules b/.gitmodules index 19adda9d..9f83b3f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -226,7 +226,3 @@ path = oca/account-reconcile url = git@github.com:OCA/account-reconcile.git branch = 16.0 -[submodule "oca/survey"] - path = oca/survey - url = git@github.com:OCA/survey.git - branch = 16.0 diff --git a/oca/survey b/oca/survey deleted file mode 160000 index 4bfbf839..00000000 --- a/oca/survey +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4bfbf839b78357827d31c4276f2cbbebf311f617 From b89e6dd266ad7df7bb208e465c80fbe11c1af888 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 1 Sep 2023 17:03:42 +0200 Subject: [PATCH 075/147] ref --- addons/odoo_apps_partner | 2 +- addons/vertical_job_portal | 2 +- enterprise | 2 +- oca/account-reconcile | 2 +- oca/dms | 1 + oca/knowledge | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/sale-workflow | 2 +- oca/server-tools | 2 +- oca/stock-logistics-warehouse | 2 +- oca/timesheet | 2 +- oca/web | 2 +- odoo | 2 +- task | 3 +-- 15 files changed, 15 insertions(+), 15 deletions(-) create mode 160000 oca/dms diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner index b3fd3ddc..527d3065 160000 --- a/addons/odoo_apps_partner +++ b/addons/odoo_apps_partner @@ -1 +1 @@ -Subproject commit b3fd3ddcb6a489966387901b6c360b03c54b1cc4 +Subproject commit 527d306545b2b45d439bfe8d0c11d2d7a7edac1c diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 5e6fc186..41425d7c 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 5e6fc186c6de555ca35e68823ba93d4a414bd974 +Subproject commit 41425d7cb28ff484961d88d1d789ccebe5dc0238 diff --git a/enterprise b/enterprise index 29f49d55..e1d98fe9 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 29f49d5585d96caeabcd9a75b110c23a0da5a492 +Subproject commit e1d98fe99c69f91f74e4da924fb83dde57d9ad30 diff --git a/oca/account-reconcile b/oca/account-reconcile index afed064a..ce981360 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit afed064a0fcf81ee6da62d9beeff963d84fda176 +Subproject commit ce981360e21584d256f76a7ef99b10a7b0467c88 diff --git a/oca/dms b/oca/dms new file mode 160000 index 00000000..44b2427e --- /dev/null +++ b/oca/dms @@ -0,0 +1 @@ +Subproject commit 44b2427e205d572d3460319102fa63252343f3f3 diff --git a/oca/knowledge b/oca/knowledge index 7b2ecf93..6984c9ca 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit 7b2ecf9340a14c072fafe1fd82ea3d91a79c52cc +Subproject commit 6984c9caf58e6fbd093c4017d2c5c5f5af62d5b7 diff --git a/oca/partner-contact b/oca/partner-contact index c57dfbeb..1e0a15ff 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit c57dfbebd4d50d5f57729894932a1c85678e43f6 +Subproject commit 1e0a15ff3e5750b1a996e85427f0fe57d888fc68 diff --git a/oca/product-attribute b/oca/product-attribute index f18c21c5..e88fb510 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit f18c21c552d09afd3b38b837958257c52ea400bc +Subproject commit e88fb510f2cc249c57e2f06405735f9f199ffd0a diff --git a/oca/sale-workflow b/oca/sale-workflow index 8bc0f01b..91c3180e 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 8bc0f01b7ba7706bbca8a5f46d839293267657b6 +Subproject commit 91c3180e7410fa6e1622923df55fb50c6704858a diff --git a/oca/server-tools b/oca/server-tools index 8bd0565e..6fc2ed79 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 8bd0565ee30882524bfe1a61139c2843d7993a33 +Subproject commit 6fc2ed79296e989512a3df83c9f8e7b026c0b9ae diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index bcfb25f3..5401f515 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit bcfb25f3865c43285ddbb836779961af1d6efb6a +Subproject commit 5401f515457cb7817c891142af4d15f17d6b78f0 diff --git a/oca/timesheet b/oca/timesheet index c6ceaad3..b85d9674 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit c6ceaad3f39001a74b4d904e0299df714cef5a5f +Subproject commit b85d9674fc52f2fc6d351de9fa20779f62ba466c diff --git a/oca/web b/oca/web index 8b258c8d..28b6d1cf 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 8b258c8d47ebc1f80c7dbc33fb854c5e67a49fc8 +Subproject commit 28b6d1cfda5aced1e4ceb030e7f0eb9c7f5396aa diff --git a/odoo b/odoo index 24414c67..de0bc759 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 24414c673137d11ed80befe9a7be430b8b7c3cbb +Subproject commit de0bc759d780b9754974dfaaeec03deea067bbbd diff --git a/task b/task index 90fdc0b2..9b733ba3 100755 --- a/task +++ b/task @@ -85,9 +85,8 @@ function get-module-version() { echo "\$1 is empty." else # Get version of module - VERSION=$(grep -m 1 version "$1/__manifest__.py" | sed "s;';\";g" | sed "s/,//g" ) + VERSION=$(grep -m 1 version "$1/__manifest__.py" | sed "s;';\";g" | sed "s/,//g" | sed 's/#.*//g') VERSION=$(echo "{ $VERSION }" | jq .version | sed 's/"//g' | sed 's/null//g') - # Set default version [ -z "$VERSION" ] && VERSION=0.0 From faba192d19df2ce5db71292c37024899579f0cb2 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 4 Sep 2023 18:06:58 +0200 Subject: [PATCH 076/147] update snippets + odoo conf --- config/odoo.conf | 2 +- docker-compose.yml | 1 - ....label_production_view_pdf.aersolution.xml | 16 ++++++++++ snippets/stock.report_label.aersolution.xml | 27 +++++++++++++++++ .../stock.report_lot_label.aersolution.xml | 16 ++++++++++ ...ort_reception_report_label.aersolution.xml | 29 ++++--------------- 6 files changed, 65 insertions(+), 26 deletions(-) create mode 100644 snippets/mrp.label_production_view_pdf.aersolution.xml create mode 100644 snippets/stock.report_label.aersolution.xml create mode 100644 snippets/stock.report_lot_label.aersolution.xml diff --git a/config/odoo.conf b/config/odoo.conf index 75a8d8f8..71be7ea9 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays,/mnt/oca/sale-reporting,/mnt/oca/survey,/mnt/oca/account-reconcile +addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays,/mnt/oca/sale-reporting,/mnt/oca/account-reconcile admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA data_dir = /var/lib/odoo limit_time_real = 600 diff --git a/docker-compose.yml b/docker-compose.yml index 09addc59..a2aeab9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,6 @@ services: ports: - "127.0.0.1:8069:8069" volumes: - # - $HOME/.local/share/Odoo/filestore:/var/lib/odoo/filestore - odoo-data:/var/lib/odoo - ./config:/etc/odoo - ./addons:/mnt/addons diff --git a/snippets/mrp.label_production_view_pdf.aersolution.xml b/snippets/mrp.label_production_view_pdf.aersolution.xml new file mode 100644 index 00000000..5e786d89 --- /dev/null +++ b/snippets/mrp.label_production_view_pdf.aersolution.xml @@ -0,0 +1,16 @@ + + +
          + + + + + + + + + + +
          +           +           \ No newline at end of file diff --git a/snippets/stock.report_label.aersolution.xml b/snippets/stock.report_label.aersolution.xml new file mode 100644 index 00000000..5bc9cace --- /dev/null +++ b/snippets/stock.report_label.aersolution.xml @@ -0,0 +1,27 @@ + + + +
          +
          + Logo +
          +
          +
          + -           +
          +
          + +
          + +

          + +

          LS/SN:

          + +

          EXP:

          + + +

          LOC:

          + +

          + + \ No newline at end of file diff --git a/snippets/stock.report_lot_label.aersolution.xml b/snippets/stock.report_lot_label.aersolution.xml new file mode 100644 index 00000000..730ab38b --- /dev/null +++ b/snippets/stock.report_lot_label.aersolution.xml @@ -0,0 +1,16 @@ + + +

          + + + + + + + + + + +
          +           +           \ No newline at end of file diff --git a/snippets/stock.report_reception_report_label.aersolution.xml b/snippets/stock.report_reception_report_label.aersolution.xml index 997b6d5a..d8a98bd6 100644 --- a/snippets/stock.report_reception_report_label.aersolution.xml +++ b/snippets/stock.report_reception_report_label.aersolution.xml @@ -3,33 +3,14 @@
          - - -
          -
          - Logo -
          -
          -
          - -           -
          -
          - -
          - -

          + + + + -

          LS/SN:

          - -

          EXP:

          - - -

          LOC:

          - -

          - + From d4b6a9342844edb82b6aa559057d61528788f878 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 5 Sep 2023 11:31:55 +0200 Subject: [PATCH 077/147] sync --- snippets/ir_model.sale_order.x_industry_id.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 snippets/ir_model.sale_order.x_industry_id.xml diff --git a/snippets/ir_model.sale_order.x_industry_id.xml b/snippets/ir_model.sale_order.x_industry_id.xml new file mode 100644 index 00000000..edc02042 --- /dev/null +++ b/snippets/ir_model.sale_order.x_industry_id.xml @@ -0,0 +1,17 @@ + + + + + Branche + sale.order + + x_industry_id + + + + char + partner_id.industry_id.name + + + + From 5b6afc57469e99f0082f3df0fb7e598e2a4a99a5 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 5 Sep 2023 15:20:18 +0200 Subject: [PATCH 078/147] sync --- snippets/sale.view_order_form.edit_tax_id.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snippets/sale.view_order_form.edit_tax_id.xml diff --git a/snippets/sale.view_order_form.edit_tax_id.xml b/snippets/sale.view_order_form.edit_tax_id.xml new file mode 100644 index 00000000..ffff9475 --- /dev/null +++ b/snippets/sale.view_order_form.edit_tax_id.xml @@ -0,0 +1,8 @@ + + + + + {} + + + From 37430db9d9b3397ddf77d98149c83088ad1f04de Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 5 Sep 2023 15:54:53 +0200 Subject: [PATCH 079/147] ref --- addons/vertical_saas | 2 +- enterprise | 2 +- oca/account-closing | 2 +- oca/account-financial-reporting | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/account-reconcile | 2 +- oca/bank-payment | 2 +- oca/bank-statement-import | 2 +- oca/brand | 2 +- oca/business-requirement | 2 +- oca/community-data-files | 2 +- oca/connector | 2 +- oca/contract | 2 +- oca/credit-control | 2 +- oca/crm | 2 +- oca/dms | 2 +- oca/edi | 2 +- oca/hr | 2 +- oca/hr-attendance | 2 +- oca/hr-holidays | 2 +- oca/iot | 2 +- oca/knowledge | 2 +- oca/l10n-switzerland | 2 +- oca/management-system | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-reporting | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-backend | 2 +- oca/server-env | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/social | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/timesheet | 2 +- oca/web | 2 +- oca/website | 2 +- odoo | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 93ceefca..c828f529 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 93ceefcaa99986c264dbc59c8d8bbae27af343be +Subproject commit c828f529bb65aedc5fcce25c2c58141a45b151ab diff --git a/enterprise b/enterprise index e1d98fe9..3205a82c 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit e1d98fe99c69f91f74e4da924fb83dde57d9ad30 +Subproject commit 3205a82c4616b969b87aa2f6d05a2da636688037 diff --git a/oca/account-closing b/oca/account-closing index 72da376d..a8a989c4 160000 --- a/oca/account-closing +++ b/oca/account-closing @@ -1 +1 @@ -Subproject commit 72da376da6407c8f7867cbd9584261de21ad6307 +Subproject commit a8a989c45dcbfc742a9aa9368b7598386d081b21 diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting index 0d2bcce3..b856f1f8 160000 --- a/oca/account-financial-reporting +++ b/oca/account-financial-reporting @@ -1 +1 @@ -Subproject commit 0d2bcce35e277847b2fea8217bdbee070610b589 +Subproject commit b856f1f82587f5b27c51eb04e61513f85882cc06 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index aaa79556..0c3f2b47 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit aaa7955626ba4247761b2ac6a12d2c5cc64c0c2e +Subproject commit 0c3f2b47084f4780f06ebf8cc6adf80922f4f303 diff --git a/oca/account-invoicing b/oca/account-invoicing index 6ddc91cc..d746595a 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit 6ddc91cc8a0a64b2974f042b3388d5811c5e957b +Subproject commit d746595a2fef5b5abcca57e59bbbe5229a9494ee diff --git a/oca/account-reconcile b/oca/account-reconcile index ce981360..99fb0b5f 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit ce981360e21584d256f76a7ef99b10a7b0467c88 +Subproject commit 99fb0b5fc5dea09c9e6f0a0409e6d6b4152a3fab diff --git a/oca/bank-payment b/oca/bank-payment index 94e8f27f..6d1d9e51 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 94e8f27fef3cf01b56eea7dc9e18b5740893f2f4 +Subproject commit 6d1d9e5175bf44274f38836d42a0f5598c99b108 diff --git a/oca/bank-statement-import b/oca/bank-statement-import index 408b163d..c1b656ee 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit 408b163da3932691df06f60a41b39a4901c4110b +Subproject commit c1b656eeaf145adf9bb31ee32ce6a080625724b7 diff --git a/oca/brand b/oca/brand index 6eae42f7..f6808635 160000 --- a/oca/brand +++ b/oca/brand @@ -1 +1 @@ -Subproject commit 6eae42f7885a80baddb6c4ab2ca31d51ac21d943 +Subproject commit f68086359c1cdd1095ba02ceb6deaadd6567cdf8 diff --git a/oca/business-requirement b/oca/business-requirement index f970f8f1..efeee191 160000 --- a/oca/business-requirement +++ b/oca/business-requirement @@ -1 +1 @@ -Subproject commit f970f8f19c18fe175276de39bb51152c1dd7d6c4 +Subproject commit efeee191c639b12034f8a10b2917113cd885107e diff --git a/oca/community-data-files b/oca/community-data-files index 861759ad..20ebec51 160000 --- a/oca/community-data-files +++ b/oca/community-data-files @@ -1 +1 @@ -Subproject commit 861759ad394470d192e16ce88473dfef2676992c +Subproject commit 20ebec51c339d53b2f067674cec0afb7e362e52a diff --git a/oca/connector b/oca/connector index c571c3a4..26ebcca4 160000 --- a/oca/connector +++ b/oca/connector @@ -1 +1 @@ -Subproject commit c571c3a4a5fcab71fd15102cb70d6045aad9adad +Subproject commit 26ebcca47974636aea3b626f469f6271502d7610 diff --git a/oca/contract b/oca/contract index 5cde4670..bc757fda 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit 5cde46708d685462e463d1aba755f43afc82ed87 +Subproject commit bc757fda1453204285cf80ba8314d0a4f58cceb0 diff --git a/oca/credit-control b/oca/credit-control index 5874de2c..41afbc7f 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 5874de2cd3ad69cafbfe1bca6e7593552f47744a +Subproject commit 41afbc7f0029daa4a4e2afeddbb05b16002b7498 diff --git a/oca/crm b/oca/crm index 09ba1575..59bacf6d 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit 09ba15753e3c6e17bdcda94036f33f446318ceca +Subproject commit 59bacf6df0953259f1848d1ba18121926c5b4d58 diff --git a/oca/dms b/oca/dms index 44b2427e..e4d60b2d 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit 44b2427e205d572d3460319102fa63252343f3f3 +Subproject commit e4d60b2d3f0512b9b8477986bbea6cd778ee4154 diff --git a/oca/edi b/oca/edi index d49b6cd2..f48df3a8 160000 --- a/oca/edi +++ b/oca/edi @@ -1 +1 @@ -Subproject commit d49b6cd2811b52b0ab5a35113e3b090d17e76820 +Subproject commit f48df3a871a9a8e302a61a24f75b493fadac1115 diff --git a/oca/hr b/oca/hr index efca073a..661e9d0e 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit efca073a3b424daafa50aeb73b23cacd430ab529 +Subproject commit 661e9d0e9e97dec39f5d2f1b8d0a9fa3527ad2b8 diff --git a/oca/hr-attendance b/oca/hr-attendance index 96b8dbcc..4d786468 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 96b8dbcc8fdb2abcac37b5cf4bb7a8f7805d5163 +Subproject commit 4d786468b29477f5a3aceb102f77f2bd748fad20 diff --git a/oca/hr-holidays b/oca/hr-holidays index 8d7a684b..5d30c886 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit 8d7a684b125c98856f093af9fbd6e98e02b38497 +Subproject commit 5d30c88677037fa28d4f95303a92d6c7d83ea111 diff --git a/oca/iot b/oca/iot index 5e8e6c9d..e296f0a7 160000 --- a/oca/iot +++ b/oca/iot @@ -1 +1 @@ -Subproject commit 5e8e6c9d392510c86aa73e65ea30e4558eb64a84 +Subproject commit e296f0a78c12eb41198e284f4694e3aa4ef167c6 diff --git a/oca/knowledge b/oca/knowledge index 6984c9ca..ade77606 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit 6984c9caf58e6fbd093c4017d2c5c5f5af62d5b7 +Subproject commit ade776069725025803af0a9959211fdf32789419 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index bb7affa6..2a5d0867 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19 +Subproject commit 2a5d0867e11d47acde565347256bc26f76de61b6 diff --git a/oca/management-system b/oca/management-system index 32c62afb..7cbd7992 160000 --- a/oca/management-system +++ b/oca/management-system @@ -1 +1 @@ -Subproject commit 32c62afb0b868a04215d2fde3ab0d366b0ef7f46 +Subproject commit 7cbd7992acd752c6ee04ab42c69f57981469684a diff --git a/oca/manufacture b/oca/manufacture index 3ee9f060..72ae6be1 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 3ee9f0600561df61f3b3141da3fbe8d2add80aa6 +Subproject commit 72ae6be1c11bfb758712b9fed66316de356065da diff --git a/oca/partner-contact b/oca/partner-contact index 1e0a15ff..631afc50 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 1e0a15ff3e5750b1a996e85427f0fe57d888fc68 +Subproject commit 631afc50a3100c1ed3537baa153fb4c626d1e283 diff --git a/oca/product-attribute b/oca/product-attribute index e88fb510..df740828 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit e88fb510f2cc249c57e2f06405735f9f199ffd0a +Subproject commit df7408282568fcb4720458014f78cb536d805175 diff --git a/oca/project b/oca/project index 624bd498..79a90b78 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 624bd4980ad5da3fd932ab3ff63f4b0ac3fe629c +Subproject commit 79a90b78b5aa4b88af7cf59d1650dde7a5619ebd diff --git a/oca/purchase-workflow b/oca/purchase-workflow index fbc07667..45813308 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit fbc076672fb43b196628d6ad9983ca7ab0d02d54 +Subproject commit 45813308202b3b801b9406deab6e608ac807e6fc diff --git a/oca/reporting-engine b/oca/reporting-engine index 585ca5d4..9156125c 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 585ca5d4b47a09240fdb6d20d1ddb77f96dd6cf5 +Subproject commit 9156125caff42653daa230bcb342ce0187e0c77c diff --git a/oca/rest-framework b/oca/rest-framework index 23dabc98..b6d84358 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit 23dabc98c4b828f67f7d7c263502fcab0c1f5a52 +Subproject commit b6d84358ba1b567f617625c95364d4c05b16fbcc diff --git a/oca/sale-reporting b/oca/sale-reporting index c2f9c2a5..977620b7 160000 --- a/oca/sale-reporting +++ b/oca/sale-reporting @@ -1 +1 @@ -Subproject commit c2f9c2a5e56b02faac83ea6037989d1a0cb1bc2d +Subproject commit 977620b78ce8e035f3b5c98b380e730b5b3a08c6 diff --git a/oca/sale-workflow b/oca/sale-workflow index 91c3180e..f47fd5e1 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 91c3180e7410fa6e1622923df55fb50c6704858a +Subproject commit f47fd5e12034c9cf3d0b33f87fb035e228a91f63 diff --git a/oca/server-auth b/oca/server-auth index b264c1af..395b2e02 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit b264c1af4fe863f65d2ee40e48306aed071b5527 +Subproject commit 395b2e02e8c5df1a604082737f0a2bf1cefc1469 diff --git a/oca/server-backend b/oca/server-backend index 8292cc6a..74847067 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 8292cc6aab19cc1ce5b4fd10836438ad0b230323 +Subproject commit 74847067820ae3a423c58f776d908c9b8053e2f3 diff --git a/oca/server-env b/oca/server-env index d40461b2..8d0a929a 160000 --- a/oca/server-env +++ b/oca/server-env @@ -1 +1 @@ -Subproject commit d40461b2a7abc81e9a2660a5b1312b8b98e1864d +Subproject commit 8d0a929a81de1c0c3884f88546d0a1a45517a9bf diff --git a/oca/server-tools b/oca/server-tools index 6fc2ed79..149de2ed 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 6fc2ed79296e989512a3df83c9f8e7b026c0b9ae +Subproject commit 149de2ed96429655d35154f85da47c056d523f6d diff --git a/oca/server-ux b/oca/server-ux index fc3c4e7f..8398f324 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit fc3c4e7f222dd17b86f52b3e9fa13d911815fb13 +Subproject commit 8398f324cb12bf7594dd02924936503bd8765abc diff --git a/oca/social b/oca/social index c7ed17a4..5dd6eb25 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit c7ed17a466bc6db3d4e24db756bcda61cf7b7530 +Subproject commit 5dd6eb25de362961aff18f813cd166971e472620 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 5401f515..a879147e 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 5401f515457cb7817c891142af4d15f17d6b78f0 +Subproject commit a879147e6e38e8fd059d58f04803f676cd7173c7 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index f0f35a28..a0c4b703 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit f0f35a281ad11ba0ac6f6bcc83b7dfe7776cfa80 +Subproject commit a0c4b703910057d03b95ed05d9e5238f4e602fd6 diff --git a/oca/timesheet b/oca/timesheet index b85d9674..877d7396 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit b85d9674fc52f2fc6d351de9fa20779f62ba466c +Subproject commit 877d7396d7ff6b2fee0320a83dd6923f2e0b1600 diff --git a/oca/web b/oca/web index 28b6d1cf..afdcf39e 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 28b6d1cfda5aced1e4ceb030e7f0eb9c7f5396aa +Subproject commit afdcf39e3a9e722c9030d29f26cbab77bc637298 diff --git a/oca/website b/oca/website index 62c69fc7..3b9b3358 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit 62c69fc71070da031c345a64b86be4ab8804b58e +Subproject commit 3b9b33587cb3eca656f60b4f33652489581d8d90 diff --git a/odoo b/odoo index de0bc759..d67aa6a7 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit de0bc759d780b9754974dfaaeec03deea067bbbd +Subproject commit d67aa6a798d9f7359549bbf56ec6fa2913f930ec From 1edee22ac13f99aaec0413e4fb44b05677ca36e4 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 7 Sep 2023 10:54:26 +0200 Subject: [PATCH 080/147] sync --- snippets/base.md | 23 +++- snippets/ir_model.md | 24 ++++ snippets/mrp.md | 22 ++++ snippets/sale.md | 27 ++++ snippets/stock.md | 119 ++++++++++++++---- ...out_standard.show_sale_order_in_footer.xml | 8 ++ 6 files changed, 196 insertions(+), 27 deletions(-) create mode 100644 snippets/web.external_layout_standard.show_sale_order_in_footer.xml diff --git a/snippets/base.md b/snippets/base.md index 15a6aec5..77567a61 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -322,6 +322,27 @@ ID: `mint_system.base.view_partner_form.move_ref` ``` Source: [snippets/base.view_partner_form.move_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_ref.xml) +### Move Zip And City +ID: `mint_system.base.view_partner_form.move_zip_and_city` +```xml + + + + + + + + + + + + + + + +``` +Source: [snippets/base.view_partner_form.move_zip_and_city.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_zip_and_city.xml) + ### Show Color ID: `mint_system.base.view_partner_form.show_color` ```xml @@ -633,7 +654,7 @@ ID: `mint_system.base.view_partner_tree.show_type` - + diff --git a/snippets/ir_model.md b/snippets/ir_model.md index dcc6d464..a13263ec 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -2252,6 +2252,30 @@ ID: `mint_system.ir_model.sale_order.x_incoterm_blanket_order` ``` Source: [snippets/ir_model.sale_order.x_incoterm_blanket_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml) +### X Industry Id +ID: `mint_system.ir_model.sale_order.x_industry_id` +```xml + + + + + Branche + sale.order + + x_industry_id + + + + char + partner_id.industry_id.name + + + + + +``` +Source: [snippets/ir_model.sale_order.x_industry_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_industry_id.xml) + ### X Order Number ID: `mint_system.ir_model.sale_order.x_order_number` ```xml diff --git a/snippets/mrp.md b/snippets/mrp.md index 47d39f1b..cf834471 100644 --- a/snippets/mrp.md +++ b/snippets/mrp.md @@ -1,5 +1,27 @@ # Mrp ## Label Production View Pdf +### Aersolution +ID: `mint_system.mrp.label_production_view_pdf.aersolution` +```xml + + +

          + + + + + + + + + + +
          +           +           +``` +Source: [snippets/mrp.label_production_view_pdf.aersolution.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.label_production_view_pdf.aersolution.xml) + ### Basis57 ID: `mint_system.mrp.label_production_view_pdf.basis57` ```xml diff --git a/snippets/sale.md b/snippets/sale.md index 60d91f5c..6ee76d33 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -3411,6 +3411,18 @@ ID: `mint_system.sale.sale_order_view_search_inherit_quotation.add_filter_state_ ``` Source: [snippets/sale.sale_order_view_search_inherit_quotation.add_filter_state_draft_or_sent.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_view_search_inherit_quotation.add_filter_state_draft_or_sent.xml) +### Remove Filter My Quotation +ID: `mint_system.sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation` +```xml + + + + + + +``` +Source: [snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml) + ## Sale Order View Search Inherit Sale ### Add Invoice Status Invoiced ID: `mint_system.sale.sale_order_view_search_inherit_sale.add_invoice_status_invoiced` @@ -3548,6 +3560,21 @@ ID: `mint_system.sale.view_order_form.edit_name` ``` Source: [snippets/sale.view_order_form.edit_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.edit_name.xml) +### Edit Tax Id +ID: `mint_system.sale.view_order_form.edit_tax_id` +```xml + + + + + {} + + + + +``` +Source: [snippets/sale.view_order_form.edit_tax_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.edit_tax_id.xml) + ### Filter Customer Is Company ID: `mint_system.sale.view_order_form.filter_customer_is_company` ```xml diff --git a/snippets/stock.md b/snippets/stock.md index 3f431662..2231c652 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -3239,6 +3239,63 @@ ID: `mint_system.stock.report_delivery_document.x_hide_on_delivery` ``` Source: [snippets/stock.report_delivery_document.x_hide_on_delivery.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.x_hide_on_delivery.xml) +## Report Label +### Aersolution +ID: `mint_system.stock.report_label.aersolution` +```xml + + + +
          +
          + Logo +
          +
          +
          + -           +
          +
          + +
          + +

          + +

          LS/SN:

          + +

          EXP:

          + + +

          LOC:

          + +

          + + +``` +Source: [snippets/stock.report_label.aersolution.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_label.aersolution.xml) + +## Report Lot Label +### Aersolution +ID: `mint_system.stock.report_lot_label.aersolution` +```xml + + +

          + + + + + + + + + + +
          +           +           +``` +Source: [snippets/stock.report_lot_label.aersolution.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_lot_label.aersolution.xml) + ## Report Picking ### Add Address Block ID: `mint_system.stock.report_picking.add_address_block` @@ -5932,33 +5989,14 @@ ID: `mint_system.stock.report_reception_report_label.aersolution`
          - - -
          -
          - Logo -
          -
          -
          - -           -
          -
          - -
          - -

          + + + + -

          LS/SN:

          - -

          EXP:

          - - -

          LOC:

          - -

          - + @@ -6391,6 +6429,35 @@ ID: `mint_system.stock.stock_report_delivery_package_section_line.set_color` ``` Source: [snippets/stock.stock_report_delivery_package_section_line.set_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.stock_report_delivery_package_section_line.set_color.xml) +## View Location Form +### Show Barcode +ID: `mint_system.stock.view_location_form.show_barcode` +```xml + + + + + + + + +``` +Source: [snippets/stock.view_location_form.show_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_location_form.show_barcode.xml) + +### Show Id +ID: `mint_system.stock.view_location_form.show_id` +```xml + + + + + + + + +``` +Source: [snippets/stock.view_location_form.show_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_location_form.show_id.xml) + ## View Move Form ### Enable Edit And Create ID: `mint_system.stock.view_move_form.enable_edit_and_create` @@ -6759,8 +6826,8 @@ ID: `mint_system.stock.view_move_tree.show_date` - - + + diff --git a/snippets/web.external_layout_standard.show_sale_order_in_footer.xml b/snippets/web.external_layout_standard.show_sale_order_in_footer.xml new file mode 100644 index 00000000..9ad55204 --- /dev/null +++ b/snippets/web.external_layout_standard.show_sale_order_in_footer.xml @@ -0,0 +1,8 @@ + + + + + + + + From 64fc21d1cbfe6b5656ac3e8e0c8e0c9fdfef09e4 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 8 Sep 2023 09:07:37 +0200 Subject: [PATCH 081/147] add snippets --- oca/hr-attendance | 2 +- ...se.view_partner_tree.x_first_sale_date.xml | 8 +++++++ ...ir_model.res_partner.x_first_sale_date.xml | 23 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 snippets/base.view_partner_tree.x_first_sale_date.xml create mode 100644 snippets/ir_model.res_partner.x_first_sale_date.xml diff --git a/oca/hr-attendance b/oca/hr-attendance index 4d786468..50ed427c 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 4d786468b29477f5a3aceb102f77f2bd748fad20 +Subproject commit 50ed427cf94e26c8cef249b1173138b530fe9ac1 diff --git a/snippets/base.view_partner_tree.x_first_sale_date.xml b/snippets/base.view_partner_tree.x_first_sale_date.xml new file mode 100644 index 00000000..dc84ab4b --- /dev/null +++ b/snippets/base.view_partner_tree.x_first_sale_date.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/ir_model.res_partner.x_first_sale_date.xml b/snippets/ir_model.res_partner.x_first_sale_date.xml new file mode 100644 index 00000000..7ad7b593 --- /dev/null +++ b/snippets/ir_model.res_partner.x_first_sale_date.xml @@ -0,0 +1,23 @@ + + + + + Erstes Verkaufsdatum + res.partner + + x_first_sale_date + + + + date + sale_order_ids + for rec in self: + first_sale_order = rec.sale_order_ids.filtered(lambda s: s.state == 'sale').sorted('date_order')[:1] + if first_sale_order: + rec['x_first_sale_date'] = first_sale_order.date_order + else: + rec['x_first_sale_date'] = False + + + + From 56e83dd18e63745511c3bafd4c50a984a9888748 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 8 Sep 2023 10:40:12 +0200 Subject: [PATCH 082/147] sync --- snippets/base.md | 15 +++++++++++++++ snippets/ir_model.md | 30 ++++++++++++++++++++++++++++++ snippets/web.md | 15 +++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/snippets/base.md b/snippets/base.md index 77567a61..faede5fe 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -677,6 +677,21 @@ ID: `mint_system.base.view_partner_tree.x_bexioid` ``` Source: [snippets/base.view_partner_tree.x_bexioid.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_bexioid.xml) +### X First Sale Date +ID: `mint_system.base.view_partner_tree.x_first_sale_date` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_tree.x_first_sale_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_first_sale_date.xml) + ### X Global Location Number ID: `mint_system.base.view_partner_tree.x_global_location_number` ```xml diff --git a/snippets/ir_model.md b/snippets/ir_model.md index a13263ec..fd75c84d 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -1709,6 +1709,36 @@ ID: `mint_system.ir_model.res_partner.x_external_ref` ``` Source: [snippets/ir_model.res_partner.x_external_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_external_ref.xml) +### X First Sale Date +ID: `mint_system.ir_model.res_partner.x_first_sale_date` +```xml + + + + + Erstes Verkaufsdatum + res.partner + + x_first_sale_date + + + + date + sale_order_ids + for rec in self: + first_sale_order = rec.sale_order_ids.filtered(lambda s: s.state == 'sale').sorted('date_order')[:1] + if first_sale_order: + rec['x_first_sale_date'] = first_sale_order.date_order + else: + rec['x_first_sale_date'] = False + + + + + +``` +Source: [snippets/ir_model.res_partner.x_first_sale_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_first_sale_date.xml) + ### X Global Location Number ID: `mint_system.ir_model.res_partner.x_global_location_number` ```xml diff --git a/snippets/web.md b/snippets/web.md index 51007d06..c6414ed4 100644 --- a/snippets/web.md +++ b/snippets/web.md @@ -546,6 +546,21 @@ ID: `mint_system.web.external_layout_standard.set_header_footer_font_size` ``` Source: [snippets/web.external_layout_standard.set_header_footer_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.set_header_footer_font_size.xml) +### Show Sale Order In Footer +ID: `mint_system.web.external_layout_standard.show_sale_order_in_footer` +```xml + + + + + + + + + +``` +Source: [snippets/web.external_layout_standard.show_sale_order_in_footer.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.show_sale_order_in_footer.xml) + ### Tissa Layout ID: `mint_system.web.external_layout_standard.tissa_layout` ```xml From 908ada16533c429a33fe732c411a64534e937b86 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 8 Sep 2023 10:50:54 +0200 Subject: [PATCH 083/147] ref --- addons/sale_workflow | 2 +- addons/vertical_job_portal | 2 +- addons/website | 2 +- enterprise | 2 +- oca/account-invoicing | 2 +- oca/account-reconcile | 2 +- oca/crm | 2 +- oca/hr | 2 +- oca/knowledge | 2 +- oca/management-system | 2 +- oca/manufacture | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/sale-reporting | 2 +- oca/sale-workflow | 2 +- oca/server-backend | 2 +- oca/server-env | 2 +- oca/stock-logistics-workflow | 2 +- oca/web | 2 +- odoo | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addons/sale_workflow b/addons/sale_workflow index 865d2321..956a0e20 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit 865d2321913549314b393af05a3c460267c3bcf1 +Subproject commit 956a0e20aaaccffdec03b18aecc27e4ebcdf0457 diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 41425d7c..87a8c26c 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 41425d7cb28ff484961d88d1d789ccebe5dc0238 +Subproject commit 87a8c26ce44d716f40bd75f1701d3ea4e2a8217f diff --git a/addons/website b/addons/website index 721d02df..a5ed1be9 160000 --- a/addons/website +++ b/addons/website @@ -1 +1 @@ -Subproject commit 721d02dfaf2d75d31308ec64269417b7f050b062 +Subproject commit a5ed1be9f04d96d716af81f25064d0268af60b68 diff --git a/enterprise b/enterprise index 3205a82c..5e2f5097 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 3205a82c4616b969b87aa2f6d05a2da636688037 +Subproject commit 5e2f5097dd82fa17a59baaf5d3acc739eefde9d8 diff --git a/oca/account-invoicing b/oca/account-invoicing index d746595a..b1d6f942 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit d746595a2fef5b5abcca57e59bbbe5229a9494ee +Subproject commit b1d6f942a3ee489382b7d4e868985ea8c6c1c8ce diff --git a/oca/account-reconcile b/oca/account-reconcile index 99fb0b5f..b10603a4 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit 99fb0b5fc5dea09c9e6f0a0409e6d6b4152a3fab +Subproject commit b10603a4718ef59152abe20c6a37c6cb93f8a813 diff --git a/oca/crm b/oca/crm index 59bacf6d..d73aa51f 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit 59bacf6df0953259f1848d1ba18121926c5b4d58 +Subproject commit d73aa51f1ab1832b82ccc929b1f353eb28f6a55b diff --git a/oca/hr b/oca/hr index 661e9d0e..5d4b1e61 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit 661e9d0e9e97dec39f5d2f1b8d0a9fa3527ad2b8 +Subproject commit 5d4b1e619767ba18eabd0e86d36f00afb16f0c88 diff --git a/oca/knowledge b/oca/knowledge index ade77606..017a752b 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit ade776069725025803af0a9959211fdf32789419 +Subproject commit 017a752b335df4137c1ca9340acbe629416b549f diff --git a/oca/management-system b/oca/management-system index 7cbd7992..3a3bc329 160000 --- a/oca/management-system +++ b/oca/management-system @@ -1 +1 @@ -Subproject commit 7cbd7992acd752c6ee04ab42c69f57981469684a +Subproject commit 3a3bc3297ea0da7a32eff08738a1cfac00891a59 diff --git a/oca/manufacture b/oca/manufacture index 72ae6be1..5bb6f880 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 72ae6be1c11bfb758712b9fed66316de356065da +Subproject commit 5bb6f8802ff2c8b0b0656f4820bcd60083813d59 diff --git a/oca/project b/oca/project index 79a90b78..dc626afe 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 79a90b78b5aa4b88af7cf59d1650dde7a5619ebd +Subproject commit dc626afe48585b66efa77360bcd951997ce6bd7e diff --git a/oca/purchase-workflow b/oca/purchase-workflow index 45813308..daecd9fa 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit 45813308202b3b801b9406deab6e608ac807e6fc +Subproject commit daecd9fa9bb4662964f3c9e2a96ad32c4d3ac6d9 diff --git a/oca/reporting-engine b/oca/reporting-engine index 9156125c..f5c04ca1 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 9156125caff42653daa230bcb342ce0187e0c77c +Subproject commit f5c04ca190fa842497b7351f7f965725d9881ec6 diff --git a/oca/sale-reporting b/oca/sale-reporting index 977620b7..483c65f9 160000 --- a/oca/sale-reporting +++ b/oca/sale-reporting @@ -1 +1 @@ -Subproject commit 977620b78ce8e035f3b5c98b380e730b5b3a08c6 +Subproject commit 483c65f9a12ad55cd2d4e294e483ab3dad75c2b7 diff --git a/oca/sale-workflow b/oca/sale-workflow index f47fd5e1..77b61286 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit f47fd5e12034c9cf3d0b33f87fb035e228a91f63 +Subproject commit 77b61286755378d6d5ba1a01628cab1eee0ed222 diff --git a/oca/server-backend b/oca/server-backend index 74847067..17b2f088 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 74847067820ae3a423c58f776d908c9b8053e2f3 +Subproject commit 17b2f0887d83f67a1f0f9cdb294349ea92923962 diff --git a/oca/server-env b/oca/server-env index 8d0a929a..e282465e 160000 --- a/oca/server-env +++ b/oca/server-env @@ -1 +1 @@ -Subproject commit 8d0a929a81de1c0c3884f88546d0a1a45517a9bf +Subproject commit e282465e80bba48da57f182151aa9dd373e2bfb6 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index a0c4b703..bccdefab 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit a0c4b703910057d03b95ed05d9e5238f4e602fd6 +Subproject commit bccdefabe5c5242d550bc40d97762a87665f52b9 diff --git a/oca/web b/oca/web index afdcf39e..cfbe6402 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit afdcf39e3a9e722c9030d29f26cbab77bc637298 +Subproject commit cfbe64025708517a85aa3d4cd84d59022ac419c7 diff --git a/odoo b/odoo index d67aa6a7..47cdc122 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit d67aa6a798d9f7359549bbf56ec6fa2913f930ec +Subproject commit 47cdc122ab938cd48cf78d7faf9bc631cf962423 From eec844a64759656558a2be93cb9ea4084dd38808 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 8 Sep 2023 14:23:37 +0200 Subject: [PATCH 084/147] ref --- addons/vertical_saas | 2 +- enterprise | 2 +- oca/sale-workflow | 2 +- odoo | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index c828f529..2a5b1478 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit c828f529bb65aedc5fcce25c2c58141a45b151ab +Subproject commit 2a5b1478fc38b2b1f6c4e21bf5e6e6aa07b80024 diff --git a/enterprise b/enterprise index 5e2f5097..1a9b3612 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 5e2f5097dd82fa17a59baaf5d3acc739eefde9d8 +Subproject commit 1a9b3612ffdb85c890834fea9aae6d4aeda298ad diff --git a/oca/sale-workflow b/oca/sale-workflow index 77b61286..d818e1bf 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 77b61286755378d6d5ba1a01628cab1eee0ed222 +Subproject commit d818e1bf61b89e5595b59cdfd222c8393d8faff7 diff --git a/odoo b/odoo index 47cdc122..4d2bc125 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 47cdc122ab938cd48cf78d7faf9bc631cf962423 +Subproject commit 4d2bc125ebd0435b816aaccf57e167c185d3c564 From 3a2ff3f80c392423bacf0f9557ef6af473f595fa Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 11 Sep 2023 15:57:23 +0200 Subject: [PATCH 085/147] snippets --- ...notification_paynow.remove_access_link.xml | 2 +- snippets/mail.md | 2 +- ....layout.remove_brand_promotion_message.xml | 6 ++++ snippets/survey.layout.set_head_title.xml | 10 +++++++ snippets/survey.md | 30 +++++++++++++++++++ 5 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 snippets/survey.layout.remove_brand_promotion_message.xml create mode 100644 snippets/survey.layout.set_head_title.xml diff --git a/snippets/mail.mail_notification_paynow.remove_access_link.xml b/snippets/mail.mail_notification_paynow.remove_access_link.xml index bdba0679..6785615d 100644 --- a/snippets/mail.mail_notification_paynow.remove_access_link.xml +++ b/snippets/mail.mail_notification_paynow.remove_access_link.xml @@ -1,6 +1,6 @@ - + diff --git a/snippets/mail.md b/snippets/mail.md index 446681c9..9bc12080 100644 --- a/snippets/mail.md +++ b/snippets/mail.md @@ -317,7 +317,7 @@ ID: `mint_system.mail.mail_notification_paynow.remove_access_link` - + diff --git a/snippets/survey.layout.remove_brand_promotion_message.xml b/snippets/survey.layout.remove_brand_promotion_message.xml new file mode 100644 index 00000000..a9c44dc3 --- /dev/null +++ b/snippets/survey.layout.remove_brand_promotion_message.xml @@ -0,0 +1,6 @@ + + + +

          + + diff --git a/snippets/survey.layout.set_head_title.xml b/snippets/survey.layout.set_head_title.xml new file mode 100644 index 00000000..317f33f2 --- /dev/null +++ b/snippets/survey.layout.set_head_title.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/snippets/survey.md b/snippets/survey.md index 446faf14..252c0a31 100644 --- a/snippets/survey.md +++ b/snippets/survey.md @@ -1,4 +1,34 @@ # Survey +## Layout +### Remove Brand Promotion Message +ID: `mint_system.survey.layout.remove_brand_promotion_message` +```xml + + + +
          + + + +``` +Source: [snippets/survey.layout.remove_brand_promotion_message.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/survey.layout.remove_brand_promotion_message.xml) + +### Set Head Title +ID: `mint_system.survey.layout.set_head_title` +```xml + + + + + + + + + + +``` +Source: [snippets/survey.layout.set_head_title.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/survey.layout.set_head_title.xml) + ## Survey Question Form ### Add Button Start Survey ID: `mint_system.survey.survey_question_form.add_button_start_survey` From c60b15999757762c8157fa3b41fa8f934079e745 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 12 Sep 2023 11:37:33 +0200 Subject: [PATCH 086/147] ref --- addons/vertical_saas | 2 +- enterprise | 2 +- oca/account-invoicing | 2 +- oca/account-reconcile | 2 +- oca/crm | 2 +- oca/management-system | 2 +- oca/manufacture | 2 +- oca/sale-reporting | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-backend | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/web | 2 +- odoo | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 2a5b1478..87be1abf 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 2a5b1478fc38b2b1f6c4e21bf5e6e6aa07b80024 +Subproject commit 87be1abfdb76e1180c5a25177ddd73e27b577c21 diff --git a/enterprise b/enterprise index 1a9b3612..bac6b934 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 1a9b3612ffdb85c890834fea9aae6d4aeda298ad +Subproject commit bac6b934480161c7b8eb957dbd249b7b69498152 diff --git a/oca/account-invoicing b/oca/account-invoicing index b1d6f942..135346cb 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit b1d6f942a3ee489382b7d4e868985ea8c6c1c8ce +Subproject commit 135346cb372986ffc17dbe38be618356e6fbc056 diff --git a/oca/account-reconcile b/oca/account-reconcile index b10603a4..3a9857c2 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit b10603a4718ef59152abe20c6a37c6cb93f8a813 +Subproject commit 3a9857c27f1ed181060d0dc8f3c48a10dc9013b8 diff --git a/oca/crm b/oca/crm index d73aa51f..4621eb5f 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit d73aa51f1ab1832b82ccc929b1f353eb28f6a55b +Subproject commit 4621eb5f4eefdaef8d2ea1caa3d68f3bace21731 diff --git a/oca/management-system b/oca/management-system index 3a3bc329..446f46ee 160000 --- a/oca/management-system +++ b/oca/management-system @@ -1 +1 @@ -Subproject commit 3a3bc3297ea0da7a32eff08738a1cfac00891a59 +Subproject commit 446f46ee62e9805fa970826689dafaa1da7f4efb diff --git a/oca/manufacture b/oca/manufacture index 5bb6f880..f0bd2a96 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 5bb6f8802ff2c8b0b0656f4820bcd60083813d59 +Subproject commit f0bd2a961fda4c8c5b6bf74e5a953c6e46bac924 diff --git a/oca/sale-reporting b/oca/sale-reporting index 483c65f9..a06a5037 160000 --- a/oca/sale-reporting +++ b/oca/sale-reporting @@ -1 +1 @@ -Subproject commit 483c65f9a12ad55cd2d4e294e483ab3dad75c2b7 +Subproject commit a06a50371b0398dd7c27c69dfa5bc6aaa0c417e8 diff --git a/oca/sale-workflow b/oca/sale-workflow index d818e1bf..12be71f2 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit d818e1bf61b89e5595b59cdfd222c8393d8faff7 +Subproject commit 12be71f2fbbfdb3ee775bf7e1cb630b9a2857f17 diff --git a/oca/server-auth b/oca/server-auth index 395b2e02..864231b4 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit 395b2e02e8c5df1a604082737f0a2bf1cefc1469 +Subproject commit 864231b4693b485fdc272b418aaa64de710dd5bf diff --git a/oca/server-backend b/oca/server-backend index 17b2f088..03f58de1 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 17b2f0887d83f67a1f0f9cdb294349ea92923962 +Subproject commit 03f58de1f70ff2813064e21ab4600667710c889f diff --git a/oca/server-tools b/oca/server-tools index 149de2ed..481129d4 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 149de2ed96429655d35154f85da47c056d523f6d +Subproject commit 481129d46cabaeb75c7347b69ddcb95d20aab652 diff --git a/oca/server-ux b/oca/server-ux index 8398f324..f92f8444 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit 8398f324cb12bf7594dd02924936503bd8765abc +Subproject commit f92f844405db63d25d15038b2e746abb7a4425b1 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index a879147e..76138196 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit a879147e6e38e8fd059d58f04803f676cd7173c7 +Subproject commit 7613819641e4b9b97501193e22c0395c6203e5a6 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index bccdefab..ae73a0dd 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit bccdefabe5c5242d550bc40d97762a87665f52b9 +Subproject commit ae73a0dd5a670111ee8f63ae7e8d793a04f75c15 diff --git a/oca/web b/oca/web index cfbe6402..416eab93 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit cfbe64025708517a85aa3d4cd84d59022ac419c7 +Subproject commit 416eab933cd5cc5361ed38e17ead39552112b20c diff --git a/odoo b/odoo index 4d2bc125..a7935669 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 4d2bc125ebd0435b816aaccf57e167c185d3c564 +Subproject commit a79356697935ccf62815125b337c7fe3beb4a397 From 812a8e08d211f484a6fb18f1d6c5cf38ff9bf988 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 12 Sep 2023 14:53:01 +0200 Subject: [PATCH 087/147] lint with spellcheck --- task | 439 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 219 insertions(+), 220 deletions(-) diff --git a/task b/task index 9b733ba3..0fadc8dc 100755 --- a/task +++ b/task @@ -1,5 +1,5 @@ #!/bin/bash -cd "$(dirname "$0")" +cd "$(dirname "$0")" || exit function help() { echo @@ -13,25 +13,24 @@ echo # Set env vars PATH="$PATH:./odoo" -GIT_TAG=0 GIT_BRANCH=$(git symbolic-ref --short -q HEAD) -OS_RELEASE=$(awk -F= '/^NAME/{print $2}' /etc/os-release) +OS_RELEASE=$(awk -F= '/^NAME/{print "$2"}' /etc/os-release) export POSTGRES_USER=odoo export POSTGRES_PASSWORD=odoo -export ODOO_REVISION=$GIT_BRANCH +export ODOO_REVISION="$GIT_BRANCH" export ODOO_LANGUAGE=de_CH export ODOO_DEVELOPMENT_CONFIG_DIR="$HOME/.config/odoo-build" export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 if [[ -a ".env" ]]; then - export $(cat .env | sed 's/#.*//g' | xargs) + source .env fi function set-addons-path() { # Read addons path list - ADDONS_PATH="$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ',' | sed 's/,*$//g')" + ADDONS_PATH="$(git config --file .gitmodules --get-regexp path | awk '{ print "$2" }' | tr '\n' ',' | sed 's/,*$//g')" # Append env var ADDONS_PATH="${ADDONS_PATH}${ODOO_ADDONS_PATH}" @@ -62,12 +61,12 @@ function update-readme() { # Find marker in readme and clear content after echo "Clear modules table for $1." MARKER="## Available modules" - sed -i "/$MARKER/Q" $1 + sed -i "/$MARKER/Q" "$1" - echo "$MARKER" >> $1 - echo "" >> $1 - echo "| Module | Summary |" >> $1 - echo "| --- | --- |" >> $1 + echo "$MARKER" >> "$1" + echo "" >> "$1" + echo "| Module | Summary |" >> "$1" + echo "| --- | --- |" >> "$1" # Clear table after a marker for MANIFEST_FILE in $MANIFEST_FILES; do @@ -75,7 +74,7 @@ function update-readme() { MODULE_NAME=$(basename "$MODULE_DIR") echo "Add summary of $MODULE_NAME to readme file." SUMMARY=$(grep 'summary' "$MANIFEST_FILE" -A 1 | tail -1) - echo "| [$MODULE_NAME]($MODULE_NAME) | $SUMMARY |" >> $1 + echo "| [$MODULE_NAME]($MODULE_NAME) | $SUMMARY |" >> "$1" done } @@ -100,7 +99,7 @@ function get-module-version() { VERSION="$GIT_BRANCH.$VERSION" fi - echo $VERSION + echo "$VERSION" fi } @@ -137,12 +136,12 @@ function install-native() { init-venv activate-venv - if [[ "Ubuntu|Debian" =~ "$OS_RELEASE" ]]; then + if [[ "Ubuntu|Debian" =~ $OS_RELEASE ]]; then # Source: https://gist.github.com/faniska/37f896d5e9de5fee925925d7caf3cb9e echo "Install wkhtmltopdf" sudo apt remove wkhtmltopdf - cd ~ + cd ~ || exit wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz tar xvf wkhtmltox*.tar.xz sudo mv wkhtmltox/bin/wkhtmlto* /usr/bin @@ -169,7 +168,7 @@ function install-native() { pip install graphene graphql-server-core echo "Install rest dependencies" - pip install cerberus pyquerystring parse-accept-language apispec>=4.0.0 marshmallow marshmallow-objects>=2.0.0 jsondiff + pip install cerberus pyquerystring parse-accept-language apispec\>=4.0.0 marshmallow marshmallow-objects\>=2.0.0 jsondiff echo "Install openupgrade functions" pip install git+https://github.com/OCA/openupgradelib.git@master#egg=openupgradelib @@ -184,14 +183,14 @@ function install-native() { function open-url-with-delay(){ if test -z "$1"; then echo "\$1 is empty."; exit; fi sleep 2 - xdg-open $1 + xdg-open "$1" } function start() { set-addons-path # Use default database if second param is not given - DATABASE=$2 + DATABASE="$2" if test -z "$2"; then DATABASE="$GIT_BRANCH" fi @@ -220,9 +219,9 @@ function start() { if [[ "$1" =~ "native" ]]; then activate-venv echo "Open http://localhost:8069 url in your browser." - echo $ADDONS_PATH + echo "$ADDONS_PATH" open-url-with-delay "http://localhost:8069/web?db=$DATABASE" & - odoo-bin --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG + odoo-bin --config "config/odoo-native.conf" --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG fi if [[ "$1" =~ "mail" ]]; then @@ -248,8 +247,8 @@ function restart() { docker-compose restart fi - if [[ "db|mail|odoo" =~ "$1" ]]; then - docker-compose restart $1 + if [[ "db|mail|odoo" =~ $1 ]]; then + docker-compose restart "$1" fi } @@ -258,40 +257,40 @@ function stop() { docker-compose stop fi - docker-compose stop $1 + docker-compose stop "$1" } function start-shell() { - DATABASE=$1 + DATABASE="$1" DATABASE=${DATABASE:="$GIT_BRANCH"} activate-venv - odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --no-http + odoo-bin shell -d "$DATABASE" --config 'config/odoo-native.conf' --no-http } function start-psql() { - DATABASE=$1 + DATABASE="$1" DATABASE=${DATABASE:="$GIT_BRANCH"} - docker exec -it db psql postgres://odoo:odoo@localhost:5432/$DATABASE + docker exec -it db psql "postgres://odoo:odoo@localhost:5432/$DATABASE" } function init-db() { - DATABASE=$1 + DATABASE="$1" DATABASE=${DATABASE:="$GIT_BRANCH"} activate-venv set-addons-path echo "Make sure only one odoo process is running when initalizing the database." - odoo-bin --init base -d $DATABASE --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http --load-language $ODOO_LANGUAGE + odoo-bin --init base -d "$DATABASE" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http --load-language "$ODOO_LANGUAGE" } function odoo-cloc() { - DATABASE=$1 + DATABASE="$1" DATABASE=${DATABASE:="$GIT_BRANCH"} activate-venv - odoo-bin cloc -d $DATABASE --config 'config/odoo-native.conf' --stop-after-init --no-http + odoo-bin cloc -d "$DATABASE" --config 'config/odoo-native.conf' --stop-after-init --no-http } function lint-module() { @@ -299,11 +298,11 @@ function lint-module() { activate-venv echo "Set file and folder permissions on $1" - find $1 -type d -exec chmod u=rwx,go=rx {} \; - find $1 -type f -exec chmod u=rw,go=r {} \; + find "$1" -type d -exec chmod u=rwx,go=rx {} \; + find "$1" -type f -exec chmod u=rw,go=r {} \; echo "Run pre-commit in $1" - cd $1 + cd "$1" || exit pre-commit run --files ./* echo "Update index.html" @@ -316,33 +315,33 @@ function lint-module() { function update-module() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - DATABASE=$1 - MODULE_NAME=$(basename $2) + DATABASE="$1" + MODULE_NAME=$(basename "$2") # Use default database if second param is not given if test -z "$2"; then DATABASE="$GIT_BRANCH" - MODULE_NAME=$(basename $1) + MODULE_NAME=$(basename "$1") fi activate-venv set-addons-path echo "Updating module $MODULE_NAME on $DATABASE ..." - odoo-bin -d $DATABASE -u $MODULE_NAME --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http + odoo-bin -d "$DATABASE" -u "$MODULE_NAME" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http } function generate-module-translation() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - DATABASE=$1 - MODULE_PATH=$2 - MODULE_NAME=$(basename $2) - LANGUAGE=$3 + DATABASE="$1" + MODULE_PATH="$2" + MODULE_NAME=$(basename "$2") + LANGUAGE="$3" if test -z "$2"; then DATABASE="$GIT_BRANCH" - MODULE_PATH=$1 - MODULE_NAME=$(basename $1) + MODULE_PATH="$1" + MODULE_NAME=$(basename "$1") fi if test -z "$3"; then @@ -353,60 +352,60 @@ function generate-module-translation() { set-addons-path echo "Generate $LANGUAGE tranlsation file for $MODULE_NAME on $DATABASE ..." mkdir -p "$MODULE_PATH/i18n/" - odoo-bin -d $DATABASE --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --modules $MODULE_NAME -l $LANGUAGE --i18n-export "$MODULE_PATH/i18n/$LANGUAGE.po" + odoo-bin -d "$DATABASE" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --modules "$MODULE_NAME" -l "$LANGUAGE" --i18n-export "$MODULE_PATH/i18n/$LANGUAGE.po" } function install-module() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - DATABASE=$1 - MODULE_NAME=$(basename $2) + DATABASE="$1" + MODULE_NAME=$(basename "$2") # Use default database if second param is not given if test -z "$2"; then DATABASE="$GIT_BRANCH" - MODULE_NAME=$(basename $1) + MODULE_NAME=$(basename "$1") fi activate-venv set-addons-path echo "Installing module $MODULE_NAME on $DATABASE ..." - odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http + odoo-bin -d "$DATABASE" -i "$MODULE_NAME" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http } function test-module() { - DATABASE=$1 - MODULE_NAME=$(basename $2) + DATABASE="$1" + MODULE_NAME=$(basename "$2") # Use default database if second param is not given if test -z "$2"; then DATABASE="$GIT_BRANCH" - MODULE_NAME=$(basename $1) + MODULE_NAME=$(basename "$1") fi activate-venv set-addons-path echo "Testing module $MODULE_NAME on $DATABASE ..." - odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --test-tags /$MODULE_NAME + odoo-bin -d "$DATABASE" -i "$MODULE_NAME" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --test-tags /"$MODULE_NAME" } function remove-module() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - DATABASE=$1 - MODULE_NAME=$(basename $2) + DATABASE="$1" + MODULE_NAME=$(basename "$2") # Use default database if second param is not given if test -z "$2"; then DATABASE="$GIT_BRANCH" - MODULE_NAME=$(basename $1) + MODULE_NAME=$(basename "$1") fi activate-venv set-addons-path echo "Remove module $MODULE_NAME" echo "self.env['ir.module.module'].search([('name', '=', '$MODULE_NAME')]).button_immediate_uninstall()" | - odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --no-http + odoo-bin shell -d "$DATABASE" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --no-http } function create-module() { @@ -421,46 +420,46 @@ function create-module() { } function drop-db() { - DATABASE=$1 + DATABASE="$1" DATABASE=${DATABASE:="$GIT_BRANCH"} - docker exec db psql postgres://odoo:odoo@localhost:5432/postgres -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '$DATABASE';" - docker exec db psql postgres://odoo:odoo@localhost:5432/postgres -c "DROP DATABASE \"$DATABASE\";" + docker exec db psql "postgres://odoo:odoo@localhost:5432/postgres" -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '$DATABASE';" + docker exec db psql "postgres://odoo:odoo@localhost:5432/postgres" -c "DROP DATABASE \"$DATABASE\";" } function set-admin() { - DATABASE=$1 + DATABASE="$1" DATABASE=${DATABASE:="$GIT_BRANCH"} - docker exec db psql postgres://odoo:odoo@localhost:5432/$DATABASE -c "UPDATE res_users SET active=true,password='\$pbkdf2-sha512\$25000\$JuScEwIg5JzTGqNUivFeqw\$yWTOcix2Afr3XGP2NPY7w4w49e9vpsu14NRndDYXAkbtMF4zkrmx6inVsoLl0zZY30xI/0GzhwonWsK9TUmjWA' WHERE id=2;" - docker exec db psql postgres://odoo:odoo@localhost:5432/$DATABASE -c "SELECT login, password FROM res_users WHERE id=2;" + docker exec db psql "postgres://odoo:odoo@localhost:5432/$DATABASE" -c "UPDATE res_users SET active=true,password='\$pbkdf2-sha512\$25000\$JuScEwIg5JzTGqNUivFeqw\$yWTOcix2Afr3XGP2NPY7w4w49e9vpsu14NRndDYXAkbtMF4zkrmx6inVsoLl0zZY30xI/0GzhwonWsK9TUmjWA' WHERE id=2;" + docker exec db psql "postgres://odoo:odoo@localhost:5432/$DATABASE" -c "SELECT login, password FROM res_users WHERE id=2;" } function clear-assets() { - DATABASE=$1 + DATABASE="$1" DATABASE=${DATABASE:="$GIT_BRANCH"} echo "Delete these assets for $DATABASE:" - docker exec db psql postgres://odoo:odoo@localhost/$DATABASE -c "select id,name from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';" - docker exec db psql postgres://odoo:odoo@localhost/$DATABASE -c "delete from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';" + docker exec db psql "postgres://odoo:odoo@localhost/$DATABASE" -c "select id,name from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';" + docker exec db psql "postgres://odoo:odoo@localhost/$DATABASE" -c "delete from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';" } function reset-views() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - DATABASE=$1 - KEY=$(basename $2) + DATABASE="$1" + KEY=$(basename "$2") # Use default database if second param is not given if test -z "$2"; then DATABASE="$GIT_BRANCH" - KEY=$(basename $1) + KEY=$(basename "$1") fi activate-venv echo "Reset views for key $KEY" echo "self.env['ir.ui.view'].search([('key', 'ilike', '$KEY')]).reset_arch(mode='hard')" | - odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --no-http + odoo-bin shell -d "$DATABASE" --config 'config/odoo-native.conf' --no-http } function convert-database() { @@ -469,7 +468,7 @@ function convert-database() { unzip "tmp/$1.zip" -d "./tmp/$1" sed -i'' 's/AS integer//g' "./tmp/$1/dump.sql" grep -i 'as integer' "./tmp/$1/dump.sql" - cd "tmp/$1" ; zip -r "../${1}2.zip" . ; cd ../.. + cd "tmp/$1" || exit ; zip -r "../${1}2.zip" . ; cd ../.. || exit rm -r "tmp/$1" echo "Converted database file $1 to ${1}2" } @@ -478,7 +477,7 @@ function git-update-submodules() { echo "Update submodules." SUBMODULES=$(git config --file .gitmodules --get-regexp url | sed -e 's/submodule.//g' -e 's/.url.*//g') for SUBMODULE in $SUBMODULES; do - git submodule update --init $SUBMODULE + git submodule update --init "$SUBMODULE" done } @@ -489,10 +488,10 @@ function switch-branch() { SUBMODULES=$(git config --file .gitmodules --get-regexp url | sed -e 's/submodule.//g' -e 's/.url.*//g') for SUBMODULE in $SUBMODULES; do CWD=$(pwd) - cd $SUBMODULE + cd "$SUBMODULE" || exit git stash - git switch $1 - cd $CWD + git switch "$1" + cd "$CWD" || exit done } @@ -501,60 +500,60 @@ function checkout() { : ${GIT_BRANCH:="$2"} echo "Switch branch." - git switch $1 + git switch "$1" git-update-submodules - switch-branch $1 + switch-branch "$1" echo "Checkout config files." - git checkout $GIT_BRANCH -- config/checkout_files config/reset_files + git checkout "$GIT_BRANCH" -- "config/checkout_files config/reset_files" echo "Remove reset files." - git rm -r $(tr '\n' ' ' < ./config/reset_files) >/dev/null 2>&1 + git rm -r "$(tr '\n' ' ' < ./config/reset_files)" >/dev/null 2>&1 echo "Sync checkout files." - git checkout $GIT_BRANCH -- $(tr '\n' ' ' < ./config/checkout_files) + git checkout "$GIT_BRANCH" -- "$(tr '\n' ' ' < ./config/checkout_files)" } function checkout-revision() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - cd odoo - git checkout $1 - cd .. - cd enterprise - git checkout $1 - cd .. - cd themes - git checkout $1 + cd odoo || exit + git checkout "$1" + cd .. || exit + cd enterprise || exit + git checkout "$1" + cd .. || exit + cd themes || exit + git checkout "$1" } function git-pull-submodules() { # Pull submodule if update config is not set SUBMODULES=$(git config --file .gitmodules --get-regexp url | sed -e 's/submodule.//g' -e 's/.url.*//g') for SUBMODULE in $SUBMODULES; do - UPDATE=$(git config submodule.$SUBMODULE.update) + UPDATE=$(git config submodule."$SUBMODULE".update) CWD=$(pwd) - cd $SUBMODULE - if [ -z $UPDATE ]; then + cd "$SUBMODULE" || exit + if [ -z "$UPDATE" ]; then git pull fi; - cd $CWD + cd "$CWD" || exit done } function release-module() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - VERSION=$(get-module-version $1) - cd $1 + VERSION=$(get-module-version "$1") + cd "$1" || exit LAST_TAG=$(git describe --tags) - RELEASE_NOTES=$(git log $LAST_TAG..HEAD --oneline) + RELEASE_NOTES=$(git log "$LAST_TAG"..HEAD --oneline) echo "Tag with v$VERSION ..." - git tag -a v$VERSION -m "v$VERSION" + git tag -a "v$VERSION" -m "v$VERSION" echo "Release notes:" - echo $RELEASE_NOTES + echo "$RELEASE_NOTES" # echo "Create release $VERSION ..." # gh release create "v$VERSION" -t "Release $VERSION" @@ -564,7 +563,7 @@ function zip-module() { if test -z "$1"; then echo "\$1 is empty."; exit; fi # Get version and module name - VERSION=$(get-module-version $1) + VERSION=$(get-module-version "$1") MODULE=$(basename "$1") # Copy module to tmp folder @@ -581,24 +580,24 @@ function zip-module() { echo "Remove auto install option" sed -i'' -e "s/'auto_install': True,/'auto_install': False,/" "$MODULE_PATH/__manifest__.py" echo "Remove pycache and hidden folders" - find $MODULE_PATH | grep -E "(\.git|__pycache__|\.pyc|\.pyo$)" | xargs rm -rf + find "$MODULE_PATH" | grep -E "(\.git|__pycache__|\.pyc|\.pyo$)" | xargs rm -rf echo "Zip module $MODULE" - cd tmp - rm -f $MODULE_NAME.zip - zip -q -r $MODULE_NAME.zip $MODULE_NAME - cd .. + cd tmp || exit + rm -f "$MODULE_NAME".zip + zip -q -r "$MODULE_NAME".zip "$MODULE_NAME" + cd .. || exit } function clear-filestore() { echo "Remove directory ~/.local/share/Odoo/filestore/$1" - rm -rf ~/.local/share/Odoo/filestore/$1 + rm -rf ~/.local/share/Odoo/filestore/"$1" } function disable-mailserver() { if test -z "$1"; then echo "\$1 is empty."; exit; fi activate-venv - load-env $1 + load-env "$1" scripts/odooctl --model 'ir.mail_server' --field 'active' --value False scripts/odooctl --model 'fetchmail.server' --field 'active' --value False } @@ -607,7 +606,7 @@ function change-uuid() { if test -z "$1"; then echo "\$1 is empty."; exit; fi activate-venv - load-env $1 + load-env "$1" UUID=$(uuidgen) echo "Set uuid $UUID for $1." scripts/odooctl --model 'ir.config_parameter' --domain "['key', '=', 'database.uuid']" --field 'value' --value "'$UUID'" @@ -615,7 +614,7 @@ function change-uuid() { function test-jsonrpc() { activate-venv - [ -n "$1" ] && load-env $1 + [ -n "$1" ] && load-env "$1" scripts/jsonrpc } @@ -631,13 +630,13 @@ function update-snippet() { if test -z "$2"; then echo "\$2 is empty."; exit; fi # Generate view name from filename - FILE=$(basename $2) + FILE=$(basename "$2") NAME="mint_system.${FILE%.xml}" activate-venv - load-env $1 + load-env "$1" echo "Update view with name $NAME" - scripts/odooctl --model 'ir.ui.view' --domain "['name', '=', '$NAME']" --field 'arch_base' --value "'''$(cat $2)'''" + scripts/odooctl --model 'ir.ui.view' --domain "['name', '=', '$NAME']" --field 'arch_base' --value "'''$(cat "$2")'''" } function install-snippet() { @@ -645,20 +644,20 @@ function install-snippet() { if test -z "$2"; then echo "\$2 is empty."; exit; fi # Generate view name from filename - FILE=$(basename $2) + FILE=$(basename "$2") NAME="mint_system.${FILE%.xml}" - INHERIT_ID=$(echo 'cat //data/@inherit_id' | xmllint --shell $2 | awk -F'[="]' '!/>/{print $(NF-1)}') - TYPE=$(echo 'cat //data/@type' | xmllint --shell $2 | awk -F'[="]' '!/>/{print $(NF-1)}') - MODEL=$(echo 'cat //data/@model' | xmllint --shell $2 | awk -F'[="]' '!/>/{print $(NF-1)}') - PRIORITY=$(echo 'cat //data/@priority' | xmllint --shell $2 | awk -F'[="]' '!/>/{print $(NF-1)}') - MODULE_NAME=$(echo $INHERIT_ID | cut -d. -f 1 ) - XML_ID=$(echo $INHERIT_ID | cut -d. -f 2 ) + INHERIT_ID=$(echo 'cat //data/@inherit_id' | xmllint --shell "$2" | awk -F'[="]' '!/>/{print $(NF-1)}') + TYPE=$(echo 'cat //data/@type' | xmllint --shell "$2" | awk -F'[="]' '!/>/{print $(NF-1)}') + MODEL=$(echo 'cat //data/@model' | xmllint --shell "$2" | awk -F'[="]' '!/>/{print $(NF-1)}') + PRIORITY=$(echo 'cat //data/@priority' | xmllint --shell "$2" | awk -F'[="]' '!/>/{print $(NF-1)}') + MODULE_NAME=$(echo "$INHERIT_ID" | cut -d. -f 1 ) + XML_ID=$(echo "$INHERIT_ID" | cut -d. -f 2 ) # Set default values : ${TYPE:='qweb'} activate-venv - load-env $1 + load-env "$1" echo "Search for view with name $MODULE_NAME.$XML_ID" INHERIT_ID=$(scripts/odooctl --method 'get_id' --model 'ir.model.data' --value "['$MODULE_NAME','$XML_ID']") echo "Found view id $INHERIT_ID" @@ -670,7 +669,7 @@ function install-snippet() { 'mode': 'extension', 'priority': $PRIORITY, 'inherit_id': $INHERIT_ID, - 'arch_base': '''$(cat $2)''' + 'arch_base': '''$(cat "$2")''' }" } @@ -680,20 +679,20 @@ function lint-snippets() { for FILE in $FILES; do # Access various snippet parameters - FILENAME=$(basename $FILE) - SNIPPET_MODULE=$(echo $FILENAME | cut -d. -f1) - REPORT=$(echo $FILENAME | cut -d. -f2) - EDIT=$(echo $FILENAME | cut -d. -f3) - INHERIT_ID=$(echo 'cat //data/@inherit_id' | xmllint --shell $FILE | awk -F'[="]' '!/>/{print $(NF-1)}') - TYPE=$(echo 'cat //data/@type' | xmllint --shell $FILE | awk -F'[="]' '!/>/{print $(NF-1)}') - MODEL=$(echo 'cat //data/@model' | xmllint --shell $FILE | awk -F'[="]' '!/>/{print $(NF-1)}') - PRIORITY=$(echo 'cat //data/@priority' | xmllint --shell $FILE | awk -F'[="]' '!/>/{print $(NF-1)}') - MODULE_NAME=$(echo $INHERIT_ID | cut -d. -f 1 ) - XML_ID=$(echo $INHERIT_ID | cut -d. -f 2 ) + FILENAME=$(basename "$FILE") + SNIPPET_MODULE=$(echo "$FILENAME" | cut -d. -f1) + REPORT=$(echo "$FILENAME" | cut -d. -f2) + EDIT=$(echo "$FILENAME" | cut -d. -f3) + INHERIT_ID=$(echo 'cat //data/@inherit_id' | xmllint --shell "$FILE" | awk -F'[="]' '!/>/{print $(NF-1)}') + TYPE=$(echo 'cat //data/@type' | xmllint --shell "$FILE" | awk -F'[="]' '!/>/{print $(NF-1)}') + MODEL=$(echo 'cat //data/@model' | xmllint --shell "$FILE" | awk -F'[="]' '!/>/{print $(NF-1)}') + PRIORITY=$(echo 'cat //data/@priority' | xmllint --shell "$FILE" | awk -F'[="]' '!/>/{print $(NF-1)}') + MODULE_NAME=$(echo "$INHERIT_ID" | cut -d. -f 1 ) + XML_ID=$(echo "$INHERIT_ID" | cut -d. -f 2 ) # Check filename - COUNT_DOTS=$(echo $FILENAME | grep -o "\." | wc -l) - if [ $COUNT_DOTS -ge 4 ]; then + COUNT_DOTS=$(echo "$FILENAME" | grep -o "\." | wc -l) + if [ "$COUNT_DOTS" -ge 4 ]; then echo "Linting failed for $FILE" echo "Dots count: $COUNT_DOTS" echo " Filename: $SNIPPET_MODULE.$REPORT" @@ -724,7 +723,7 @@ function update-app-list() { if test -z "$1"; then echo "\$1 is empty."; exit; fi activate-venv - echo "env['ir.module.module'].update_list()" | odoo-bin shell -d $1 --config 'config/odoo-native.conf' --no-http + echo "env['ir.module.module'].update_list()" | odoo-bin shell -d "$1" --config 'config/odoo-native.conf' --no-http } function init-config-dir() { @@ -739,10 +738,10 @@ function init-odoo-env() { ENV_FILEPATH="$ODOO_DEVELOPMENT_CONFIG_DIR/.env.$1" echo "Init env file: $ENV_FILEPATH" - echo "#ODOO_URL=" > $ENV_FILEPATH - echo "ODOO_DATABASE=" >> $ENV_FILEPATH - echo "ODOO_USERNAME=" >> $ENV_FILEPATH - echo "ODOO_PASSWORD=" >> $ENV_FILEPATH + echo "#ODOO_URL=" > "$ENV_FILEPATH" + echo "ODOO_DATABASE=" >> "$ENV_FILEPATH" + echo "ODOO_USERNAME=" >> "$ENV_FILEPATH" + echo "ODOO_PASSWORD=" >> "$ENV_FILEPATH" } function init-next-env() { @@ -752,15 +751,15 @@ function init-next-env() { ENV_FILEPATH="$ODOO_DEVELOPMENT_CONFIG_DIR/.env.$1" echo "Init env file: $ENV_FILEPATH" - echo "NEXTCLOUD_URL=" > $ENV_FILEPATH - echo "NEXTCLOUD_USERNAME=" >> $ENV_FILEPATH - echo "NEXTCLOUD_PASSWORD=" >> $ENV_FILEPATH + echo "NEXTCLOUD_URL=" > "$ENV_FILEPATH" + echo "NEXTCLOUD_USERNAME=" >> "$ENV_FILEPATH" + echo "NEXTCLOUD_PASSWORD=" >> "$ENV_FILEPATH" } function edit-env() { if test -z "$1"; then echo "\$1 is empty."; exit; fi ENV_FILEPATH="$ODOO_DEVELOPMENT_CONFIG_DIR/.env.$1" - $EDITOR $ENV_FILEPATH + "$EDITOR" "$ENV_FILEPATH" } function upload-module() { @@ -768,7 +767,7 @@ function upload-module() { if test -z "$2"; then echo "\$2 is empty."; exit; fi # Check if path is root folder - MODULES=$2 + MODULES="$2" if [ ! -f "$2/__manifest__.py" ]; then echo "Identified as root folder" MODULES="$MODULES/*" @@ -779,11 +778,11 @@ function upload-module() { if [ -f "$MODULE/__manifest__.py" ]; then # Create module zip - zip-module $MODULE + zip-module "$MODULE" # Get path to zip file and upload url FILE_PATH="tmp/$MODULE_NAME.zip" - load-env $1 + load-env "$1" NEXTCLOUD_UPLOAD_URL="$NEXTCLOUD_URL/remote.php/dav/files/$NEXTCLOUD_USERNAME/Odoo-Apps/" # Upload zip file @@ -803,24 +802,24 @@ function save-config() { if test -z "$1"; then echo "\$1 is empty."; exit; fi activate-venv - odoo-bin -s -d $1 --config 'config/odoo-native.conf' --stop-after-init --no-http + odoo-bin -s -d "$1" --config 'config/odoo-native.conf' --stop-after-init --no-http } function remove-submodule() { if test -z "$1"; then echo "\$1 is empty."; exit; fi echo "Move submodule to tmp folder" - mkdir -p tmp/$1 - mv $1 tmp/$1 + mkdir -p tmp/"$1" + mv "$1" tmp/"$1" echo "Deinit submodule" - git submodule deinit -f $1 + git submodule deinit -f "$1" echo "Remove submodule from .git folder" - rm -rf .git/modules/$1 + rm -rf .git/modules/"$1" echo "Remove submodule from work tree" - git rm -f $1 + git rm -f "$1" echo "Remove $1 submodule from .gitmodules files manually." } @@ -846,11 +845,11 @@ function git-list-submodules() { function git-feature-branch(){ if test -z "$1"; then echo "\$1 is empty."; exit; fi - MODULE_NAME=$(basename $1) - MODULE_PATH=$(dirname $1) + MODULE_NAME=$(basename "$1") + MODULE_PATH=$(dirname "$1") echo "Create feature branch for $MODULE_NAME in $MODULE_PATH ..." - cd ./$MODULE_PATH + cd ./"$MODULE_PATH" || exit pwd git switch -c "feature-$MODULE_NAME" } @@ -858,11 +857,11 @@ function git-feature-branch(){ function git-mig-branch(){ if test -z "$1"; then echo "\$1 is empty."; exit; fi - MODULE_NAME=$(basename $1) - MODULE_PATH=$(dirname $1) + MODULE_NAME=$(basename "$1") + MODULE_PATH=$(dirname "$1") echo "Create mig branch for $MODULE_NAME in $MODULE_PATH ..." - cd ./$MODULE_PATH + cd ./"$MODULE_PATH" || exit pwd git switch -c "$GIT_BRANCH-mig-$MODULE_NAME" } @@ -870,17 +869,17 @@ function git-mig-branch(){ function patch-database() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - DATABASE=$1 - FILENAME=$2 + DATABASE="$1" + FILENAME="$2" # Use default database if second param is not given if test -z "$2"; then DATABASE="$GIT_BRANCH" - FILENAME=$1 + FILENAME="$1" fi echo "Apply patch $FILENAME to Database $DATABASE." - cat $FILENAME | docker exec -i db psql postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost/$DATABASE + cat "$FILENAME" | docker exec -i db psql "postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost/$DATABASE" echo "Patching database succeeded" } @@ -902,12 +901,12 @@ function update-docs() { for MODULE in $MODULES; do TITLE="${MODULE^}" # Uppercase first letter - TITLE=$(echo $TITLE | sed 's/_/ /g') # Replace underline with space - TITLE=$(echo $TITLE | sed -r 's/\<./\U&/g') # Uppercase first letter after space + TITLE=$(echo "$TITLE" | sed 's/_/ /g') # Replace underline with space + TITLE=$(echo "$TITLE" | sed -r 's/\<./\U&/g') # Uppercase first letter after space # Create doc file for each module DOCFILE="snippets/$MODULE.md" - echo -e "# $TITLE" > $DOCFILE + echo -e "# $TITLE" > "$DOCFILE" echo "## [$TITLE](snippets/$MODULE.md)" >> snippets.md SIDEBAR_ENTRIES+="'/snippets/$MODULE.md'," @@ -915,29 +914,29 @@ function update-docs() { XML_IDS=$(ls snippets/$MODULE.*.xml | xargs -n 1 basename | cut -d. -f2 | uniq) for XML_ID in $XML_IDS; do - XML_ID_TITLE=$(echo $XML_ID | sed 's/_/ /g') # Replace underline with space - XML_ID_TITLE=$(echo $XML_ID_TITLE | sed -r 's/\<./\U&/g') # Uppercase first letter after space + XML_ID_TITLE=$(echo "$XML_ID" | sed 's/_/ /g') # Replace underline with space + XML_ID_TITLE=$(echo "$XML_ID_TITLE" | sed -r 's/\<./\U&/g') # Uppercase first letter after space - echo "## $XML_ID_TITLE " >> $DOCFILE + echo "## $XML_ID_TITLE " >> "$DOCFILE" # Process each file FILES="snippets/$MODULE.$XML_ID.*.xml" for FILE in $FILES; do # Get snippet params - FILENAME=$(basename $FILE) - EDIT=$(echo $FILENAME | cut -d. -f3) + FILENAME=$(basename "$FILE") + EDIT=$(echo "$FILENAME" | cut -d. -f3) - EDIT_TITLE=$(echo $EDIT | sed 's/_/ /g') # Replace underline with space - EDIT_TITLE=$(echo $EDIT_TITLE | sed -r 's/\<./\U&/g') # Uppercase first letter after space + EDIT_TITLE=$(echo "$EDIT" | sed 's/_/ /g') # Replace underline with space + EDIT_TITLE=$(echo "$EDIT_TITLE" | sed -r 's/\<./\U&/g') # Uppercase first letter after space # Group by modules - echo "### $EDIT_TITLE " >> $DOCFILE - echo "ID: \`mint_system.$MODULE.$XML_ID.$EDIT\` " >> $DOCFILE - echo -e '```xml' >> $DOCFILE - cat "$FILE" >> $DOCFILE - echo -e '\n```' >> $DOCFILE - echo -e "Source: [$FILE]($PATH_URL/$FILE)\n" >> $DOCFILE + echo "### $EDIT_TITLE " >> "$DOCFILE" + echo "ID: \`mint_system.$MODULE.$XML_ID.$EDIT\` " >> "$DOCFILE" + echo -e '```xml' >> "$DOCFILE" + cat "$FILE" >> "$DOCFILE" + echo -e '\n```' >> "$DOCFILE" + echo -e "Source: [$FILE]($PATH_URL/$FILE)\n" >> "$DOCFILE" done done done @@ -953,13 +952,13 @@ case "$1" in disable-auto-install ;; save-config) - save-config $2 + save-config "$2" ;; checkout) - checkout $2 $3 + checkout "$2" "$3" ;; checkout-revision) - checkout-revision $2 + checkout-revision "$2" ;; list) docker-compose config --services; echo "native" @@ -968,16 +967,16 @@ case "$1" in docker ps --format 'table {{.Names}}\t{{.Image}}\t{{(.Label "description")}}\t{{.Status}}' ;; start) - start $2 $3 + start "$2" "$3" ;; restart) - restart $2 + restart "$2" ;; stop) - stop $2 + stop "$2" ;; kill) - down $2 + down "$2" ;; logs) docker logs odoo -f @@ -992,91 +991,91 @@ case "$1" in install-native ;; init-db) - init-db $2 + init-db "$2" ;; start-shell) - start-shell $2 + start-shell "$2" ;; start-psql) - start-psql $2 + start-psql "$2" ;; update-module) - update-module $2 $3 + update-module "$2" "$3" ;; test-module) - test-module $2 $3 + test-module "$2" "$3" ;; create-module) - create-module $2 + create-module "$2" ;; drop-db) - drop-db $2 + drop-db "$2" ;; send-support-mail) send-support-mail ;; clear-assets) - clear-assets $2 + clear-assets "$2" ;; generate-admin-passwd) - generate-admin-passwd $2 + generate-admin-passwd "$2" ;; odoo-cloc) - odoo-cloc $2 + odoo-cloc "$2" ;; restore-database) - restore-database $2 $3 + restore-database "$2" "$3" ;; convert-database) - convert-database $2 + convert-database "$2" ;; install-module) - install-module $2 $3 + install-module "$2" "$3" ;; remove-module) - remove-module $2 $3 + remove-module "$2" "$3" ;; remove-submodule) - remove-submodule $2 + remove-submodule "$2" ;; git-update-submodules) git-update-submodules ;; release-module) - release-module $2 + release-module "$2" ;; lint-module) - lint-module $2 + lint-module "$2" ;; update-readme) - update-readme $2 + update-readme "$2" ;; zip-module) - zip-module $2 + zip-module "$2" ;; clear-filestore) - clear-filestore $2 + clear-filestore "$2" ;; init-odoo-env) - init-odoo-env $2 + init-odoo-env "$2" ;; list-odoo-env) ls -f "$ODOO_DEVELOPMENT_CONFIG_DIR" ;; edit-env) - edit-env $2 + edit-env "$2" ;; disable-mailserver) - disable-mailserver $2 + disable-mailserver "$2" ;; change-uuid) - change-uuid $2 + change-uuid "$2" ;; set-admin) - set-admin $2 + set-admin "$2" ;; switch-branch) - switch-branch $2 + switch-branch "$2" ;; update-config) update-config @@ -1085,40 +1084,40 @@ case "$1" in git-list-submodules ;; get-module-version) - get-module-version $2 + get-module-version "$2" ;; git-feature-branch) - git-feature-branch $2 + git-feature-branch "$2" ;; git-mig-branch) - git-mig-branch $2 + git-mig-branch "$2" ;; update-snippet) - update-snippet $2 $3 + update-snippet "$2" "$3" ;; test-jsonrpc) - test-jsonrpc $2 + test-jsonrpc "$2" ;; install-snippet) - install-snippet $2 $3 + install-snippet "$2" "$3" ;; lint-snippets) lint-snippets ;; update-app-list) - update-app-list $2 + update-app-list "$2" ;; init-next-env) - init-next-env $2 + init-next-env "$2" ;; upload-module) - upload-module $2 $3 + upload-module "$2" "$3" ;; generate-module-translation) - generate-module-translation $2 $3 $4 + generate-module-translation "$2" "$3" "$4" ;; patch-database) - patch-database $2 $3 + patch-database "$2" "$3" ;; git-pull-submodules) git-pull-submodules @@ -1130,7 +1129,7 @@ case "$1" in activate-venv ;; reset-views) - reset-views $2 $3 + reset-views "$2" "$3" ;; *) help task From 2b134c4ead4cf2bf91446e7535466b0cbec2cfe0 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 12 Sep 2023 16:59:08 +0200 Subject: [PATCH 088/147] reset shellceck changes --- task | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/task b/task index 0fadc8dc..aa9c8cb6 100755 --- a/task +++ b/task @@ -25,12 +25,12 @@ export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 if [[ -a ".env" ]]; then - source .env + export $(cat .env | sed 's/#.*//g' | xargs) fi function set-addons-path() { # Read addons path list - ADDONS_PATH="$(git config --file .gitmodules --get-regexp path | awk '{ print "$2" }' | tr '\n' ',' | sed 's/,*$//g')" + ADDONS_PATH="$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ',' | sed 's/,*$//g')" # Append env var ADDONS_PATH="${ADDONS_PATH}${ODOO_ADDONS_PATH}" @@ -44,10 +44,12 @@ function set-addons-path() { done # Convert to docker paths - DOCKER_ADDONS_PATH="$(echo "$ADDONS_PATH" | sed 's|,|,/mnt/|g' | sed 's|,/mnt/odoo||g')" + DOCKER_ADDONS_PATH="$(echo $ADDONS_PATH | sed 's|,|,/mnt/|g' | sed 's|,/mnt/odoo||g')" # Replace odoo path - ADDONS_PATH="$(echo "$ADDONS_PATH" | sed 's|,odoo,|,odoo/addons,|g')" + ADDONS_PATH="$(echo $ADDONS_PATH | sed 's|,odoo,|,odoo/addons,|g')" + + echo $ADDONS_PATH } function update-readme() { From 9403a3bfd992cb2f2dc420cbdba096430b86d788 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 12 Sep 2023 19:51:49 +0200 Subject: [PATCH 089/147] update task --- task | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/task b/task index aa9c8cb6..ef6f8789 100755 --- a/task +++ b/task @@ -127,7 +127,7 @@ function load-env() { function disable-auto-install() { echo "Disable auto install for all enterprise modules." - find ./enterprise -type f -name '__manifest__.py' -exec sed -i'' $'s/\'auto_install\': True,/\'auto_install\': False,/g' {} + + find . -type f -name '__manifest__.py' -exec sed -i'' $'s/\'auto_install\': True,/\'auto_install\': False,/g' {} + } function install-odoo-scripts() { @@ -284,7 +284,7 @@ function init-db() { activate-venv set-addons-path echo "Make sure only one odoo process is running when initalizing the database." - odoo-bin --init base -d "$DATABASE" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http --load-language "$ODOO_LANGUAGE" + odoo-bin -d "$DATABASE" -i base --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http --load-language "$ODOO_LANGUAGE" } function odoo-cloc() { From eb76d14381ef2469d0ca4336f5e7d382cf29c8d6 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 13 Sep 2023 07:54:34 +0200 Subject: [PATCH 090/147] do not output addons_path --- task | 3 --- 1 file changed, 3 deletions(-) diff --git a/task b/task index ef6f8789..a8de9b7c 100755 --- a/task +++ b/task @@ -48,8 +48,6 @@ function set-addons-path() { # Replace odoo path ADDONS_PATH="$(echo $ADDONS_PATH | sed 's|,odoo,|,odoo/addons,|g')" - - echo $ADDONS_PATH } function update-readme() { @@ -221,7 +219,6 @@ function start() { if [[ "$1" =~ "native" ]]; then activate-venv echo "Open http://localhost:8069 url in your browser." - echo "$ADDONS_PATH" open-url-with-delay "http://localhost:8069/web?db=$DATABASE" & odoo-bin --config "config/odoo-native.conf" --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG fi From f34932656dd50b38027fa096a2258d3f763d6f55 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 15 Sep 2023 08:25:05 +0200 Subject: [PATCH 091/147] ref --- addons/vertical_saas | 2 +- oca/credit-control | 2 +- odoo | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 87be1abf..8713fd3f 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 87be1abfdb76e1180c5a25177ddd73e27b577c21 +Subproject commit 8713fd3ffc96150f423551a06c5d8c187771b792 diff --git a/oca/credit-control b/oca/credit-control index 41afbc7f..be53b9db 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 41afbc7f0029daa4a4e2afeddbb05b16002b7498 +Subproject commit be53b9dbd2b11e1f3471848cb3053ee643b9df59 diff --git a/odoo b/odoo index a7935669..b45f75a3 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit a79356697935ccf62815125b337c7fe3beb4a397 +Subproject commit b45f75a3b66203f3a65bac0b53f49364d4347c80 From ce3b19b8883960dde45e4ec9ce5f8d7ec7da2fb6 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 15 Sep 2023 11:17:19 +0200 Subject: [PATCH 092/147] sync --- task | 36 +++++++++++++++++++++++++++++------- task.md | 1 + 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/task b/task index a8de9b7c..34dc613d 100755 --- a/task +++ b/task @@ -35,6 +35,11 @@ function set-addons-path() { # Append env var ADDONS_PATH="${ADDONS_PATH}${ODOO_ADDONS_PATH}" + EXCLUDES="addons/theme_mint_system addons/company addons/web" + for EXCLUDE in $EXCLUDES; do + ADDONS_PATH=$(echo "$ADDONS_PATH" | sed "s|${EXCLUDE},||g") + done + # Check if dir exists for ADDON in $ADDONS_PATH; do if [ -d "$ADDON" ]; then @@ -354,6 +359,12 @@ function generate-module-translation() { odoo-bin -d "$DATABASE" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --modules "$MODULE_NAME" -l "$LANGUAGE" --i18n-export "$MODULE_PATH/i18n/$LANGUAGE.po" } +function list-addons() { + activate-venv + set-addons-path + echo "$ADDONS_PATH" +} + function install-module() { if test -z "$1"; then echo "\$1 is empty."; exit; fi @@ -494,9 +505,22 @@ function switch-branch() { done } +function checkout-config-files() { + echo "Checkout config files." + git checkout "$GIT_BRANCH" config/checkout_files config/reset_files + + echo "Remove reset files." + git rm -r "$(tr '\n' ' ' < ./config/reset_files)" >/dev/null 2>&1 + + echo "Sync checkout files." + git checkout "$GIT_BRANCH" $(tr '\n' ' ' < ./config/checkout_files) +} + function checkout() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - : ${GIT_BRANCH:="$2"} + if test -z "$2"; then + GIT_BRANCH="$2" + fi echo "Switch branch." git switch "$1" @@ -505,12 +529,7 @@ function checkout() { switch-branch "$1" - echo "Checkout config files." - git checkout "$GIT_BRANCH" -- "config/checkout_files config/reset_files" - echo "Remove reset files." - git rm -r "$(tr '\n' ' ' < ./config/reset_files)" >/dev/null 2>&1 - echo "Sync checkout files." - git checkout "$GIT_BRANCH" -- "$(tr '\n' ' ' < ./config/checkout_files)" + checkout-config-files } function checkout-revision() { @@ -1061,6 +1080,9 @@ case "$1" in list-odoo-env) ls -f "$ODOO_DEVELOPMENT_CONFIG_DIR" ;; + list-addons) + list-addons + ;; edit-env) edit-env "$2" ;; diff --git a/task.md b/task.md index 575e3014..8143d8c3 100644 --- a/task.md +++ b/task.md @@ -34,6 +34,7 @@ | lint-snippets | | Run checks for all snippets. | | list | | List docker services. | | list-odoo-env | | List odoo env files. | +| list-addons | | List odoo addons. | | logs | | Tail Odoo Docker container logs. | | odoo-cloc | [db] | Count custom line of codes. Default is branch name. | | patch-database | [db][path] | Apply sql file to database. Default database is branch name. | From 702e21f469319f5d867d18105bd91aa8981ea935 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 15 Sep 2023 11:20:33 +0200 Subject: [PATCH 093/147] update task --- task | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/task b/task index 34dc613d..46ee56fb 100755 --- a/task +++ b/task @@ -506,13 +506,13 @@ function switch-branch() { } function checkout-config-files() { - echo "Checkout config files." + echo "Checkout config files from $GIT_BRANCH branch." git checkout "$GIT_BRANCH" config/checkout_files config/reset_files echo "Remove reset files." git rm -r "$(tr '\n' ' ' < ./config/reset_files)" >/dev/null 2>&1 - echo "Sync checkout files." + echo "Sync checkout files from $GIT_BRANCH branch." git checkout "$GIT_BRANCH" $(tr '\n' ' ' < ./config/checkout_files) } From 6a07f32d5f9907d0329878b88ac3cb64315a94d8 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 15 Sep 2023 11:23:54 +0200 Subject: [PATCH 094/147] sync --- task | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/task b/task index 46ee56fb..9c9d5238 100755 --- a/task +++ b/task @@ -506,19 +506,19 @@ function switch-branch() { } function checkout-config-files() { - echo "Checkout config files from $GIT_BRANCH branch." + echo "Checkout config files." git checkout "$GIT_BRANCH" config/checkout_files config/reset_files echo "Remove reset files." git rm -r "$(tr '\n' ' ' < ./config/reset_files)" >/dev/null 2>&1 - echo "Sync checkout files from $GIT_BRANCH branch." + echo "Sync checkout files." git checkout "$GIT_BRANCH" $(tr '\n' ' ' < ./config/checkout_files) } function checkout() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - if test -z "$2"; then + if [ -n "$2"]; then GIT_BRANCH="$2" fi From 29e0ae76c95cb9059bab3676f3c1d06b12639843 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 15 Sep 2023 11:26:32 +0200 Subject: [PATCH 095/147] sync --- task | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/task b/task index 9c9d5238..534034f5 100755 --- a/task +++ b/task @@ -506,19 +506,19 @@ function switch-branch() { } function checkout-config-files() { - echo "Checkout config files." + echo "Checkout config files $GIT_BRANCH branch." git checkout "$GIT_BRANCH" config/checkout_files config/reset_files echo "Remove reset files." git rm -r "$(tr '\n' ' ' < ./config/reset_files)" >/dev/null 2>&1 - echo "Sync checkout files." + echo "Sync checkout files from $GIT_BRANCH branch." git checkout "$GIT_BRANCH" $(tr '\n' ' ' < ./config/checkout_files) } function checkout() { if test -z "$1"; then echo "\$1 is empty."; exit; fi - if [ -n "$2"]; then + if [[ -n "$2" ]]; then GIT_BRANCH="$2" fi From f51df78cc36a1a6d996ff939ff79c4ab0e8be835 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 18 Sep 2023 16:24:34 +0200 Subject: [PATCH 096/147] update task and ref --- .gitmodules | 4 ++++ addons/account_financial_reporting | 1 + task | 9 +++++---- task.md | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 160000 addons/account_financial_reporting diff --git a/.gitmodules b/.gitmodules index 9f83b3f1..0131c506 100644 --- a/.gitmodules +++ b/.gitmodules @@ -226,3 +226,7 @@ path = oca/account-reconcile url = git@github.com:OCA/account-reconcile.git branch = 16.0 +[submodule "addons/account_financial_reporting"] + path = addons/account_financial_reporting + url = git@github.com:Mint-System/Odoo-Apps-Account-Financial-Reporting.git + branch = 16.0 diff --git a/addons/account_financial_reporting b/addons/account_financial_reporting new file mode 160000 index 00000000..b6bbd473 --- /dev/null +++ b/addons/account_financial_reporting @@ -0,0 +1 @@ +Subproject commit b6bbd473e33ce34da6bdd468378ceb3271fd9d75 diff --git a/task b/task index 534034f5..68509a9f 100755 --- a/task +++ b/task @@ -491,12 +491,13 @@ function git-update-submodules() { done } -function switch-branch() { +function git-switch-branch() { if test -z "$1"; then echo "\$1 is empty."; exit; fi echo "Switch branch on submodules." SUBMODULES=$(git config --file .gitmodules --get-regexp url | sed -e 's/submodule.//g' -e 's/.url.*//g') for SUBMODULE in $SUBMODULES; do + echo "Switch branch to $1 in $SUBMODULE." CWD=$(pwd) cd "$SUBMODULE" || exit git stash @@ -527,7 +528,7 @@ function checkout() { git-update-submodules - switch-branch "$1" + git-switch-branch "$1" checkout-config-files } @@ -1095,8 +1096,8 @@ case "$1" in set-admin) set-admin "$2" ;; - switch-branch) - switch-branch "$2" + git-switch-branch) + git-switch-branch "$2" ;; update-config) update-config diff --git a/task.md b/task.md index 8143d8c3..4e6d6561 100644 --- a/task.md +++ b/task.md @@ -52,7 +52,7 @@ | start-psql | [db] | Start PSQL shell in Docker container. Default is branch name. | | start-shell | [db] | Start Odoo shell from source folder. Default is branch name. | | stop | [name] | Stop docker containers. | -| switch-branch | [branch] | Switch submodules to target branch. | +| git-switch-branch | [branch] | Switch submodules to target branch. | | test-jsonrpc | [env] | Test json rpc connection. | | test-module | [db][name,path] | Test target Odoo module. | | update-app-list | [db] | Update app list. | From a2dbaf4a82ba5c47de5b2f08b7148f840ca5aa13 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 18 Sep 2023 16:24:44 +0200 Subject: [PATCH 097/147] ref --- addons/account_financial_reporting | 2 +- enterprise | 2 +- oca/account-financial-tools | 2 +- oca/account-reconcile | 2 +- oca/credit-control | 2 +- oca/crm | 2 +- oca/dms | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/maintenance | 2 +- oca/management-system | 2 +- oca/manufacture | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/sale-workflow | 2 +- oca/server-ux | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/survey | 1 + oca/web | 2 +- odoo | 2 +- task | 2 +- 23 files changed, 23 insertions(+), 22 deletions(-) create mode 160000 oca/survey diff --git a/addons/account_financial_reporting b/addons/account_financial_reporting index b6bbd473..49fc21e6 160000 --- a/addons/account_financial_reporting +++ b/addons/account_financial_reporting @@ -1 +1 @@ -Subproject commit b6bbd473e33ce34da6bdd468378ceb3271fd9d75 +Subproject commit 49fc21e6b5cd85c899faec2382e392591f998bb6 diff --git a/enterprise b/enterprise index bac6b934..2cd9a6c0 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit bac6b934480161c7b8eb957dbd249b7b69498152 +Subproject commit 2cd9a6c0548c32a008a389f64e1e0a2153649199 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index 0c3f2b47..acdfb1c2 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit 0c3f2b47084f4780f06ebf8cc6adf80922f4f303 +Subproject commit acdfb1c26c5331e4cedb9399c43984214adef011 diff --git a/oca/account-reconcile b/oca/account-reconcile index 3a9857c2..28d46715 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit 3a9857c27f1ed181060d0dc8f3c48a10dc9013b8 +Subproject commit 28d467153ecb15960d329d7bf4d4bad39d0ec313 diff --git a/oca/credit-control b/oca/credit-control index be53b9db..f985a39e 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit be53b9dbd2b11e1f3471848cb3053ee643b9df59 +Subproject commit f985a39e2cdf87c49077abd1dc086ff1b813fa65 diff --git a/oca/crm b/oca/crm index 4621eb5f..6a9521e8 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit 4621eb5f4eefdaef8d2ea1caa3d68f3bace21731 +Subproject commit 6a9521e8bd890375db2533e6796c9078cd3ab18c diff --git a/oca/dms b/oca/dms index e4d60b2d..dc12b219 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit e4d60b2d3f0512b9b8477986bbea6cd778ee4154 +Subproject commit dc12b219e9f26151cc222fb9eb15d4121fa3a145 diff --git a/oca/hr-attendance b/oca/hr-attendance index 50ed427c..5a0dddbc 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 50ed427cf94e26c8cef249b1173138b530fe9ac1 +Subproject commit 5a0dddbc1ae8213958457cb0a0c3dd73474c24e5 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 2a5d0867..97f98d96 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 2a5d0867e11d47acde565347256bc26f76de61b6 +Subproject commit 97f98d96c7b2bf87dd5d9d4285ff59ec37fd9f07 diff --git a/oca/maintenance b/oca/maintenance index 49345ab8..9e247780 160000 --- a/oca/maintenance +++ b/oca/maintenance @@ -1 +1 @@ -Subproject commit 49345ab86240bb953a89c231c5da6e9b5a601a92 +Subproject commit 9e2477805e625b01e967a98d1a1fbe1d9c245034 diff --git a/oca/management-system b/oca/management-system index 446f46ee..bc5ab75e 160000 --- a/oca/management-system +++ b/oca/management-system @@ -1 +1 @@ -Subproject commit 446f46ee62e9805fa970826689dafaa1da7f4efb +Subproject commit bc5ab75e171671838190916b64aa1211f44dab26 diff --git a/oca/manufacture b/oca/manufacture index f0bd2a96..60854f22 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit f0bd2a961fda4c8c5b6bf74e5a953c6e46bac924 +Subproject commit 60854f22fc04430fe161d352d48d668a1711f1ca diff --git a/oca/product-attribute b/oca/product-attribute index df740828..f563a882 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit df7408282568fcb4720458014f78cb536d805175 +Subproject commit f563a882344c29dbb04ceb9ad1cb117c9d6fd099 diff --git a/oca/project b/oca/project index dc626afe..07ca0d2a 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit dc626afe48585b66efa77360bcd951997ce6bd7e +Subproject commit 07ca0d2a141cf7a215e85ddec7ff6de89e858158 diff --git a/oca/purchase-workflow b/oca/purchase-workflow index daecd9fa..f78b8fdd 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit daecd9fa9bb4662964f3c9e2a96ad32c4d3ac6d9 +Subproject commit f78b8fdd1da9de10d0e078219da6809937553086 diff --git a/oca/sale-workflow b/oca/sale-workflow index 12be71f2..6615746e 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 12be71f2fbbfdb3ee775bf7e1cb630b9a2857f17 +Subproject commit 6615746e08b80d0a42a859c7f569018521781716 diff --git a/oca/server-ux b/oca/server-ux index f92f8444..e150a9dd 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit f92f844405db63d25d15038b2e746abb7a4425b1 +Subproject commit e150a9dd5622e9e6cd208cc385881ccc51940fe0 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 76138196..040837af 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 7613819641e4b9b97501193e22c0395c6203e5a6 +Subproject commit 040837af50353393f3ca0e52097f368e19a681c1 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index ae73a0dd..06ff2919 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit ae73a0dd5a670111ee8f63ae7e8d793a04f75c15 +Subproject commit 06ff29196b6046b1e8673da8efa3264333b2cef6 diff --git a/oca/survey b/oca/survey new file mode 160000 index 00000000..1b0314bf --- /dev/null +++ b/oca/survey @@ -0,0 +1 @@ +Subproject commit 1b0314bfb14e293d6e6fe85dd0a481fbb8797c53 diff --git a/oca/web b/oca/web index 416eab93..9eea140d 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 416eab933cd5cc5361ed38e17ead39552112b20c +Subproject commit 9eea140d50aac4f7c53cb3c16245b312ae893914 diff --git a/odoo b/odoo index b45f75a3..7e87cfb0 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit b45f75a3b66203f3a65bac0b53f49364d4347c80 +Subproject commit 7e87cfb0edb46a5091bee3b8d92c40185965d2aa diff --git a/task b/task index 68509a9f..82a32408 100755 --- a/task +++ b/task @@ -225,7 +225,7 @@ function start() { activate-venv echo "Open http://localhost:8069 url in your browser." open-url-with-delay "http://localhost:8069/web?db=$DATABASE" & - odoo-bin --config "config/odoo-native.conf" --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG + odoo-bin --config "config/odoo-native.conf" -d "$DATABASE" --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG fi if [[ "$1" =~ "mail" ]]; then From 6555d0229cb57fefd2c68b84da125ce31e5f746f Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 18 Sep 2023 16:40:21 +0200 Subject: [PATCH 098/147] ref --- addons/vertical_saas | 2 +- oca/product-attribute | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/vertical_saas b/addons/vertical_saas index 8713fd3f..cdd85be8 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 8713fd3ffc96150f423551a06c5d8c187771b792 +Subproject commit cdd85be8e3920af2ead622261ae5e72c452a8df8 diff --git a/oca/product-attribute b/oca/product-attribute index f563a882..33af21aa 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit f563a882344c29dbb04ceb9ad1cb117c9d6fd099 +Subproject commit 33af21aa4032fad925508deef5458bd94add3bbd From 5a58bac9b29f6dad6f62ef1ac5aecaa92ea85687 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 18 Sep 2023 18:22:22 +0200 Subject: [PATCH 099/147] fix task script --- task | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/task b/task index 82a32408..12cc632f 100755 --- a/task +++ b/task @@ -134,7 +134,7 @@ function disable-auto-install() { } function install-odoo-scripts() { - curl -L https://raw.githubusercontent.com/mint-system/ansible-build/master/roles/odoo_scripts/files/install | sh + curl -L https://raw.githubusercontent.com/mint-system/ansible-build/master/roles/odoo_scripts/files/install | bash } function install-native() { @@ -225,7 +225,7 @@ function start() { activate-venv echo "Open http://localhost:8069 url in your browser." open-url-with-delay "http://localhost:8069/web?db=$DATABASE" & - odoo-bin --config "config/odoo-native.conf" -d "$DATABASE" --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG + odoo-bin --config "config/odoo-native.conf" --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG fi if [[ "$1" =~ "mail" ]]; then From 0aa28260f494431851226143d988118aba061d48 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 21 Sep 2023 09:03:17 +0200 Subject: [PATCH 100/147] sync --- snippets/account.md | 140 ++++++++++++++++++ ...ount.report_invoice_document.add_taxes.xml | 22 +++ ...nt.report_invoice_document.style_moser.xml | 36 +++++ ...n_invoice_tree.format_invoice_date_due.xml | 8 + ...t_invoice_tree.format_invoice_date_due.xml | 8 + ...hr_expense_view_form.show_payment_mode.xml | 12 ++ snippets/hr_expense.md | 19 +++ snippets/ir_model.md | 42 ++++++ ...r_model.purchase_order.x_payment_state.xml | 35 +++++ snippets/purchase.md | 28 ++++ ...se.purchase_order_form.x_payment_state.xml | 8 + ...urchase_order_view_tree.x_payment_tree.xml | 8 + ...e.view_order_form.set_limit_order_line.xml | 8 + snippets/sale_blanket_order.md | 17 +++ ...r.report_blanketorder_document.add_vat.xml | 11 ++ 15 files changed, 402 insertions(+) create mode 100644 snippets/account.report_invoice_document.add_taxes.xml create mode 100644 snippets/account.report_invoice_document.style_moser.xml create mode 100644 snippets/account.view_in_invoice_tree.format_invoice_date_due.xml create mode 100644 snippets/account.view_out_invoice_tree.format_invoice_date_due.xml create mode 100644 snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml create mode 100644 snippets/ir_model.purchase_order.x_payment_state.xml create mode 100644 snippets/purchase.purchase_order_form.x_payment_state.xml create mode 100644 snippets/purchase.purchase_order_view_tree.x_payment_tree.xml create mode 100644 snippets/sale.view_order_form.set_limit_order_line.xml create mode 100644 snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml diff --git a/snippets/account.md b/snippets/account.md index 49eeec09..adcbd875 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -295,6 +295,34 @@ ID: `mint_system.account.report_invoice_document.add_salesperson` ``` Source: [snippets/account.report_invoice_document.add_salesperson.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.add_salesperson.xml) +### Add Taxes +ID: `mint_system.account.report_invoice_document.add_taxes` +```xml + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.add_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.add_taxes.xml) + ### Align Taxes ID: `mint_system.account.report_invoice_document.align_taxes` ```xml @@ -2312,6 +2340,48 @@ ID: `mint_system.account.report_invoice_document.style_carbo_link` ``` Source: [snippets/account.report_invoice_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_carbo_link.xml) +### Style Moser +ID: `mint_system.account.report_invoice_document.style_moser` +```xml + + + + + + + + table table-sm o_main_table mt-4 + + + +``` +Source: [snippets/account.report_invoice_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_moser.xml) + ### Style Tissa ID: `mint_system.account.report_invoice_document.style_tissa` ```xml @@ -2948,6 +3018,34 @@ ID: `mint_system.account.report_invoice_document.add_salesperson` ``` Source: [snippets/account.report_invoice_document.add_salesperson.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.add_salesperson.xml) +### Add Taxes +ID: `mint_system.account.report_invoice_document.add_taxes` +```xml + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.add_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.add_taxes.xml) + ### Align Taxes ID: `mint_system.account.report_invoice_document.align_taxes` ```xml @@ -4965,6 +5063,48 @@ ID: `mint_system.account.report_invoice_document.style_carbo_link` ``` Source: [snippets/account.report_invoice_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_carbo_link.xml) +### Style Moser +ID: `mint_system.account.report_invoice_document.style_moser` +```xml + + + + + + + + table table-sm o_main_table mt-4 + + + +``` +Source: [snippets/account.report_invoice_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_moser.xml) + ### Style Tissa ID: `mint_system.account.report_invoice_document.style_tissa` ```xml diff --git a/snippets/account.report_invoice_document.add_taxes.xml b/snippets/account.report_invoice_document.add_taxes.xml new file mode 100644 index 00000000..898f804c --- /dev/null +++ b/snippets/account.report_invoice_document.add_taxes.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.style_moser.xml b/snippets/account.report_invoice_document.style_moser.xml new file mode 100644 index 00000000..142976fd --- /dev/null +++ b/snippets/account.report_invoice_document.style_moser.xml @@ -0,0 +1,36 @@ + + + + + + + + table table-sm o_main_table mt-4 + + + \ No newline at end of file diff --git a/snippets/account.view_in_invoice_tree.format_invoice_date_due.xml b/snippets/account.view_in_invoice_tree.format_invoice_date_due.xml new file mode 100644 index 00000000..63e03267 --- /dev/null +++ b/snippets/account.view_in_invoice_tree.format_invoice_date_due.xml @@ -0,0 +1,8 @@ + + + + + date + + + \ No newline at end of file diff --git a/snippets/account.view_out_invoice_tree.format_invoice_date_due.xml b/snippets/account.view_out_invoice_tree.format_invoice_date_due.xml new file mode 100644 index 00000000..c32c5535 --- /dev/null +++ b/snippets/account.view_out_invoice_tree.format_invoice_date_due.xml @@ -0,0 +1,8 @@ + + + + + date + + + \ No newline at end of file diff --git a/snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml b/snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml new file mode 100644 index 00000000..51074a28 --- /dev/null +++ b/snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml @@ -0,0 +1,12 @@ + + + + + {} + + + + {} + + + diff --git a/snippets/hr_expense.md b/snippets/hr_expense.md index 6f9699c5..c76bf760 100644 --- a/snippets/hr_expense.md +++ b/snippets/hr_expense.md @@ -15,6 +15,25 @@ ID: `mint_system.hr_expense.hr_expense_view_form.set_group_tax_ids` ``` Source: [snippets/hr_expense.hr_expense_view_form.set_group_tax_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_expense.hr_expense_view_form.set_group_tax_ids.xml) +### Show Payment Mode +ID: `mint_system.hr_expense.hr_expense_view_form.show_payment_mode` +```xml + + + + + {} + + + + {} + + + + +``` +Source: [snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml) + ### X Partner Id ID: `mint_system.hr_expense.hr_expense_view_form.x_partner_id` ```xml diff --git a/snippets/ir_model.md b/snippets/ir_model.md index fd75c84d..1cbe6d24 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -1591,6 +1591,48 @@ ID: `mint_system.ir_model.purchase_order.x_comment` ``` Source: [snippets/ir_model.purchase_order.x_comment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.purchase_order.x_comment.xml) +### X Payment State +ID: `mint_system.ir_model.purchase_order.x_payment_state` +```xml + + + + + Zahlungsstatus + purchase.order + + x_payment_state + + + + selection + [ + {'value':'not_paid','name':'Nicht Bezahlt'}, + {'value':'in_payment','name':'In Zahlung'}, + {'value':'paid','name':'Bezahlt'}, + ] + invoice_ids,invoice_ids.payment_state + for rec in self: + if rec.invoice_ids: + has_only_paid_invoices = all(rec.invoice_ids.mapped(lambda i: i.payment_state == 'paid')) + has_in_payment_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'in_payment')) + has_not_paid_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'not_paid')) + + if has_only_paid_invoices: + rec['x_payment_state'] = 'paid' + elif has_in_payment_invoices: + rec['x_payment_state'] = 'in_payment' + elif has_not_paid_invoices: + rec['x_payment_state'] = 'not_paid' + else: + rec['x_payment_state'] = 'not_paid' + + + + +``` +Source: [snippets/ir_model.purchase_order.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.purchase_order.x_payment_state.xml) + ## Quality Check ### X Active ID: `mint_system.ir_model.quality_check.x_active` diff --git a/snippets/ir_model.purchase_order.x_payment_state.xml b/snippets/ir_model.purchase_order.x_payment_state.xml new file mode 100644 index 00000000..0a347942 --- /dev/null +++ b/snippets/ir_model.purchase_order.x_payment_state.xml @@ -0,0 +1,35 @@ + + + + + Zahlungsstatus + purchase.order + + x_payment_state + + + + selection + [ + {'value':'not_paid','name':'Nicht Bezahlt'}, + {'value':'in_payment','name':'In Zahlung'}, + {'value':'paid','name':'Bezahlt'}, + ] + invoice_ids,invoice_ids.payment_state + for rec in self: + if rec.invoice_ids: + has_only_paid_invoices = all(rec.invoice_ids.mapped(lambda i: i.payment_state == 'paid')) + has_in_payment_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'in_payment')) + has_not_paid_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'not_paid')) + + if has_only_paid_invoices: + rec['x_payment_state'] = 'paid' + elif has_in_payment_invoices: + rec['x_payment_state'] = 'in_payment' + elif has_not_paid_invoices: + rec['x_payment_state'] = 'not_paid' + else: + rec['x_payment_state'] = 'not_paid' + + + diff --git a/snippets/purchase.md b/snippets/purchase.md index 1ceeb5cc..a696e77e 100644 --- a/snippets/purchase.md +++ b/snippets/purchase.md @@ -244,6 +244,20 @@ ID: `mint_system.purchase.purchase_order_form.x_drawing_file` ``` Source: [snippets/purchase.purchase_order_form.x_drawing_file.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_form.x_drawing_file.xml) +### X Payment State +ID: `mint_system.purchase.purchase_order_form.x_payment_state` +```xml + + + + + + + + +``` +Source: [snippets/purchase.purchase_order_form.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_form.x_payment_state.xml) + ## Purchase Order Kpis Tree ### Add Comment ID: `mint_system.purchase.purchase_order_kpis_tree.add_comment` @@ -423,6 +437,20 @@ ID: `mint_system.purchase.purchase_order_view_tree.add_mail_reception_confirmed` ``` Source: [snippets/purchase.purchase_order_view_tree.add_mail_reception_confirmed.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_view_tree.add_mail_reception_confirmed.xml) +### X Payment Tree +ID: `mint_system.purchase.purchase_order_view_tree.x_payment_tree` +```xml + + + + + + + + +``` +Source: [snippets/purchase.purchase_order_view_tree.x_payment_tree.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_view_tree.x_payment_tree.xml) + ## Report Purchaseorder Document ### Add Agreement ID: `mint_system.purchase.report_purchaseorder_document.add_agreement` diff --git a/snippets/purchase.purchase_order_form.x_payment_state.xml b/snippets/purchase.purchase_order_form.x_payment_state.xml new file mode 100644 index 00000000..6f4fc3fa --- /dev/null +++ b/snippets/purchase.purchase_order_form.x_payment_state.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/purchase.purchase_order_view_tree.x_payment_tree.xml b/snippets/purchase.purchase_order_view_tree.x_payment_tree.xml new file mode 100644 index 00000000..6422fd21 --- /dev/null +++ b/snippets/purchase.purchase_order_view_tree.x_payment_tree.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_order_form.set_limit_order_line.xml b/snippets/sale.view_order_form.set_limit_order_line.xml new file mode 100644 index 00000000..0f177186 --- /dev/null +++ b/snippets/sale.view_order_form.set_limit_order_line.xml @@ -0,0 +1,8 @@ + + + + + 100 + + + diff --git a/snippets/sale_blanket_order.md b/snippets/sale_blanket_order.md index 6ed0dc99..3c594e04 100644 --- a/snippets/sale_blanket_order.md +++ b/snippets/sale_blanket_order.md @@ -281,6 +281,23 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.address_block` ``` Source: [snippets/sale_blanket_order.report_blanketorder_document.address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.address_block.xml) +### Add Vat +ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_vat` +```xml + + + + +

          MwSt.-Nr.: + +

          + +           + +           +``` +Source: [snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml) + ### Extend Title ID: `mint_system.sale_blanket_order.report_blanketorder_document.extend_title` ```xml diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml new file mode 100644 index 00000000..c53a50a8 --- /dev/null +++ b/snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml @@ -0,0 +1,11 @@ + + + + +

          MwSt.-Nr.: + +

          + +           + +           \ No newline at end of file From f0ba51b9fe91d75e68ecccb9435be53c7e0eb8e9 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 21 Sep 2023 09:49:59 +0200 Subject: [PATCH 101/147] ref --- enterprise | 2 +- oca/account-financial-reporting | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/bank-payment | 2 +- oca/credit-control | 2 +- oca/crm | 2 +- oca/dms | 2 +- oca/hr | 2 +- oca/hr-attendance | 2 +- oca/knowledge | 2 +- oca/l10n-switzerland | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-workflow | 2 +- oca/server-backend | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/social | 2 +- oca/stock-logistics-warehouse | 2 +- oca/timesheet | 2 +- oca/web | 2 +- oca/website | 2 +- odoo | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/enterprise b/enterprise index 2cd9a6c0..c3676730 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 2cd9a6c0548c32a008a389f64e1e0a2153649199 +Subproject commit c3676730b25b5edb850149153bf4f708ce86e4fc diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting index b856f1f8..5d7b5325 160000 --- a/oca/account-financial-reporting +++ b/oca/account-financial-reporting @@ -1 +1 @@ -Subproject commit b856f1f82587f5b27c51eb04e61513f85882cc06 +Subproject commit 5d7b53250701adacf95d295ffafb7ce612c8c1b4 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index acdfb1c2..fb63c5cf 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit acdfb1c26c5331e4cedb9399c43984214adef011 +Subproject commit fb63c5cff9b16f4e5b2e48ac3ed741a42d334589 diff --git a/oca/account-invoicing b/oca/account-invoicing index 135346cb..e62aa78f 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit 135346cb372986ffc17dbe38be618356e6fbc056 +Subproject commit e62aa78ff0d7b2a1368d326834c92f743e087440 diff --git a/oca/bank-payment b/oca/bank-payment index 6d1d9e51..3d8420ec 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 6d1d9e5175bf44274f38836d42a0f5598c99b108 +Subproject commit 3d8420ec8057b30d261f73737517e87d84978fc8 diff --git a/oca/credit-control b/oca/credit-control index f985a39e..8191e51c 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit f985a39e2cdf87c49077abd1dc086ff1b813fa65 +Subproject commit 8191e51c9cde23694f2506bbe23f329ddfd0fcec diff --git a/oca/crm b/oca/crm index 6a9521e8..fd93ea2b 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit 6a9521e8bd890375db2533e6796c9078cd3ab18c +Subproject commit fd93ea2b23cfdb99d781c2ce84a0ccf4a4ffde95 diff --git a/oca/dms b/oca/dms index dc12b219..e4d60b2d 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit dc12b219e9f26151cc222fb9eb15d4121fa3a145 +Subproject commit e4d60b2d3f0512b9b8477986bbea6cd778ee4154 diff --git a/oca/hr b/oca/hr index 5d4b1e61..c5a4b919 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit 5d4b1e619767ba18eabd0e86d36f00afb16f0c88 +Subproject commit c5a4b91901b221ae5d72eb12cdee233c7d82b84d diff --git a/oca/hr-attendance b/oca/hr-attendance index 5a0dddbc..50ed427c 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 5a0dddbc1ae8213958457cb0a0c3dd73474c24e5 +Subproject commit 50ed427cf94e26c8cef249b1173138b530fe9ac1 diff --git a/oca/knowledge b/oca/knowledge index 017a752b..0c610f10 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit 017a752b335df4137c1ca9340acbe629416b549f +Subproject commit 0c610f103a1b047f73d685b1719960e5fba61c78 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 97f98d96..2a5d0867 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 97f98d96c7b2bf87dd5d9d4285ff59ec37fd9f07 +Subproject commit 2a5d0867e11d47acde565347256bc26f76de61b6 diff --git a/oca/manufacture b/oca/manufacture index 60854f22..48032879 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 60854f22fc04430fe161d352d48d668a1711f1ca +Subproject commit 48032879eff7e43c400603b45da563bcb0ea5077 diff --git a/oca/partner-contact b/oca/partner-contact index 631afc50..942c0126 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 631afc50a3100c1ed3537baa153fb4c626d1e283 +Subproject commit 942c0126885468a9ec0230bc4948b93d93f33ac5 diff --git a/oca/product-attribute b/oca/product-attribute index 33af21aa..d3b63b16 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 33af21aa4032fad925508deef5458bd94add3bbd +Subproject commit d3b63b165c765c0e65bf17760b66ffd236fe4cf3 diff --git a/oca/project b/oca/project index 07ca0d2a..ec334750 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 07ca0d2a141cf7a215e85ddec7ff6de89e858158 +Subproject commit ec33475085822c37160fe44b42e6f1a957c883fb diff --git a/oca/purchase-workflow b/oca/purchase-workflow index f78b8fdd..1e346495 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit f78b8fdd1da9de10d0e078219da6809937553086 +Subproject commit 1e346495d15223fb665701ce8ec24e89ea3b0987 diff --git a/oca/reporting-engine b/oca/reporting-engine index f5c04ca1..08c5f372 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit f5c04ca190fa842497b7351f7f965725d9881ec6 +Subproject commit 08c5f372d0828e6e677356ed8544b985ea709e80 diff --git a/oca/rest-framework b/oca/rest-framework index b6d84358..84eaea2c 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit b6d84358ba1b567f617625c95364d4c05b16fbcc +Subproject commit 84eaea2c80117a316fc3ddfb4cdd5fad296937a3 diff --git a/oca/sale-workflow b/oca/sale-workflow index 6615746e..58417ffe 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 6615746e08b80d0a42a859c7f569018521781716 +Subproject commit 58417ffe7c010ccba66f0a19853692b6366ce580 diff --git a/oca/server-backend b/oca/server-backend index 03f58de1..20851676 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 03f58de1f70ff2813064e21ab4600667710c889f +Subproject commit 208516768f24ac12833443e47d7d86a84c381bc2 diff --git a/oca/server-tools b/oca/server-tools index 481129d4..56d6c40b 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 481129d46cabaeb75c7347b69ddcb95d20aab652 +Subproject commit 56d6c40b88aa100b2f66b0d59600cb3574ef043e diff --git a/oca/server-ux b/oca/server-ux index e150a9dd..5d85d7a9 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit e150a9dd5622e9e6cd208cc385881ccc51940fe0 +Subproject commit 5d85d7a9d64cadf7381b785b683bb41ed6759720 diff --git a/oca/social b/oca/social index 5dd6eb25..841a4e5c 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit 5dd6eb25de362961aff18f813cd166971e472620 +Subproject commit 841a4e5c7c82c446c3c3522548e229eb1efdc7d3 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 040837af..b628a8f8 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 040837af50353393f3ca0e52097f368e19a681c1 +Subproject commit b628a8f8c6969523f25341861098c091d4d23d2a diff --git a/oca/timesheet b/oca/timesheet index 877d7396..b2c0041d 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit 877d7396d7ff6b2fee0320a83dd6923f2e0b1600 +Subproject commit b2c0041da604396f686d00a47cf3e6e1e06c5d4d diff --git a/oca/web b/oca/web index 9eea140d..3a2ecb60 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 9eea140d50aac4f7c53cb3c16245b312ae893914 +Subproject commit 3a2ecb6090de40e8837abb995654f4d64e64487e diff --git a/oca/website b/oca/website index 3b9b3358..89529a8f 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit 3b9b33587cb3eca656f60b4f33652489581d8d90 +Subproject commit 89529a8fe23a069637bb1b654201d68126abc54e diff --git a/odoo b/odoo index 7e87cfb0..92aa0046 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 7e87cfb0edb46a5091bee3b8d92c40185965d2aa +Subproject commit 92aa004694f62ac979e9bf962f44d6f7f166a7ce From ca44c06082ea8802c4bd6eaff27429536aa7e237 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 21 Sep 2023 14:55:52 +0200 Subject: [PATCH 102/147] add snippet --- .../helpdesk.helpdesk_ticket_view_form.domain_so_line.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml diff --git a/snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml b/snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml new file mode 100644 index 00000000..af8a5c9d --- /dev/null +++ b/snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml @@ -0,0 +1,8 @@ + + + + + [('is_service', '=', True), ('order_partner_id', 'child_of', parent.commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale'])] + + + From 2a8516905930cff5ed15141311aaf0bf4e85d82e Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 21 Sep 2023 17:04:10 +0200 Subject: [PATCH 103/147] add snippet --- ...aner.mcr_report_view.hide_mcr_planning_columns.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml diff --git a/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml b/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml new file mode 100644 index 00000000..8f02ef7f --- /dev/null +++ b/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + From 1cc3058ff210a6e0c872bf6c2bf8ecd31783149f Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 21 Sep 2023 18:54:29 +0200 Subject: [PATCH 104/147] snippets --- snippets/account.view_move_form.move_to_check.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 snippets/account.view_move_form.move_to_check.xml diff --git a/snippets/account.view_move_form.move_to_check.xml b/snippets/account.view_move_form.move_to_check.xml new file mode 100644 index 00000000..2eebbda5 --- /dev/null +++ b/snippets/account.view_move_form.move_to_check.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file From f42b30bfa4386213cf12ab2db3edf238ae092ed7 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 22 Sep 2023 13:15:08 +0200 Subject: [PATCH 105/147] add snippets --- ..._sales_order_filter.add_filter_collective_invoice.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml diff --git a/snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml b/snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml new file mode 100644 index 00000000..e9790fc9 --- /dev/null +++ b/snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file From 2765466ce113011c760f60c497ec6e7dcfa09517 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 2 Oct 2023 11:09:32 +0200 Subject: [PATCH 106/147] ref --- enterprise | 2 +- oca/account-financial-reporting | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/account-reconcile | 2 +- oca/bank-payment | 2 +- oca/business-requirement | 2 +- oca/connector | 2 +- oca/credit-control | 2 +- oca/crm | 2 +- oca/management-system | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-reporting | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/social | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/timesheet | 2 +- oca/web | 2 +- odoo | 2 +- themes | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/enterprise b/enterprise index c3676730..399072d5 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit c3676730b25b5edb850149153bf4f708ce86e4fc +Subproject commit 399072d504b385f8238624b78aa643d96874ee4d diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting index 5d7b5325..89144fe1 160000 --- a/oca/account-financial-reporting +++ b/oca/account-financial-reporting @@ -1 +1 @@ -Subproject commit 5d7b53250701adacf95d295ffafb7ce612c8c1b4 +Subproject commit 89144fe180ca526d3382ee7bb159b99e39602c68 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index fb63c5cf..a733d0f5 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit fb63c5cff9b16f4e5b2e48ac3ed741a42d334589 +Subproject commit a733d0f596a4532dc9a72530d9a40182abaf4d1d diff --git a/oca/account-invoicing b/oca/account-invoicing index e62aa78f..23fe001c 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit e62aa78ff0d7b2a1368d326834c92f743e087440 +Subproject commit 23fe001c4ccbaeba485443363e4e49f47edb4de5 diff --git a/oca/account-reconcile b/oca/account-reconcile index 28d46715..d075695e 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit 28d467153ecb15960d329d7bf4d4bad39d0ec313 +Subproject commit d075695e9e85df84cef49eb675dfed078af8293e diff --git a/oca/bank-payment b/oca/bank-payment index 3d8420ec..79a2c01d 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 3d8420ec8057b30d261f73737517e87d84978fc8 +Subproject commit 79a2c01daed34c8c9236a53a291e55d2ad6bc736 diff --git a/oca/business-requirement b/oca/business-requirement index efeee191..4992a307 160000 --- a/oca/business-requirement +++ b/oca/business-requirement @@ -1 +1 @@ -Subproject commit efeee191c639b12034f8a10b2917113cd885107e +Subproject commit 4992a307ae33b26951a326d75604428c3e4a7ab6 diff --git a/oca/connector b/oca/connector index 26ebcca4..376704d3 160000 --- a/oca/connector +++ b/oca/connector @@ -1 +1 @@ -Subproject commit 26ebcca47974636aea3b626f469f6271502d7610 +Subproject commit 376704d3f17d9d8c828b83503cb250501d52a1b2 diff --git a/oca/credit-control b/oca/credit-control index 8191e51c..59c8080e 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 8191e51c9cde23694f2506bbe23f329ddfd0fcec +Subproject commit 59c8080e99b077286c221ab60ea9e5d4f6697aff diff --git a/oca/crm b/oca/crm index fd93ea2b..174e5c1b 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit fd93ea2b23cfdb99d781c2ce84a0ccf4a4ffde95 +Subproject commit 174e5c1be7af385c3851b85db2af9a377e6a4383 diff --git a/oca/management-system b/oca/management-system index bc5ab75e..9c628e40 160000 --- a/oca/management-system +++ b/oca/management-system @@ -1 +1 @@ -Subproject commit bc5ab75e171671838190916b64aa1211f44dab26 +Subproject commit 9c628e405bacc17263c226a97fead9405dae928a diff --git a/oca/manufacture b/oca/manufacture index 48032879..68badd39 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 48032879eff7e43c400603b45da563bcb0ea5077 +Subproject commit 68badd398ed5e66ad94deccf7980a6cdfbbcebb3 diff --git a/oca/partner-contact b/oca/partner-contact index 942c0126..9363a098 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 942c0126885468a9ec0230bc4948b93d93f33ac5 +Subproject commit 9363a098c1c30913fa992b54d630b282db186500 diff --git a/oca/product-attribute b/oca/product-attribute index d3b63b16..0fc67c66 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit d3b63b165c765c0e65bf17760b66ffd236fe4cf3 +Subproject commit 0fc67c66f906147b9063850af80817b2a607addf diff --git a/oca/project b/oca/project index ec334750..7ea119e8 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit ec33475085822c37160fe44b42e6f1a957c883fb +Subproject commit 7ea119e88705f8eff3f376726bab4727db14b427 diff --git a/oca/purchase-workflow b/oca/purchase-workflow index 1e346495..a2549918 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit 1e346495d15223fb665701ce8ec24e89ea3b0987 +Subproject commit a25499180877294645664b9e1d238baa69ca5b0c diff --git a/oca/reporting-engine b/oca/reporting-engine index 08c5f372..e73b7c21 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 08c5f372d0828e6e677356ed8544b985ea709e80 +Subproject commit e73b7c2176dfeec2eb592fb9d18818c2aa8d5627 diff --git a/oca/rest-framework b/oca/rest-framework index 84eaea2c..4289428b 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit 84eaea2c80117a316fc3ddfb4cdd5fad296937a3 +Subproject commit 4289428bbea2102232a3a67af92b22d1c5238eb1 diff --git a/oca/sale-reporting b/oca/sale-reporting index a06a5037..8524cbbf 160000 --- a/oca/sale-reporting +++ b/oca/sale-reporting @@ -1 +1 @@ -Subproject commit a06a50371b0398dd7c27c69dfa5bc6aaa0c417e8 +Subproject commit 8524cbbfcf6266e5f38e8e43976b19892e78142b diff --git a/oca/sale-workflow b/oca/sale-workflow index 58417ffe..35a84366 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 58417ffe7c010ccba66f0a19853692b6366ce580 +Subproject commit 35a84366dfa4dfe94dcdc64c5277283091593684 diff --git a/oca/server-auth b/oca/server-auth index 864231b4..36a4cfca 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit 864231b4693b485fdc272b418aaa64de710dd5bf +Subproject commit 36a4cfcaaaaecf35d5f1387ddaf8e67ea1c9fc6c diff --git a/oca/server-tools b/oca/server-tools index 56d6c40b..41b9c885 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 56d6c40b88aa100b2f66b0d59600cb3574ef043e +Subproject commit 41b9c8850c9b4fa4ae983772d3d419836c64d8a1 diff --git a/oca/server-ux b/oca/server-ux index 5d85d7a9..cb7c10e3 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit 5d85d7a9d64cadf7381b785b683bb41ed6759720 +Subproject commit cb7c10e30e173ff0594cccc7056919e186eff132 diff --git a/oca/social b/oca/social index 841a4e5c..8d25f25e 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit 841a4e5c7c82c446c3c3522548e229eb1efdc7d3 +Subproject commit 8d25f25e8d9bd79b4afcb5559d915c745e523598 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index b628a8f8..2cb4cce8 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit b628a8f8c6969523f25341861098c091d4d23d2a +Subproject commit 2cb4cce886f5ef50dcd718f4b83cd2db184619f3 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index 06ff2919..4b0301ca 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit 06ff29196b6046b1e8673da8efa3264333b2cef6 +Subproject commit 4b0301ca409ade61958fd09d50a10209d064b6c5 diff --git a/oca/timesheet b/oca/timesheet index b2c0041d..6b8b2d83 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit b2c0041da604396f686d00a47cf3e6e1e06c5d4d +Subproject commit 6b8b2d83d6fabbd45b42413eb7c904c1d6914162 diff --git a/oca/web b/oca/web index 3a2ecb60..bbff8fbb 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 3a2ecb6090de40e8837abb995654f4d64e64487e +Subproject commit bbff8fbbc996cdf811ab34669c8f01ac65d3875e diff --git a/odoo b/odoo index 92aa0046..92c232cc 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 92aa004694f62ac979e9bf962f44d6f7f166a7ce +Subproject commit 92c232cca15517bd9a33a5100e7cdc42c3c25397 diff --git a/themes b/themes index 598fcffb..0dddab7e 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit 598fcffbae57c0eab422db669e75f52dd5c267e4 +Subproject commit 0dddab7eceb17ed665cc8fc0adec2b05656f3393 From 6ac772a06e47fc1f605f33908f0a150615a50d37 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 4 Oct 2023 16:57:55 +0200 Subject: [PATCH 107/147] snippet --- snippets/hr_timesheet.report_timesheet.user_report.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/snippets/hr_timesheet.report_timesheet.user_report.xml b/snippets/hr_timesheet.report_timesheet.user_report.xml index a96cdf94..423fad5c 100644 --- a/snippets/hr_timesheet.report_timesheet.user_report.xml +++ b/snippets/hr_timesheet.report_timesheet.user_report.xml @@ -5,13 +5,14 @@ -

          Arbeitsrapport für das Projekt "" + +

          Arbeitsrapport für das Projekt ""

          Zeitraum: bis

          -

          Kunde:
          Erstellt von: Kunde:
          Erstellt von:


          From 646a74553a4654fac33a6e49fdf7873fac33c560 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 4 Oct 2023 17:34:43 +0200 Subject: [PATCH 108/147] update snip --- snippets/hr_timesheet.report_timesheet.user_report.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snippets/hr_timesheet.report_timesheet.user_report.xml b/snippets/hr_timesheet.report_timesheet.user_report.xml index 423fad5c..9b4ce603 100644 --- a/snippets/hr_timesheet.report_timesheet.user_report.xml +++ b/snippets/hr_timesheet.report_timesheet.user_report.xml @@ -6,9 +6,9 @@ -

          Arbeitsrapport für das Projekt "" -

          + +

          Arbeitsrapport für das Projekt ""

          +

          Zeitraum: bis

          From 44d19366d60b45759e8362afdb76bb954f871f6a Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 4 Oct 2023 18:19:23 +0200 Subject: [PATCH 109/147] add interval --- ...rchase_order_form.x_recurring_inverval.xml | 8 +++++++ ...el.purchase_order.x_recurring_inverval.xml | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 snippets/account.purchase_purchase_order_form.x_recurring_inverval.xml create mode 100644 snippets/ir_model.purchase_order.x_recurring_inverval.xml diff --git a/snippets/account.purchase_purchase_order_form.x_recurring_inverval.xml b/snippets/account.purchase_purchase_order_form.x_recurring_inverval.xml new file mode 100644 index 00000000..fc71e229 --- /dev/null +++ b/snippets/account.purchase_purchase_order_form.x_recurring_inverval.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/ir_model.purchase_order.x_recurring_inverval.xml b/snippets/ir_model.purchase_order.x_recurring_inverval.xml new file mode 100644 index 00000000..a5cd8fd7 --- /dev/null +++ b/snippets/ir_model.purchase_order.x_recurring_inverval.xml @@ -0,0 +1,21 @@ + + + + + Vertragsintervall + purchase.order + + x_recurring_inverval + + + + selection + [ + {'value':'daily','name':'Daily'}, + {'value':'monthly','name':'Monthly'}, + {'value':'quarterly','name':'Quarterly'}, + {'value':'yearly','name':'Yearly'} + ] + + + From 9eaab75fdb825bdba7f68e5814d3c965afcea1f8 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 5 Oct 2023 16:10:24 +0200 Subject: [PATCH 110/147] ref --- addons/vertical_job_portal | 2 +- addons/vertical_saas | 2 +- enterprise | 2 +- odoo | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 87a8c26c..01d7be7a 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 87a8c26ce44d716f40bd75f1701d3ea4e2a8217f +Subproject commit 01d7be7a6c1b844940abdae6407b06a05261fc85 diff --git a/addons/vertical_saas b/addons/vertical_saas index cdd85be8..46dee1d6 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit cdd85be8e3920af2ead622261ae5e72c452a8df8 +Subproject commit 46dee1d6f0a606e21450322deb8690c718c6754b diff --git a/enterprise b/enterprise index 399072d5..ab43f9db 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 399072d504b385f8238624b78aa643d96874ee4d +Subproject commit ab43f9dba7755c8ec6846a0e6b1a81ae828e15c1 diff --git a/odoo b/odoo index 92c232cc..22ccb0e7 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 92c232cca15517bd9a33a5100e7cdc42c3c25397 +Subproject commit 22ccb0e795637864706a9933a23f605590a1f36e From 0f2ffd8484d55470af875e33583e067d11c20741 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 6 Oct 2023 16:41:08 +0200 Subject: [PATCH 111/147] sync --- snippets/account.md | 89 ++++++++++++ .../account.view_invoice_tree.format_ref.xml | 8 ++ ....view_move_form.format_partner_bank_id.xml | 8 ++ snippets/account.view_move_form.move_ref.xml | 11 ++ ..._report_view.hide_mcr_planning_columns.xml | 2 +- snippets/certificate_planer.md | 19 +++ snippets/helpdesk.md | 15 ++ snippets/hr_timesheet.md | 9 +- snippets/ir_model.md | 28 ++++ snippets/purchase.md | 44 ++++++ ...rchase_order_form.x_recurring_inverval.xml | 8 ++ ....purchase_order_view_tree.format_state.xml | 11 ++ ...ort_purchaseorder_document.style_gelso.xml | 7 + snippets/sale.md | 130 ++++++++++++++++++ ...saleorder_document.add_commitment_date.xml | 15 ++ ...view_form_readonly.show_is_downpayment.xml | 8 ++ ....view_order_form.move_client_order_ref.xml | 9 ++ ...e.view_order_form.move_commitment_date.xml | 15 ++ ....view_order_tree.show_client_order_ref.xml | 8 ++ snippets/sale.view_order_tree.x_vst.xml | 8 ++ snippets/stock.md | 30 ++++ .../stock.vpicktree.format_date_deadline.xml | 8 ++ .../stock.vpicktree.format_scheduled_date.xml | 8 ++ 23 files changed, 493 insertions(+), 5 deletions(-) create mode 100644 snippets/account.view_invoice_tree.format_ref.xml create mode 100644 snippets/account.view_move_form.format_partner_bank_id.xml create mode 100644 snippets/account.view_move_form.move_ref.xml create mode 100644 snippets/purchase.purchase_order_form.x_recurring_inverval.xml create mode 100644 snippets/purchase.purchase_order_view_tree.format_state.xml create mode 100644 snippets/purchase.report_purchaseorder_document.style_gelso.xml create mode 100644 snippets/sale.report_saleorder_document.add_commitment_date.xml create mode 100644 snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml create mode 100644 snippets/sale.view_order_form.move_client_order_ref.xml create mode 100644 snippets/sale.view_order_form.move_commitment_date.xml create mode 100644 snippets/sale.view_order_tree.show_client_order_ref.xml create mode 100644 snippets/sale.view_order_tree.x_vst.xml create mode 100644 snippets/stock.vpicktree.format_date_deadline.xml create mode 100644 snippets/stock.vpicktree.format_scheduled_date.xml diff --git a/snippets/account.md b/snippets/account.md index adcbd875..b0cfe216 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -5644,6 +5644,20 @@ ID: `mint_system.account.view_in_invoice_tree.add_discount_date` ``` Source: [snippets/account.view_in_invoice_tree.add_discount_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_in_invoice_tree.add_discount_date.xml) +### Format Invoice Date Due +ID: `mint_system.account.view_in_invoice_tree.format_invoice_date_due` +```xml + + + + + date + + + +``` +Source: [snippets/account.view_in_invoice_tree.format_invoice_date_due.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_in_invoice_tree.format_invoice_date_due.xml) + ## View Invoice Tree ### Add Currency Id ID: `mint_system.account.view_invoice_tree.add_currency_id` @@ -5659,6 +5673,20 @@ ID: `mint_system.account.view_invoice_tree.add_currency_id` ``` Source: [snippets/account.view_invoice_tree.add_currency_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_invoice_tree.add_currency_id.xml) +### Format Ref +ID: `mint_system.account.view_invoice_tree.format_ref` +```xml + + + + + Bestellnummer Kunde + + + +``` +Source: [snippets/account.view_invoice_tree.format_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_invoice_tree.format_ref.xml) + ### Show Date ID: `mint_system.account.view_invoice_tree.show_date` ```xml @@ -5730,6 +5758,20 @@ ID: `mint_system.account.view_move_form.edit_invoice_date` ``` Source: [snippets/account.view_move_form.edit_invoice_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.edit_invoice_date.xml) +### Format Partner Bank Id +ID: `mint_system.account.view_move_form.format_partner_bank_id` +```xml + + + + + 1 + + + +``` +Source: [snippets/account.view_move_form.format_partner_bank_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.format_partner_bank_id.xml) + ### Hide Payment Reference ID: `mint_system.account.view_move_form.hide_payment_reference` ```xml @@ -5762,6 +5804,39 @@ ID: `mint_system.account.view_move_form.hide_send_button_on_refund` ``` Source: [snippets/account.view_move_form.hide_send_button_on_refund.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.hide_send_button_on_refund.xml) +### Move Ref +ID: `mint_system.account.view_move_form.move_ref` +```xml + + + + + + + + + + + +``` +Source: [snippets/account.view_move_form.move_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.move_ref.xml) + +### Move To Check +ID: `mint_system.account.view_move_form.move_to_check` +```xml + + + + + + + + + + +``` +Source: [snippets/account.view_move_form.move_to_check.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.move_to_check.xml) + ### Payment Reference Readonly ID: `mint_system.account.view_move_form.payment_reference_readonly` ```xml @@ -6079,6 +6154,20 @@ ID: `mint_system.account.view_move_tree.x_account_codes` Source: [snippets/account.view_move_tree.x_account_codes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_tree.x_account_codes.xml) ## View Out Invoice Tree +### Format Invoice Date Due +ID: `mint_system.account.view_out_invoice_tree.format_invoice_date_due` +```xml + + + + + date + + + +``` +Source: [snippets/account.view_out_invoice_tree.format_invoice_date_due.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_out_invoice_tree.format_invoice_date_due.xml) + ### Show Partner Shipping ID: `mint_system.account.view_out_invoice_tree.show_partner_shipping` ```xml diff --git a/snippets/account.view_invoice_tree.format_ref.xml b/snippets/account.view_invoice_tree.format_ref.xml new file mode 100644 index 00000000..aead6e93 --- /dev/null +++ b/snippets/account.view_invoice_tree.format_ref.xml @@ -0,0 +1,8 @@ + + + + + Bestellnummer Kunde + + + \ No newline at end of file diff --git a/snippets/account.view_move_form.format_partner_bank_id.xml b/snippets/account.view_move_form.format_partner_bank_id.xml new file mode 100644 index 00000000..082cbc8c --- /dev/null +++ b/snippets/account.view_move_form.format_partner_bank_id.xml @@ -0,0 +1,8 @@ + + + + + 1 + + + \ No newline at end of file diff --git a/snippets/account.view_move_form.move_ref.xml b/snippets/account.view_move_form.move_ref.xml new file mode 100644 index 00000000..6a8d5009 --- /dev/null +++ b/snippets/account.view_move_form.move_ref.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml b/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml index 8f02ef7f..b0b6f263 100644 --- a/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml +++ b/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml @@ -1,5 +1,5 @@ - + diff --git a/snippets/certificate_planer.md b/snippets/certificate_planer.md index c9c01a79..0b9e4211 100644 --- a/snippets/certificate_planer.md +++ b/snippets/certificate_planer.md @@ -15,3 +15,22 @@ ID: `mint_system.certificate_planer.document_form.hide_view_report_button` ``` Source: [snippets/certificate_planer.document_form.hide_view_report_button.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/certificate_planer.document_form.hide_view_report_button.xml) +## Mcr Report View +### Hide Mcr Planning Columns +ID: `mint_system.certificate_planer.mcr_report_view.hide_mcr_planning_columns` +```xml + + + + + + + + + + + + +``` +Source: [snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml) + diff --git a/snippets/helpdesk.md b/snippets/helpdesk.md index a07e65e9..46c5cfcd 100644 --- a/snippets/helpdesk.md +++ b/snippets/helpdesk.md @@ -30,6 +30,21 @@ ID: `mint_system.helpdesk.helpdesk_tickets_view_tree.x_date_deadline` Source: [snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml) ## Helpdesk Ticket View Form +### Domain So Line +ID: `mint_system.helpdesk.helpdesk_ticket_view_form.domain_so_line` +```xml + + + + + [('is_service', '=', True), ('order_partner_id', 'child_of', parent.commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale'])] + + + + +``` +Source: [snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml) + ### X Date Deadline ID: `mint_system.helpdesk.helpdesk_ticket_view_form.x_date_deadline` ```xml diff --git a/snippets/hr_timesheet.md b/snippets/hr_timesheet.md index aed1bdf8..8df25e47 100644 --- a/snippets/hr_timesheet.md +++ b/snippets/hr_timesheet.md @@ -366,13 +366,14 @@ ID: `mint_system.hr_timesheet.report_timesheet.user_report` -

          Arbeitsrapport für das Projekt "" -

          + + +

          Arbeitsrapport für das Projekt ""

          +

          Zeitraum: bis

          -

          Kunde:
          Erstellt von: Kunde:
          Erstellt von:


          diff --git a/snippets/ir_model.md b/snippets/ir_model.md index 1cbe6d24..b6d5f214 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -1633,6 +1633,34 @@ ID: `mint_system.ir_model.purchase_order.x_payment_state` ``` Source: [snippets/ir_model.purchase_order.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.purchase_order.x_payment_state.xml) +### X Recurring Inverval +ID: `mint_system.ir_model.purchase_order.x_recurring_inverval` +```xml + + + + + Vertragsintervall + purchase.order + + x_recurring_inverval + + + + selection + [ + {'value':'daily','name':'Daily'}, + {'value':'monthly','name':'Monthly'}, + {'value':'quarterly','name':'Quarterly'}, + {'value':'yearly','name':'Yearly'} + ] + + + + +``` +Source: [snippets/ir_model.purchase_order.x_recurring_inverval.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.purchase_order.x_recurring_inverval.xml) + ## Quality Check ### X Active ID: `mint_system.ir_model.quality_check.x_active` diff --git a/snippets/purchase.md b/snippets/purchase.md index a696e77e..65b27826 100644 --- a/snippets/purchase.md +++ b/snippets/purchase.md @@ -258,6 +258,20 @@ ID: `mint_system.purchase.purchase_order_form.x_payment_state` ``` Source: [snippets/purchase.purchase_order_form.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_form.x_payment_state.xml) +### X Recurring Inverval +ID: `mint_system.purchase.purchase_order_form.x_recurring_inverval` +```xml + + + + + + + + +``` +Source: [snippets/purchase.purchase_order_form.x_recurring_inverval.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_form.x_recurring_inverval.xml) + ## Purchase Order Kpis Tree ### Add Comment ID: `mint_system.purchase.purchase_order_kpis_tree.add_comment` @@ -437,6 +451,23 @@ ID: `mint_system.purchase.purchase_order_view_tree.add_mail_reception_confirmed` ``` Source: [snippets/purchase.purchase_order_view_tree.add_mail_reception_confirmed.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_view_tree.add_mail_reception_confirmed.xml) +### Format State +ID: `mint_system.purchase.purchase_order_view_tree.format_state` +```xml + + + + 0 + badge + state == 'purchase' or state == 'done' + state == 'to approve' + state == 'draft' or state == 'sent' + + + +``` +Source: [snippets/purchase.purchase_order_view_tree.format_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_view_tree.format_state.xml) + ### X Payment Tree ID: `mint_system.purchase.purchase_order_view_tree.x_payment_tree` ```xml @@ -1480,6 +1511,19 @@ ID: `mint_system.purchase.report_purchaseorder_document.style_carbo_link` ``` Source: [snippets/purchase.report_purchaseorder_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml) +### Style Gelso +ID: `mint_system.purchase.report_purchaseorder_document.style_gelso` +```xml + + + + + + + +``` +Source: [snippets/purchase.report_purchaseorder_document.style_gelso.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_gelso.xml) + ### Style Moser ID: `mint_system.purchase.report_purchaseorder_document.style_moser` ```xml diff --git a/snippets/purchase.purchase_order_form.x_recurring_inverval.xml b/snippets/purchase.purchase_order_form.x_recurring_inverval.xml new file mode 100644 index 00000000..fc71e229 --- /dev/null +++ b/snippets/purchase.purchase_order_form.x_recurring_inverval.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/purchase.purchase_order_view_tree.format_state.xml b/snippets/purchase.purchase_order_view_tree.format_state.xml new file mode 100644 index 00000000..2192103f --- /dev/null +++ b/snippets/purchase.purchase_order_view_tree.format_state.xml @@ -0,0 +1,11 @@ + + + + 0 + badge + state == 'purchase' or state == 'done' + state == 'to approve' + state == 'draft' or state == 'sent' + + + \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.style_gelso.xml b/snippets/purchase.report_purchaseorder_document.style_gelso.xml new file mode 100644 index 00000000..b3d263f8 --- /dev/null +++ b/snippets/purchase.report_purchaseorder_document.style_gelso.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/sale.md b/snippets/sale.md index 6ee76d33..473d2c01 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -825,6 +825,27 @@ ID: `mint_system.sale.report_saleorder_document.add_blanket_order_line` ``` Source: [snippets/sale.report_saleorder_document.add_blanket_order_line.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_blanket_order_line.xml) +### Add Commitment Date +ID: `mint_system.sale.report_saleorder_document.add_commitment_date` +```xml + + + + + Geplantes Datum ETD + + + + + + + + + + +``` +Source: [snippets/sale.report_saleorder_document.add_commitment_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_commitment_date.xml) + ### Add Default Code ID: `mint_system.sale.report_saleorder_document.add_default_code` ```xml @@ -3154,6 +3175,20 @@ ID: `mint_system.sale.sale_order_line_view_form_readonly.show_invoice_lines` ``` Source: [snippets/sale.sale_order_line_view_form_readonly.show_invoice_lines.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_invoice_lines.xml) +### Show Is Downpayment +ID: `mint_system.sale.sale_order_line_view_form_readonly.show_is_downpayment` +```xml + + + + + + + + +``` +Source: [snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml) + ### Show Project Id ID: `mint_system.sale.sale_order_line_view_form_readonly.show_project_id` ```xml @@ -3671,6 +3706,21 @@ ID: `mint_system.sale.view_order_form.modify_readonly_date_order` ``` Source: [snippets/sale.view_order_form.modify_readonly_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.modify_readonly_date_order.xml) +### Move Client Order Ref +ID: `mint_system.sale.view_order_form.move_client_order_ref` +```xml + + + + + + + + + +``` +Source: [snippets/sale.view_order_form.move_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.move_client_order_ref.xml) + ### Move Comment ID: `mint_system.sale.view_order_form.move_comment` ```xml @@ -3685,6 +3735,27 @@ ID: `mint_system.sale.view_order_form.move_comment` ``` Source: [snippets/sale.view_order_form.move_comment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.move_comment.xml) +### Move Commitment Date +ID: `mint_system.sale.view_order_form.move_commitment_date` +```xml + + + + + + + + + +``` +Source: [snippets/sale.view_order_form.move_commitment_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.move_commitment_date.xml) + ### No Create Edit ID: `mint_system.sale.view_order_form.no_create_edit` ```xml @@ -3766,6 +3837,21 @@ ID: `mint_system.sale.view_order_form.set_groups_date_order` ``` Source: [snippets/sale.view_order_form.set_groups_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.set_groups_date_order.xml) +### Set Limit Order Line +ID: `mint_system.sale.view_order_form.set_limit_order_line` +```xml + + + + + 100 + + + + +``` +Source: [snippets/sale.view_order_form.set_limit_order_line.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.set_limit_order_line.xml) + ### Show Carrier Method ID: `mint_system.sale.view_order_form.show_carrier_method` ```xml @@ -4408,6 +4494,21 @@ ID: `mint_system.sale.view_order_tree.format_delivery_status` ``` Source: [snippets/sale.view_order_tree.format_delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.format_delivery_status.xml) +### Show Client Order Ref +ID: `mint_system.sale.view_order_tree.show_client_order_ref` +```xml + + + + + + + + + +``` +Source: [snippets/sale.view_order_tree.show_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.show_client_order_ref.xml) + ### Show Partner Shipping ID: `mint_system.sale.view_order_tree.show_partner_shipping` ```xml @@ -4467,6 +4568,20 @@ ID: `mint_system.sale.view_order_tree.x_product_uom_qty` ``` Source: [snippets/sale.view_order_tree.x_product_uom_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.x_product_uom_qty.xml) +### X Vst +ID: `mint_system.sale.view_order_tree.x_vst` +```xml + + + + + + + + +``` +Source: [snippets/sale.view_order_tree.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.x_vst.xml) + ## View Quotation Tree ### Add Client Order Ref ID: `mint_system.sale.view_quotation_tree.add_client_order_ref` @@ -4564,6 +4679,21 @@ ID: `mint_system.sale.view_quotation_tree.x_payment_state` Source: [snippets/sale.view_quotation_tree.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.x_payment_state.xml) ## View Sales Order Filter +### Add Filter Collective Invoice +ID: `mint_system.sale.view_sales_order_filter.add_filter_collective_invoice` +```xml + + + + + + + + + +``` +Source: [snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml) + ### Add Invoice Status ID: `mint_system.sale.view_sales_order_filter.add_invoice_status` ```xml diff --git a/snippets/sale.report_saleorder_document.add_commitment_date.xml b/snippets/sale.report_saleorder_document.add_commitment_date.xml new file mode 100644 index 00000000..2e3a01c3 --- /dev/null +++ b/snippets/sale.report_saleorder_document.add_commitment_date.xml @@ -0,0 +1,15 @@ + + + + + Geplantes Datum ETD + + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml b/snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml new file mode 100644 index 00000000..f77ed8a0 --- /dev/null +++ b/snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_order_form.move_client_order_ref.xml b/snippets/sale.view_order_form.move_client_order_ref.xml new file mode 100644 index 00000000..609f0d62 --- /dev/null +++ b/snippets/sale.view_order_form.move_client_order_ref.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_order_form.move_commitment_date.xml b/snippets/sale.view_order_form.move_commitment_date.xml new file mode 100644 index 00000000..f16fc532 --- /dev/null +++ b/snippets/sale.view_order_form.move_commitment_date.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.view_order_tree.show_client_order_ref.xml b/snippets/sale.view_order_tree.show_client_order_ref.xml new file mode 100644 index 00000000..39b5e5b6 --- /dev/null +++ b/snippets/sale.view_order_tree.show_client_order_ref.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/sale.view_order_tree.x_vst.xml b/snippets/sale.view_order_tree.x_vst.xml new file mode 100644 index 00000000..7e105b14 --- /dev/null +++ b/snippets/sale.view_order_tree.x_vst.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.md b/snippets/stock.md index 2231c652..4792b656 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -7290,6 +7290,36 @@ ID: `mint_system.stock.vpicktree.default_order_name` ``` Source: [snippets/stock.vpicktree.default_order_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.default_order_name.xml) +### Format Date Deadline +ID: `mint_system.stock.vpicktree.format_date_deadline` +```xml + + + + + date + + + + +``` +Source: [snippets/stock.vpicktree.format_date_deadline.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.format_date_deadline.xml) + +### Format Scheduled Date +ID: `mint_system.stock.vpicktree.format_scheduled_date` +```xml + + + + + date + + + + +``` +Source: [snippets/stock.vpicktree.format_scheduled_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.format_scheduled_date.xml) + ### Show Delivery Note ID: `mint_system.stock.vpicktree.show_delivery_note` ```xml diff --git a/snippets/stock.vpicktree.format_date_deadline.xml b/snippets/stock.vpicktree.format_date_deadline.xml new file mode 100644 index 00000000..66c44597 --- /dev/null +++ b/snippets/stock.vpicktree.format_date_deadline.xml @@ -0,0 +1,8 @@ + + + + + date + + + diff --git a/snippets/stock.vpicktree.format_scheduled_date.xml b/snippets/stock.vpicktree.format_scheduled_date.xml new file mode 100644 index 00000000..22229ef6 --- /dev/null +++ b/snippets/stock.vpicktree.format_scheduled_date.xml @@ -0,0 +1,8 @@ + + + + + date + + + From f420d66ced7536259fc37149c311452d18d40bcc Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Sat, 7 Oct 2023 12:41:56 +0200 Subject: [PATCH 112/147] ref --- addons/odoo_apps_partner | 2 +- addons/vertical_job_portal | 2 +- oca/dms | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/maintenance | 2 +- oca/survey | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner index 527d3065..b3acf774 160000 --- a/addons/odoo_apps_partner +++ b/addons/odoo_apps_partner @@ -1 +1 @@ -Subproject commit 527d306545b2b45d439bfe8d0c11d2d7a7edac1c +Subproject commit b3acf774b487f4620df00cd3069e48c715e0e71e diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 01d7be7a..87a8c26c 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 01d7be7a6c1b844940abdae6407b06a05261fc85 +Subproject commit 87a8c26ce44d716f40bd75f1701d3ea4e2a8217f diff --git a/oca/dms b/oca/dms index e4d60b2d..dc12b219 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit e4d60b2d3f0512b9b8477986bbea6cd778ee4154 +Subproject commit dc12b219e9f26151cc222fb9eb15d4121fa3a145 diff --git a/oca/hr-attendance b/oca/hr-attendance index 50ed427c..a313d1fc 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 50ed427cf94e26c8cef249b1173138b530fe9ac1 +Subproject commit a313d1fcd180504ed63fbc6c29c78b65c4936c56 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 2a5d0867..1a12f040 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 2a5d0867e11d47acde565347256bc26f76de61b6 +Subproject commit 1a12f04081e7266698aef31b9c7fcf5948f21bba diff --git a/oca/maintenance b/oca/maintenance index 9e247780..8b7a8312 160000 --- a/oca/maintenance +++ b/oca/maintenance @@ -1 +1 @@ -Subproject commit 9e2477805e625b01e967a98d1a1fbe1d9c245034 +Subproject commit 8b7a8312a28dc36e48ebdf572b98954349c26614 diff --git a/oca/survey b/oca/survey index 1b0314bf..973837ab 160000 --- a/oca/survey +++ b/oca/survey @@ -1 +1 @@ -Subproject commit 1b0314bfb14e293d6e6fe85dd0a481fbb8797c53 +Subproject commit 973837abedd80fa3b30ab8bacd03a9bb0ee1bdfa From 86e95e815fed879887a41a54499371473c589f73 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Sat, 7 Oct 2023 12:42:20 +0200 Subject: [PATCH 113/147] ref --- addons/odoo_apps_partner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner index b3acf774..b7e45269 160000 --- a/addons/odoo_apps_partner +++ b/addons/odoo_apps_partner @@ -1 +1 @@ -Subproject commit b3acf774b487f4620df00cd3069e48c715e0e71e +Subproject commit b7e4526959d107fbbbd67af1c289d807bf570445 From eda8f3f7e1142dddfabac0c6cc9b40142bf74b7f Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 9 Oct 2023 09:20:02 +0200 Subject: [PATCH 114/147] snippets --- snippets/account.view_account_list.show_deprecated.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snippets/account.view_account_list.show_deprecated.xml diff --git a/snippets/account.view_account_list.show_deprecated.xml b/snippets/account.view_account_list.show_deprecated.xml new file mode 100644 index 00000000..71554878 --- /dev/null +++ b/snippets/account.view_account_list.show_deprecated.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 6979fc069ed3230b60f44626a402ae6fbc686523 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 9 Oct 2023 11:37:09 +0200 Subject: [PATCH 115/147] rename snippet --- ...=> base.view_partner_tree.show_property_payment_term_id.xml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename snippets/{base.view_partner_tree.property_payment_term_id.xml => base.view_partner_tree.show_property_payment_term_id.xml} (70%) diff --git a/snippets/base.view_partner_tree.property_payment_term_id.xml b/snippets/base.view_partner_tree.show_property_payment_term_id.xml similarity index 70% rename from snippets/base.view_partner_tree.property_payment_term_id.xml rename to snippets/base.view_partner_tree.show_property_payment_term_id.xml index 047b44c3..2676d9dd 100644 --- a/snippets/base.view_partner_tree.property_payment_term_id.xml +++ b/snippets/base.view_partner_tree.show_property_payment_term_id.xml @@ -2,7 +2,7 @@ - + From 1a8b1a056331eb1582eac08f9e6341c0618f427f Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 9 Oct 2023 12:25:06 +0200 Subject: [PATCH 116/147] enable payment provider --- snippets/payment.payment_provider_list.enable_create.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snippets/payment.payment_provider_list.enable_create.xml diff --git a/snippets/payment.payment_provider_list.enable_create.xml b/snippets/payment.payment_provider_list.enable_create.xml new file mode 100644 index 00000000..b5003299 --- /dev/null +++ b/snippets/payment.payment_provider_list.enable_create.xml @@ -0,0 +1,8 @@ + + + + + 1 + + + From 125d0a5f501604b12f2ac491871c6136f3d84e19 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 9 Oct 2023 14:07:28 +0200 Subject: [PATCH 117/147] add purchase_worflow submodule --- .gitmodules | 4 ++++ addons/purchase_workflow | 1 + task | 9 +++++---- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 160000 addons/purchase_workflow diff --git a/.gitmodules b/.gitmodules index 0131c506..882f87a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -230,3 +230,7 @@ path = addons/account_financial_reporting url = git@github.com:Mint-System/Odoo-Apps-Account-Financial-Reporting.git branch = 16.0 +[submodule "addons/purchase_workflow"] + path = addons/purchase_workflow + url = git@github.com:Mint-System/Odoo-Apps-Purchase-Workflow.git + branch = 16.0 diff --git a/addons/purchase_workflow b/addons/purchase_workflow new file mode 160000 index 00000000..31bf1973 --- /dev/null +++ b/addons/purchase_workflow @@ -0,0 +1 @@ +Subproject commit 31bf197369c24bc25afecec4f0a14ae34d9a02de diff --git a/task b/task index 12cc632f..bda99f37 100755 --- a/task +++ b/task @@ -305,15 +305,16 @@ function lint-module() { find "$1" -type d -exec chmod u=rwx,go=rx {} \; find "$1" -type f -exec chmod u=rw,go=r {} \; - echo "Run pre-commit in $1" - cd "$1" || exit - pre-commit run --files ./* - echo "Update index.html" + cd "$1" || exit rst2html5 README.rst static/description/index.html echo "Stage changes" git add . + + echo "Run pre-commit in $1" + cd .. || exit + pre-commit } function update-module() { From 2315e944aca3a5bedf0a21efe677c0a330763ccd Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 9 Oct 2023 18:46:45 +0200 Subject: [PATCH 118/147] ref --- addons/purchase_workflow | 2 +- addons/sale_workflow | 2 +- addons/vertical_job_portal | 2 +- enterprise | 2 +- oca/account-financial-reporting | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/account-reconcile | 2 +- oca/bank-payment | 2 +- oca/brand | 2 +- oca/business-requirement | 2 +- oca/contract | 2 +- oca/credit-control | 2 +- oca/crm | 2 +- oca/iot | 2 +- oca/management-system | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-reporting | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-backend | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/social | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/web | 2 +- oca/website | 2 +- odoo | 2 +- themes | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/addons/purchase_workflow b/addons/purchase_workflow index 31bf1973..05738b56 160000 --- a/addons/purchase_workflow +++ b/addons/purchase_workflow @@ -1 +1 @@ -Subproject commit 31bf197369c24bc25afecec4f0a14ae34d9a02de +Subproject commit 05738b568c82c5bbf43d9228efc5dfacbcc93388 diff --git a/addons/sale_workflow b/addons/sale_workflow index 956a0e20..ce5ed55b 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit 956a0e20aaaccffdec03b18aecc27e4ebcdf0457 +Subproject commit ce5ed55bc4a0447268fc3137ae322cab77ff0667 diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index 87a8c26c..c5f726e0 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit 87a8c26ce44d716f40bd75f1701d3ea4e2a8217f +Subproject commit c5f726e0f2cf955b6a1bc53f9000119d2ffae57c diff --git a/enterprise b/enterprise index ab43f9db..637ac73a 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit ab43f9dba7755c8ec6846a0e6b1a81ae828e15c1 +Subproject commit 637ac73acf41bbd2176a69e747268e8aa0d98f5e diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting index 89144fe1..eba0cc68 160000 --- a/oca/account-financial-reporting +++ b/oca/account-financial-reporting @@ -1 +1 @@ -Subproject commit 89144fe180ca526d3382ee7bb159b99e39602c68 +Subproject commit eba0cc689c6d8ddbf272d2e648c14a302d9e8fb8 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index a733d0f5..07ba4aa8 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit a733d0f596a4532dc9a72530d9a40182abaf4d1d +Subproject commit 07ba4aa88b23b1730eaae59ab69e6b8016beafb7 diff --git a/oca/account-invoicing b/oca/account-invoicing index 23fe001c..8309948c 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit 23fe001c4ccbaeba485443363e4e49f47edb4de5 +Subproject commit 8309948c9b1b48791895690d270b9107a8426e91 diff --git a/oca/account-reconcile b/oca/account-reconcile index d075695e..1af387fd 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit d075695e9e85df84cef49eb675dfed078af8293e +Subproject commit 1af387fd1291bcde85f6ae6f56cfb6d8f3128c56 diff --git a/oca/bank-payment b/oca/bank-payment index 79a2c01d..6683de5b 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 79a2c01daed34c8c9236a53a291e55d2ad6bc736 +Subproject commit 6683de5b115d11c0913152c4dcaab5e7e0b897f5 diff --git a/oca/brand b/oca/brand index f6808635..c37fd555 160000 --- a/oca/brand +++ b/oca/brand @@ -1 +1 @@ -Subproject commit f68086359c1cdd1095ba02ceb6deaadd6567cdf8 +Subproject commit c37fd5557de15475ab996bcb3b9a5931ef5eb40f diff --git a/oca/business-requirement b/oca/business-requirement index 4992a307..8cfb5f4b 160000 --- a/oca/business-requirement +++ b/oca/business-requirement @@ -1 +1 @@ -Subproject commit 4992a307ae33b26951a326d75604428c3e4a7ab6 +Subproject commit 8cfb5f4b405c88d98429a58870c474582fdbebb6 diff --git a/oca/contract b/oca/contract index bc757fda..a628dccc 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit bc757fda1453204285cf80ba8314d0a4f58cceb0 +Subproject commit a628dcccfabaddf64ee9d187feeef8ec7ba38e63 diff --git a/oca/credit-control b/oca/credit-control index 59c8080e..2867de74 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 59c8080e99b077286c221ab60ea9e5d4f6697aff +Subproject commit 2867de743754bb191421f3cd398f514d6ff1515d diff --git a/oca/crm b/oca/crm index 174e5c1b..9fd2d20f 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit 174e5c1be7af385c3851b85db2af9a377e6a4383 +Subproject commit 9fd2d20ff0134912b4c44586b27cb6858f26c096 diff --git a/oca/iot b/oca/iot index e296f0a7..f85c6f99 160000 --- a/oca/iot +++ b/oca/iot @@ -1 +1 @@ -Subproject commit e296f0a78c12eb41198e284f4694e3aa4ef167c6 +Subproject commit f85c6f993625bf1ac0f6e62779f919e6f5ae6273 diff --git a/oca/management-system b/oca/management-system index 9c628e40..b72776d9 160000 --- a/oca/management-system +++ b/oca/management-system @@ -1 +1 @@ -Subproject commit 9c628e405bacc17263c226a97fead9405dae928a +Subproject commit b72776d95c12d996347d59496a9fb6bf548a9bdd diff --git a/oca/manufacture b/oca/manufacture index 68badd39..e3f5b30a 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 68badd398ed5e66ad94deccf7980a6cdfbbcebb3 +Subproject commit e3f5b30acd7ef17aeb2c5940a5b9deb8427320af diff --git a/oca/partner-contact b/oca/partner-contact index 9363a098..4522b94d 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 9363a098c1c30913fa992b54d630b282db186500 +Subproject commit 4522b94d17a685debffdbd605806865ce78c493e diff --git a/oca/product-attribute b/oca/product-attribute index 0fc67c66..38feb14c 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 0fc67c66f906147b9063850af80817b2a607addf +Subproject commit 38feb14c14a4eb5640fc4294a9a8b28a98c54d07 diff --git a/oca/project b/oca/project index 7ea119e8..73e38c25 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 7ea119e88705f8eff3f376726bab4727db14b427 +Subproject commit 73e38c255bedc61dd7638dbe209ab3ff1645718b diff --git a/oca/purchase-workflow b/oca/purchase-workflow index a2549918..d8bd8e00 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit a25499180877294645664b9e1d238baa69ca5b0c +Subproject commit d8bd8e0066fb14c8af6422fa7a297106dd0c2e23 diff --git a/oca/reporting-engine b/oca/reporting-engine index e73b7c21..b36d88b7 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit e73b7c2176dfeec2eb592fb9d18818c2aa8d5627 +Subproject commit b36d88b7a903e6fe54dfe5a9e9a610a28d9566e7 diff --git a/oca/rest-framework b/oca/rest-framework index 4289428b..dd3f4338 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit 4289428bbea2102232a3a67af92b22d1c5238eb1 +Subproject commit dd3f43380aecc052af686431596b5489fb52f16f diff --git a/oca/sale-reporting b/oca/sale-reporting index 8524cbbf..3d8e8492 160000 --- a/oca/sale-reporting +++ b/oca/sale-reporting @@ -1 +1 @@ -Subproject commit 8524cbbfcf6266e5f38e8e43976b19892e78142b +Subproject commit 3d8e84923a59e8dc1fff538bb08798faaa263f46 diff --git a/oca/sale-workflow b/oca/sale-workflow index 35a84366..7f42a671 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 35a84366dfa4dfe94dcdc64c5277283091593684 +Subproject commit 7f42a67171392e0654760d94d0326a78469c3dce diff --git a/oca/server-auth b/oca/server-auth index 36a4cfca..0513ca28 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit 36a4cfcaaaaecf35d5f1387ddaf8e67ea1c9fc6c +Subproject commit 0513ca281fdaf1d2e731a765884528687d82db0c diff --git a/oca/server-backend b/oca/server-backend index 20851676..f20944fb 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 208516768f24ac12833443e47d7d86a84c381bc2 +Subproject commit f20944fb8d5b4034bb4a603ee518358c17ff1ca7 diff --git a/oca/server-tools b/oca/server-tools index 41b9c885..88b0140d 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 41b9c8850c9b4fa4ae983772d3d419836c64d8a1 +Subproject commit 88b0140db8b288b501e73924adecba026eb07a87 diff --git a/oca/server-ux b/oca/server-ux index cb7c10e3..a38dd9c7 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit cb7c10e30e173ff0594cccc7056919e186eff132 +Subproject commit a38dd9c702bbc130a4cada2d0dc422640699a64a diff --git a/oca/social b/oca/social index 8d25f25e..3e97c9a6 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit 8d25f25e8d9bd79b4afcb5559d915c745e523598 +Subproject commit 3e97c9a637820de88cbcfa9f0be1c40d1b74be84 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 2cb4cce8..30f2adbe 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 2cb4cce886f5ef50dcd718f4b83cd2db184619f3 +Subproject commit 30f2adbe72e1c4a16fa57aa3364797fdb48dd42f diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index 4b0301ca..3827d2dc 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit 4b0301ca409ade61958fd09d50a10209d064b6c5 +Subproject commit 3827d2dc5e7ac19b38f5c9084ab08080c721fde2 diff --git a/oca/web b/oca/web index bbff8fbb..9a699f7e 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit bbff8fbbc996cdf811ab34669c8f01ac65d3875e +Subproject commit 9a699f7ec077b9831b534eb274c20308b3d1c614 diff --git a/oca/website b/oca/website index 89529a8f..5b846f63 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit 89529a8fe23a069637bb1b654201d68126abc54e +Subproject commit 5b846f635dfd3a581e496d126c6f20a2b47bca60 diff --git a/odoo b/odoo index 22ccb0e7..62153ba5 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 22ccb0e795637864706a9933a23f605590a1f36e +Subproject commit 62153ba5c3f3fdbeb6bef644a560f30d16261482 diff --git a/themes b/themes index 0dddab7e..c3d2f03d 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit 0dddab7eceb17ed665cc8fc0adec2b05656f3393 +Subproject commit c3d2f03db6eb54c8d6a82a1dd45155b779350384 From 282632bdd123aaee12aff06a4574ca19d015ec99 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 10 Oct 2023 14:11:03 +0200 Subject: [PATCH 119/147] snippets --- snippets/sale.view_order_form.move_client_order_ref.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snippets/sale.view_order_form.move_client_order_ref.xml b/snippets/sale.view_order_form.move_client_order_ref.xml index 609f0d62..826aa63d 100644 --- a/snippets/sale.view_order_form.move_client_order_ref.xml +++ b/snippets/sale.view_order_form.move_client_order_ref.xml @@ -2,8 +2,9 @@ - + + \ No newline at end of file From 873014bcd13e5b9d5e373d6f4d4b92fce89b6522 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 10 Oct 2023 18:05:50 +0200 Subject: [PATCH 120/147] vat snippet --- .../account.report_invoice_document.force_company_vat.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snippets/account.report_invoice_document.force_company_vat.xml diff --git a/snippets/account.report_invoice_document.force_company_vat.xml b/snippets/account.report_invoice_document.force_company_vat.xml new file mode 100644 index 00000000..4b73b682 --- /dev/null +++ b/snippets/account.report_invoice_document.force_company_vat.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 62596559f0ea556d70866618041eb1c37b564601 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 10 Oct 2023 18:34:15 +0200 Subject: [PATCH 121/147] update readme --- addons/purchase_workflow | 2 +- addons/sale_workflow | 2 +- addons/vertical_saas | 2 +- enterprise | 2 +- oca/account-closing | 2 +- oca/account-financial-reporting | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/account-reconcile | 2 +- oca/bank-payment | 2 +- oca/bank-statement-import | 2 +- oca/brand | 2 +- oca/community-data-files | 2 +- oca/connector | 2 +- oca/contract | 2 +- oca/credit-control | 2 +- oca/crm | 2 +- oca/edi | 2 +- oca/hr | 2 +- oca/iot | 2 +- oca/knowledge | 2 +- oca/management-system | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/sale-reporting | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-backend | 2 +- oca/server-env | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/social | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/timesheet | 2 +- oca/web | 2 +- oca/website | 2 +- odoo | 2 +- ...partner_form.move_property_product_pricelist.xml | 13 +++++++++++++ task | 4 ++-- 44 files changed, 57 insertions(+), 44 deletions(-) create mode 100644 snippets/base.view_partner_form.move_property_product_pricelist.xml diff --git a/addons/purchase_workflow b/addons/purchase_workflow index 05738b56..73506478 160000 --- a/addons/purchase_workflow +++ b/addons/purchase_workflow @@ -1 +1 @@ -Subproject commit 05738b568c82c5bbf43d9228efc5dfacbcc93388 +Subproject commit 7350647884fa1743faf1a022a5cf2be163c25904 diff --git a/addons/sale_workflow b/addons/sale_workflow index ce5ed55b..968127ca 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit ce5ed55bc4a0447268fc3137ae322cab77ff0667 +Subproject commit 968127ca9eb6af4b43bcd0c2e096edf3f3a04e4d diff --git a/addons/vertical_saas b/addons/vertical_saas index 46dee1d6..90556651 160000 --- a/addons/vertical_saas +++ b/addons/vertical_saas @@ -1 +1 @@ -Subproject commit 46dee1d6f0a606e21450322deb8690c718c6754b +Subproject commit 90556651f7b2542f398e18bf8f6cefe95d090362 diff --git a/enterprise b/enterprise index 637ac73a..9a62b440 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 637ac73acf41bbd2176a69e747268e8aa0d98f5e +Subproject commit 9a62b440f9b55bde0f398a03e04b8e9d8dbfe8ad diff --git a/oca/account-closing b/oca/account-closing index a8a989c4..e5e0bca4 160000 --- a/oca/account-closing +++ b/oca/account-closing @@ -1 +1 @@ -Subproject commit a8a989c45dcbfc742a9aa9368b7598386d081b21 +Subproject commit e5e0bca4cf5f65652b934d9ed2eb460790b97ca4 diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting index eba0cc68..325048b7 160000 --- a/oca/account-financial-reporting +++ b/oca/account-financial-reporting @@ -1 +1 @@ -Subproject commit eba0cc689c6d8ddbf272d2e648c14a302d9e8fb8 +Subproject commit 325048b7d2a21b3b1c20c307bf3b176d1043fddd diff --git a/oca/account-financial-tools b/oca/account-financial-tools index 07ba4aa8..75fc69fc 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit 07ba4aa88b23b1730eaae59ab69e6b8016beafb7 +Subproject commit 75fc69fc2cc9b7745ed6b280a6de54412a3a7655 diff --git a/oca/account-invoicing b/oca/account-invoicing index 8309948c..505ff14d 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit 8309948c9b1b48791895690d270b9107a8426e91 +Subproject commit 505ff14d14b8a2105dcd88324196ec14e280a7f3 diff --git a/oca/account-reconcile b/oca/account-reconcile index 1af387fd..35f68c6f 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit 1af387fd1291bcde85f6ae6f56cfb6d8f3128c56 +Subproject commit 35f68c6fc062b24d335048a829cca5ba1f27a595 diff --git a/oca/bank-payment b/oca/bank-payment index 6683de5b..5ad18aa6 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 6683de5b115d11c0913152c4dcaab5e7e0b897f5 +Subproject commit 5ad18aa626878199bcb7c15d1e34073415a326d9 diff --git a/oca/bank-statement-import b/oca/bank-statement-import index c1b656ee..9aeb37ed 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit c1b656eeaf145adf9bb31ee32ce6a080625724b7 +Subproject commit 9aeb37eda45ae05b81304b3c46814c5f082f8c24 diff --git a/oca/brand b/oca/brand index c37fd555..870e5d8f 160000 --- a/oca/brand +++ b/oca/brand @@ -1 +1 @@ -Subproject commit c37fd5557de15475ab996bcb3b9a5931ef5eb40f +Subproject commit 870e5d8f42aec7e943fb5569ef48eef68dfde33f diff --git a/oca/community-data-files b/oca/community-data-files index 20ebec51..60b34ce7 160000 --- a/oca/community-data-files +++ b/oca/community-data-files @@ -1 +1 @@ -Subproject commit 20ebec51c339d53b2f067674cec0afb7e362e52a +Subproject commit 60b34ce713701237fd28d1aee53ec7d453b4933b diff --git a/oca/connector b/oca/connector index 376704d3..46effeac 160000 --- a/oca/connector +++ b/oca/connector @@ -1 +1 @@ -Subproject commit 376704d3f17d9d8c828b83503cb250501d52a1b2 +Subproject commit 46effeac5a3c879510e4d50213f0c89dfc455ea5 diff --git a/oca/contract b/oca/contract index a628dccc..360c25f3 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit a628dcccfabaddf64ee9d187feeef8ec7ba38e63 +Subproject commit 360c25f3945daa1a23029071d1cc083e8d0d3842 diff --git a/oca/credit-control b/oca/credit-control index 2867de74..10cb8a9e 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 2867de743754bb191421f3cd398f514d6ff1515d +Subproject commit 10cb8a9e647b0bcef0e33d83a4d1ac2b483ab70e diff --git a/oca/crm b/oca/crm index 9fd2d20f..3474b985 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit 9fd2d20ff0134912b4c44586b27cb6858f26c096 +Subproject commit 3474b98511d8a0a80be07ffd7f1816a48b56430b diff --git a/oca/edi b/oca/edi index f48df3a8..2eaad999 160000 --- a/oca/edi +++ b/oca/edi @@ -1 +1 @@ -Subproject commit f48df3a871a9a8e302a61a24f75b493fadac1115 +Subproject commit 2eaad999666fd1688e0482c015e001744ce11785 diff --git a/oca/hr b/oca/hr index c5a4b919..2503296e 160000 --- a/oca/hr +++ b/oca/hr @@ -1 +1 @@ -Subproject commit c5a4b91901b221ae5d72eb12cdee233c7d82b84d +Subproject commit 2503296ecbb20fbf2890b0df6340545f4d30d6b2 diff --git a/oca/iot b/oca/iot index f85c6f99..5fb91e68 160000 --- a/oca/iot +++ b/oca/iot @@ -1 +1 @@ -Subproject commit f85c6f993625bf1ac0f6e62779f919e6f5ae6273 +Subproject commit 5fb91e68ee2caa9d4724357dfb3b978b91c6dd09 diff --git a/oca/knowledge b/oca/knowledge index 0c610f10..acebd9ca 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit 0c610f103a1b047f73d685b1719960e5fba61c78 +Subproject commit acebd9ca3be5755abfcd62b2603795c55a262660 diff --git a/oca/management-system b/oca/management-system index b72776d9..33eaad2d 160000 --- a/oca/management-system +++ b/oca/management-system @@ -1 +1 @@ -Subproject commit b72776d95c12d996347d59496a9fb6bf548a9bdd +Subproject commit 33eaad2d980501ac6ad4b216f4d98ec3d422f04f diff --git a/oca/manufacture b/oca/manufacture index e3f5b30a..853c18f5 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit e3f5b30acd7ef17aeb2c5940a5b9deb8427320af +Subproject commit 853c18f54e8c1fed2727ff58159bfba8100696cf diff --git a/oca/partner-contact b/oca/partner-contact index 4522b94d..4dcb2576 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 4522b94d17a685debffdbd605806865ce78c493e +Subproject commit 4dcb25763a85658b602a6a2464deb7cb84f38f3c diff --git a/oca/product-attribute b/oca/product-attribute index 38feb14c..3c7a16cd 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 38feb14c14a4eb5640fc4294a9a8b28a98c54d07 +Subproject commit 3c7a16cd85897c375d03ae113bacd7d8c81ca133 diff --git a/oca/project b/oca/project index 73e38c25..792a40b7 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 73e38c255bedc61dd7638dbe209ab3ff1645718b +Subproject commit 792a40b7092e9a7e78a8cdb6c08f25381d64e13f diff --git a/oca/purchase-workflow b/oca/purchase-workflow index d8bd8e00..07de3b3c 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit d8bd8e0066fb14c8af6422fa7a297106dd0c2e23 +Subproject commit 07de3b3ca6ee00aa2c793e36e9bb040669eea047 diff --git a/oca/reporting-engine b/oca/reporting-engine index b36d88b7..39097022 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit b36d88b7a903e6fe54dfe5a9e9a610a28d9566e7 +Subproject commit 390970227f1842c254de01e6483df280f8358ba3 diff --git a/oca/sale-reporting b/oca/sale-reporting index 3d8e8492..91209558 160000 --- a/oca/sale-reporting +++ b/oca/sale-reporting @@ -1 +1 @@ -Subproject commit 3d8e84923a59e8dc1fff538bb08798faaa263f46 +Subproject commit 91209558d47455814f6209170a14b81889cd30a4 diff --git a/oca/sale-workflow b/oca/sale-workflow index 7f42a671..77eb680c 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 7f42a67171392e0654760d94d0326a78469c3dce +Subproject commit 77eb680c727f56175b7d19cae8d8ea50d6b3039e diff --git a/oca/server-auth b/oca/server-auth index 0513ca28..018a8de5 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit 0513ca281fdaf1d2e731a765884528687d82db0c +Subproject commit 018a8de5b0db0ed75c648d1e1136eb1046c1b80c diff --git a/oca/server-backend b/oca/server-backend index f20944fb..3890046f 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit f20944fb8d5b4034bb4a603ee518358c17ff1ca7 +Subproject commit 3890046f3565850e0cc733c20fe0f2928e0cc091 diff --git a/oca/server-env b/oca/server-env index e282465e..c32e1200 160000 --- a/oca/server-env +++ b/oca/server-env @@ -1 +1 @@ -Subproject commit e282465e80bba48da57f182151aa9dd373e2bfb6 +Subproject commit c32e12002481847854375db8077910e6848b419a diff --git a/oca/server-tools b/oca/server-tools index 88b0140d..3eaafd9c 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 88b0140db8b288b501e73924adecba026eb07a87 +Subproject commit 3eaafd9cd4eed0e08a594e1f07d290ee28d06e32 diff --git a/oca/server-ux b/oca/server-ux index a38dd9c7..83de61c2 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit a38dd9c702bbc130a4cada2d0dc422640699a64a +Subproject commit 83de61c232b5faf19c0fe5c1a3262cd57d5cb017 diff --git a/oca/social b/oca/social index 3e97c9a6..11605ff6 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit 3e97c9a637820de88cbcfa9f0be1c40d1b74be84 +Subproject commit 11605ff6ad633fc9f059c70f0dee065794fce341 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 30f2adbe..4e8a9aec 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 30f2adbe72e1c4a16fa57aa3364797fdb48dd42f +Subproject commit 4e8a9aec7c0aa1eb85aa56f087b47420c09aadf2 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index 3827d2dc..b5b7dfeb 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit 3827d2dc5e7ac19b38f5c9084ab08080c721fde2 +Subproject commit b5b7dfeb44c182309a0b7d7abd1847a8437319b1 diff --git a/oca/timesheet b/oca/timesheet index 6b8b2d83..9804e415 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit 6b8b2d83d6fabbd45b42413eb7c904c1d6914162 +Subproject commit 9804e415392e90e6070aefc28bf3f5a69fe354fb diff --git a/oca/web b/oca/web index 9a699f7e..9edd0d73 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 9a699f7ec077b9831b534eb274c20308b3d1c614 +Subproject commit 9edd0d73f646abfd6ec97e6424723db8364fed1d diff --git a/oca/website b/oca/website index 5b846f63..1dec2228 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit 5b846f635dfd3a581e496d126c6f20a2b47bca60 +Subproject commit 1dec2228d48aa8a659398da3fe77c249a5c8aa56 diff --git a/odoo b/odoo index 62153ba5..ae9f6019 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 62153ba5c3f3fdbeb6bef644a560f30d16261482 +Subproject commit ae9f60195043b1fbfc3798370be31ebc26633efb diff --git a/snippets/base.view_partner_form.move_property_product_pricelist.xml b/snippets/base.view_partner_form.move_property_product_pricelist.xml new file mode 100644 index 00000000..f153f7c4 --- /dev/null +++ b/snippets/base.view_partner_form.move_property_product_pricelist.xml @@ -0,0 +1,13 @@ + + + + + + + +
          +

          Preislisten werden auf dem Unternehmen verwaltet.

          +
          +           + +           diff --git a/task b/task index bda99f37..4ebb7582 100755 --- a/task +++ b/task @@ -312,9 +312,9 @@ function lint-module() { echo "Stage changes" git add . - echo "Run pre-commit in $1" cd .. || exit - pre-commit + echo "Run pre-commit in $PWD" + pre-commit run --all-files } function update-module() { From 2a38e223c57a5e1d1977cdc88ea0e2e604233d8f Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 11 Oct 2023 10:29:15 +0200 Subject: [PATCH 122/147] ref --- addons/product_attribute | 2 +- addons/sale_workflow | 2 +- oca/project | 2 +- oca/timesheet | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/product_attribute b/addons/product_attribute index f4e9da51..5ef9026d 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit f4e9da51f8b6582de3fc186a7a832ed6d112b123 +Subproject commit 5ef9026d310b0939e2b742a3571b604642186b5f diff --git a/addons/sale_workflow b/addons/sale_workflow index 968127ca..386284a8 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit 968127ca9eb6af4b43bcd0c2e096edf3f3a04e4d +Subproject commit 386284a8dc89a1e4c166543cddd18ad22c1a9289 diff --git a/oca/project b/oca/project index 792a40b7..70d0955e 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 792a40b7092e9a7e78a8cdb6c08f25381d64e13f +Subproject commit 70d0955ee54aac89318355a90c9f898743a6a6b0 diff --git a/oca/timesheet b/oca/timesheet index 9804e415..e6883c3d 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit 9804e415392e90e6070aefc28bf3f5a69fe354fb +Subproject commit e6883c3dac2ab6c43a3a2fde8135079f48e3f902 From 5b3faad4532368cd32ac2cdb45a0d8952a5d5cb4 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 11 Oct 2023 18:20:56 +0200 Subject: [PATCH 123/147] sync --- .vuepress/sidebar.js | 2 +- snippets.md | 1 + snippets/account.md | 109 ++++++++++++++---- ...e_document.replace_product_description.xml | 33 ++++-- snippets/base.md | 35 ++++++ ..._partner_tree.property_payment_term_id.xml | 8 ++ ...iew_form.add_action_time_off_dashboard.xml | 17 +++ snippets/ir_model.md | 22 ++++ ...model.stock_picking.x_client_order_ref.xml | 16 +++ ...h.l10n_ch_swissqr_template.style_moser.xml | 19 +++ snippets/l10n_ch.md | 25 ++++ ....mail_activity_view_tree.activity_view.xml | 17 +++ .../mrp.label_production_view_pdf.basis57.xml | 2 +- snippets/payment.md | 17 +++ snippets/sale.md | 3 +- ...k.label_transfer_template_view.basis57.xml | 18 +-- snippets/stock.md | 26 +++++ ...k.view_picking_form.x_client_order_ref.xml | 8 ++ .../stock.vpicktree.x_client_order_ref.xml | 6 + 19 files changed, 336 insertions(+), 48 deletions(-) create mode 100644 snippets/base.view_partner_tree.property_payment_term_id.xml create mode 100644 snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml create mode 100644 snippets/ir_model.stock_picking.x_client_order_ref.xml create mode 100644 snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml create mode 100644 snippets/mail.mail_activity_view_tree.activity_view.xml create mode 100644 snippets/payment.md create mode 100644 snippets/stock.view_picking_form.x_client_order_ref.xml create mode 100644 snippets/stock.vpicktree.x_client_order_ref.xml diff --git a/.vuepress/sidebar.js b/.vuepress/sidebar.js index ccd93562..ee486008 100644 --- a/.vuepress/sidebar.js +++ b/.vuepress/sidebar.js @@ -1 +1 @@ -export default ['/snippets/account.md','/snippets/account_asset.md','/snippets/account_budget.md','/snippets/account_financial_report.md','/snippets/account_followup.md','/snippets/account_journal_items_report.md','/snippets/account_sale_timesheet_report.md','/snippets/agreement.md','/snippets/agreement_legal.md','/snippets/base.md','/snippets/business_requirement.md','/snippets/calendar.md','/snippets/certificate_planer.md','/snippets/contract.md','/snippets/crm.md','/snippets/crm_iap_lead_enrich.md','/snippets/delivery.md','/snippets/digest.md','/snippets/fleet.md','/snippets/gio_payroll_custom.md','/snippets/helpdesk.md','/snippets/hr.md','/snippets/hr_attendance.md','/snippets/hr_contract.md','/snippets/hr_expense.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/industry_fsm.md','/snippets/industry_fsm_sale.md','/snippets/ir_model.md','/snippets/ir_ui_view.md','/snippets/l10n_ch.md','/snippets/l10n_ch_qr_isr_invoice_import.md','/snippets/mail.md','/snippets/mail_activity_board.md','/snippets/mrp.md','/snippets/mrp_account.md','/snippets/mrp_workorder.md','/snippets/portal.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/project_enterprise.md','/snippets/purchase.md','/snippets/purchase_requisition.md','/snippets/purchase_requisition_send.md','/snippets/res_groups.md','/snippets/sale.md','/snippets/sale_blanket_order.md','/snippets/sale_management.md','/snippets/sale_margin.md','/snippets/sale_order_contact_person.md','/snippets/sale_order_line_date.md','/snippets/sale_order_picking_note.md','/snippets/sale_partner_incoterm.md','/snippets/sale_product_set.md','/snippets/sale_subscription.md','/snippets/stock.md','/snippets/stock_account.md','/snippets/stock_delivery_note.md','/snippets/survey.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',] +export default ['/snippets/account.md','/snippets/account_asset.md','/snippets/account_budget.md','/snippets/account_financial_report.md','/snippets/account_followup.md','/snippets/account_journal_items_report.md','/snippets/account_sale_timesheet_report.md','/snippets/agreement.md','/snippets/agreement_legal.md','/snippets/base.md','/snippets/business_requirement.md','/snippets/calendar.md','/snippets/certificate_planer.md','/snippets/contract.md','/snippets/crm.md','/snippets/crm_iap_lead_enrich.md','/snippets/delivery.md','/snippets/digest.md','/snippets/fleet.md','/snippets/gio_payroll_custom.md','/snippets/helpdesk.md','/snippets/hr.md','/snippets/hr_attendance.md','/snippets/hr_contract.md','/snippets/hr_expense.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/industry_fsm.md','/snippets/industry_fsm_sale.md','/snippets/ir_model.md','/snippets/ir_ui_view.md','/snippets/l10n_ch.md','/snippets/l10n_ch_qr_isr_invoice_import.md','/snippets/mail.md','/snippets/mail_activity_board.md','/snippets/mrp.md','/snippets/mrp_account.md','/snippets/mrp_workorder.md','/snippets/payment.md','/snippets/portal.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/project_enterprise.md','/snippets/purchase.md','/snippets/purchase_requisition.md','/snippets/purchase_requisition_send.md','/snippets/res_groups.md','/snippets/sale.md','/snippets/sale_blanket_order.md','/snippets/sale_management.md','/snippets/sale_margin.md','/snippets/sale_order_contact_person.md','/snippets/sale_order_line_date.md','/snippets/sale_order_picking_note.md','/snippets/sale_partner_incoterm.md','/snippets/sale_product_set.md','/snippets/sale_subscription.md','/snippets/stock.md','/snippets/stock_account.md','/snippets/stock_delivery_note.md','/snippets/survey.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',] diff --git a/snippets.md b/snippets.md index 7dbf7ca0..50c2da28 100644 --- a/snippets.md +++ b/snippets.md @@ -41,6 +41,7 @@ In Odoo everything is described as an XML document. Snippets are modificatio ## [Mrp](snippets/mrp.md) ## [Mrp Account](snippets/mrp_account.md) ## [Mrp Workorder](snippets/mrp_workorder.md) +## [Payment](snippets/payment.md) ## [Portal](snippets/portal.md) ## [Printnode Base](snippets/printnode_base.md) ## [Product](snippets/product.md) diff --git a/snippets/account.md b/snippets/account.md index b0cfe216..f2aa2740 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -492,6 +492,20 @@ ID: `mint_system.account.report_invoice_document.display_shipping_address` ``` Source: [snippets/account.report_invoice_document.display_shipping_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.display_shipping_address.xml) +### Force Company Vat +ID: `mint_system.account.report_invoice_document.force_company_vat` +```xml + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.force_company_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.force_company_vat.xml) + ### Format Address Blocks ID: `mint_system.account.report_invoice_document.format_address_blocks` ```xml @@ -1690,19 +1704,28 @@ ID: `mint_system.account.report_invoice_document.replace_product_description` - - - - - - - - - - - + + + + + + + + + + + - + + + ``` @@ -3215,6 +3238,20 @@ ID: `mint_system.account.report_invoice_document.display_shipping_address` ``` Source: [snippets/account.report_invoice_document.display_shipping_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.display_shipping_address.xml) +### Force Company Vat +ID: `mint_system.account.report_invoice_document.force_company_vat` +```xml + + + + + + + + +``` +Source: [snippets/account.report_invoice_document.force_company_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.force_company_vat.xml) + ### Format Address Blocks ID: `mint_system.account.report_invoice_document.format_address_blocks` ```xml @@ -4413,19 +4450,28 @@ ID: `mint_system.account.report_invoice_document.replace_product_description` - - - - - - - - - - - + + + + + + + + + + + - + + + ``` @@ -5469,6 +5515,21 @@ ID: `mint_system.account.res_config_settings_view_form.domain_expense_currency_e ``` Source: [snippets/account.res_config_settings_view_form.domain_expense_currency_exchange_account_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.res_config_settings_view_form.domain_expense_currency_exchange_account_id.xml) +## View Account List +### Show Deprecated +ID: `mint_system.account.view_account_list.show_deprecated` +```xml + + + + + + + + +``` +Source: [snippets/account.view_account_list.show_deprecated.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_account_list.show_deprecated.xml) + ## View Account Move Filter ### X Account Codes ID: `mint_system.account.view_account_move_filter.x_account_codes` diff --git a/snippets/account.report_invoice_document.replace_product_description.xml b/snippets/account.report_invoice_document.replace_product_description.xml index 5948bdee..e779a36d 100644 --- a/snippets/account.report_invoice_document.replace_product_description.xml +++ b/snippets/account.report_invoice_document.replace_product_description.xml @@ -1,18 +1,27 @@ - - - - - - - - - - - + + + + + + + + + + + - + + + \ No newline at end of file diff --git a/snippets/base.md b/snippets/base.md index faede5fe..0569cfe7 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -304,6 +304,26 @@ ID: `mint_system.base.view_partner_form.move_company_registry` ``` Source: [snippets/base.view_partner_form.move_company_registry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_company_registry.xml) +### Move Property Product Pricelist +ID: `mint_system.base.view_partner_form.move_property_product_pricelist` +```xml + + + + + + + +
          +

          Preislisten werden auf dem Unternehmen verwaltet.

          +
          +           + +           + +``` +Source: [snippets/base.view_partner_form.move_property_product_pricelist.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_property_product_pricelist.xml) + ### Move Ref ID: `mint_system.base.view_partner_form.move_ref` ```xml @@ -632,6 +652,21 @@ ID: `mint_system.base.view_partner_tree.show_industry` ``` Source: [snippets/base.view_partner_tree.show_industry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_industry.xml) +### Show Property Payment Term Id +ID: `mint_system.base.view_partner_tree.show_property_payment_term_id` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_tree.show_property_payment_term_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_property_payment_term_id.xml) + ### Show Property Product Pricelist ID: `mint_system.base.view_partner_tree.show_property_product_pricelist` ```xml diff --git a/snippets/base.view_partner_tree.property_payment_term_id.xml b/snippets/base.view_partner_tree.property_payment_term_id.xml new file mode 100644 index 00000000..047b44c3 --- /dev/null +++ b/snippets/base.view_partner_tree.property_payment_term_id.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml b/snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml new file mode 100644 index 00000000..fa7e7e51 --- /dev/null +++ b/snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/ir_model.md b/snippets/ir_model.md index b6d5f214..042b2582 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -2838,6 +2838,28 @@ ID: `mint_system.ir_model.stock_picking.x_autocomplete` ``` Source: [snippets/ir_model.stock_picking.x_autocomplete.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_autocomplete.xml) +### X Client Order Ref +ID: `mint_system.ir_model.stock_picking.x_client_order_ref` +```xml + + + + + Bestellnummer Kunde + stock.picking + + x_client_order_ref + + + + char + sale_id.client_order_ref + + + +``` +Source: [snippets/ir_model.stock_picking.x_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_client_order_ref.xml) + ## Stock Production Lot ### X Autoremove ID: `mint_system.ir_model.stock_production_lot.x_autoremove` diff --git a/snippets/ir_model.stock_picking.x_client_order_ref.xml b/snippets/ir_model.stock_picking.x_client_order_ref.xml new file mode 100644 index 00000000..313cc427 --- /dev/null +++ b/snippets/ir_model.stock_picking.x_client_order_ref.xml @@ -0,0 +1,16 @@ + + + + + Bestellnummer Kunde + stock.picking + + x_client_order_ref + + + + char + sale_id.client_order_ref + + + \ No newline at end of file diff --git a/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml b/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml new file mode 100644 index 00000000..7fce761f --- /dev/null +++ b/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/snippets/l10n_ch.md b/snippets/l10n_ch.md index a0e3fbfd..ba6fcd4b 100644 --- a/snippets/l10n_ch.md +++ b/snippets/l10n_ch.md @@ -108,3 +108,28 @@ ID: `mint_system.l10n_ch.l10n_ch_swissqr_template.set_additional_information` ``` Source: [snippets/l10n_ch.l10n_ch_swissqr_template.set_additional_information.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/l10n_ch.l10n_ch_swissqr_template.set_additional_information.xml) +### Style Moser +ID: `mint_system.l10n_ch.l10n_ch_swissqr_template.style_moser` +```xml + + + + + + + + + + + +``` +Source: [snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml) + diff --git a/snippets/mail.mail_activity_view_tree.activity_view.xml b/snippets/mail.mail_activity_view_tree.activity_view.xml new file mode 100644 index 00000000..e21d6ca9 --- /dev/null +++ b/snippets/mail.mail_activity_view_tree.activity_view.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/snippets/mrp.label_production_view_pdf.basis57.xml b/snippets/mrp.label_production_view_pdf.basis57.xml index 6444b391..4377b8b8 100644 --- a/snippets/mrp.label_production_view_pdf.basis57.xml +++ b/snippets/mrp.label_production_view_pdf.basis57.xml @@ -157,7 +157,7 @@ Verpackt am:
          - Zu verbrauchen bis: + Mindestens haltbar bis:
          diff --git a/snippets/payment.md b/snippets/payment.md new file mode 100644 index 00000000..4d25aac6 --- /dev/null +++ b/snippets/payment.md @@ -0,0 +1,17 @@ +# Payment +## Payment Provider List +### Enable Create +ID: `mint_system.payment.payment_provider_list.enable_create` +```xml + + + + + 1 + + + + +``` +Source: [snippets/payment.payment_provider_list.enable_create.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/payment.payment_provider_list.enable_create.xml) + diff --git a/snippets/sale.md b/snippets/sale.md index 473d2c01..399ff4ac 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -3713,10 +3713,11 @@ ID: `mint_system.sale.view_order_form.move_client_order_ref` - + + ``` Source: [snippets/sale.view_order_form.move_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.move_client_order_ref.xml) diff --git a/snippets/stock.label_transfer_template_view.basis57.xml b/snippets/stock.label_transfer_template_view.basis57.xml index 445882bf..cf99b014 100644 --- a/snippets/stock.label_transfer_template_view.basis57.xml +++ b/snippets/stock.label_transfer_template_view.basis57.xml @@ -57,8 +57,6 @@ - - @@ -82,6 +80,9 @@ + + + @@ -90,6 +91,9 @@ + + + @@ -97,12 +101,8 @@ - - - - @@ -186,8 +186,8 @@

          - - + +

          @@ -206,7 +206,7 @@ Verpackt am:
          - Zu verbrauchen bis: + Mindestens haltbar bis:
          diff --git a/snippets/stock.md b/snippets/stock.md index 4792b656..f6687c82 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -7058,6 +7058,20 @@ ID: `mint_system.stock.view_picking_form.x_autocomplete` ``` Source: [snippets/stock.view_picking_form.x_autocomplete.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_autocomplete.xml) +### X Client Order Ref +ID: `mint_system.stock.view_picking_form.x_client_order_ref` +```xml + + + + + + + + +``` +Source: [snippets/stock.view_picking_form.x_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_client_order_ref.xml) + ### X Count Boxes ID: `mint_system.stock.view_picking_form.x_count_boxes` ```xml @@ -7348,3 +7362,15 @@ ID: `mint_system.stock.vpicktree.weight_sum` ``` Source: [snippets/stock.vpicktree.weight_sum.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.weight_sum.xml) +### X Client Order Ref +ID: `mint_system.stock.vpicktree.x_client_order_ref` +```xml + + + + + + +``` +Source: [snippets/stock.vpicktree.x_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.x_client_order_ref.xml) + diff --git a/snippets/stock.view_picking_form.x_client_order_ref.xml b/snippets/stock.view_picking_form.x_client_order_ref.xml new file mode 100644 index 00000000..aa1dadac --- /dev/null +++ b/snippets/stock.view_picking_form.x_client_order_ref.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.vpicktree.x_client_order_ref.xml b/snippets/stock.vpicktree.x_client_order_ref.xml new file mode 100644 index 00000000..06a24dda --- /dev/null +++ b/snippets/stock.vpicktree.x_client_order_ref.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 8bede20162b9689af9bfd659b6414bd86c2c2334 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 12 Oct 2023 15:34:55 +0200 Subject: [PATCH 124/147] sync --- .../base.view_partner_tree.show_street.xml | 8 ++ .../ir_model.stock_picking.x_date_order.xml | 16 ++++ snippets/ir_model.stock_picking.x_vst.xml | 16 ++++ ...tock.report_delivery_document.add_note.xml | 10 +++ ...elivery_document.format_address_blocks.xml | 16 +++- ...delivery_document.style_swissfragrance.xml | 21 +++++ .../stock.view_picking_form.x_date_order.xml | 8 ++ snippets/stock.view_picking_form.x_vst.xml | 8 ++ snippets/stock.vpicktree.x_date_order.xml | 6 ++ ...xternal_layout_standard.replace_footer.xml | 85 +++++++++++++++++-- ....external_layout_standard.style_header.xml | 7 ++ 11 files changed, 195 insertions(+), 6 deletions(-) create mode 100644 snippets/base.view_partner_tree.show_street.xml create mode 100644 snippets/ir_model.stock_picking.x_date_order.xml create mode 100644 snippets/ir_model.stock_picking.x_vst.xml create mode 100644 snippets/stock.report_delivery_document.add_note.xml create mode 100644 snippets/stock.report_delivery_document.style_swissfragrance.xml create mode 100644 snippets/stock.view_picking_form.x_date_order.xml create mode 100644 snippets/stock.view_picking_form.x_vst.xml create mode 100644 snippets/stock.vpicktree.x_date_order.xml create mode 100644 snippets/web.external_layout_standard.style_header.xml diff --git a/snippets/base.view_partner_tree.show_street.xml b/snippets/base.view_partner_tree.show_street.xml new file mode 100644 index 00000000..736ea286 --- /dev/null +++ b/snippets/base.view_partner_tree.show_street.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/ir_model.stock_picking.x_date_order.xml b/snippets/ir_model.stock_picking.x_date_order.xml new file mode 100644 index 00000000..78b59989 --- /dev/null +++ b/snippets/ir_model.stock_picking.x_date_order.xml @@ -0,0 +1,16 @@ + + + + + Bestelldatum + stock.picking + + x_date_order + + + + datetime + sale_id.date_order + + + \ No newline at end of file diff --git a/snippets/ir_model.stock_picking.x_vst.xml b/snippets/ir_model.stock_picking.x_vst.xml new file mode 100644 index 00000000..f98ae216 --- /dev/null +++ b/snippets/ir_model.stock_picking.x_vst.xml @@ -0,0 +1,16 @@ + + + + + VST + stock.picking + + x_vst + + + + char + sale_id.x_vst + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.add_note.xml b/snippets/stock.report_delivery_document.add_note.xml new file mode 100644 index 00000000..2f8fbb3e --- /dev/null +++ b/snippets/stock.report_delivery_document.add_note.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.format_address_blocks.xml b/snippets/stock.report_delivery_document.format_address_blocks.xml index 0b5477e5..503b764e 100644 --- a/snippets/stock.report_delivery_document.format_address_blocks.xml +++ b/snippets/stock.report_delivery_document.format_address_blocks.xml @@ -1,9 +1,23 @@ - + font-size:10pt; line-height: 1.2; padding-bottom:33mm ['address', 'name'] + + diff --git a/snippets/stock.report_delivery_document.style_swissfragrance.xml b/snippets/stock.report_delivery_document.style_swissfragrance.xml new file mode 100644 index 00000000..e9f71711 --- /dev/null +++ b/snippets/stock.report_delivery_document.style_swissfragrance.xml @@ -0,0 +1,21 @@ + + + + + + + + + "date" + + + + "date" + + + \ No newline at end of file diff --git a/snippets/stock.view_picking_form.x_date_order.xml b/snippets/stock.view_picking_form.x_date_order.xml new file mode 100644 index 00000000..5d62ddb5 --- /dev/null +++ b/snippets/stock.view_picking_form.x_date_order.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.view_picking_form.x_vst.xml b/snippets/stock.view_picking_form.x_vst.xml new file mode 100644 index 00000000..aff887f1 --- /dev/null +++ b/snippets/stock.view_picking_form.x_vst.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.vpicktree.x_date_order.xml b/snippets/stock.vpicktree.x_date_order.xml new file mode 100644 index 00000000..66a58f5f --- /dev/null +++ b/snippets/stock.vpicktree.x_date_order.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/snippets/web.external_layout_standard.replace_footer.xml b/snippets/web.external_layout_standard.replace_footer.xml index f141fd34..234429fa 100644 --- a/snippets/web.external_layout_standard.replace_footer.xml +++ b/snippets/web.external_layout_standard.replace_footer.xml @@ -5,11 +5,11 @@
          Page: - / -
          + /
          +

          - - + -           \ No newline at end of file + + + \ No newline at end of file diff --git a/snippets/web.external_layout_standard.style_header.xml b/snippets/web.external_layout_standard.style_header.xml new file mode 100644 index 00000000..3c66367b --- /dev/null +++ b/snippets/web.external_layout_standard.style_header.xml @@ -0,0 +1,7 @@ + + + + border-bottom: 0px ; + + + From fe7adb5846c1b995465bc58f8e63a9bbb25a67d5 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 12 Oct 2023 16:41:37 +0200 Subject: [PATCH 125/147] fix --- scripts/odoo16_ir_actions_report_check | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 scripts/odoo16_ir_actions_report_check diff --git a/scripts/odoo16_ir_actions_report_check b/scripts/odoo16_ir_actions_report_check new file mode 100755 index 00000000..480e6b44 --- /dev/null +++ b/scripts/odoo16_ir_actions_report_check @@ -0,0 +1,34 @@ +#!/bin/bash + +# Get script name +SCRIPT=$(basename "$0") + +# First param is docker container +CONTAINER=odoo36 + +# Default configuration +PACKAGE_PATH="/usr/lib/python3/dist-packages/" + +# Custom configuration +FILE_PATH="${PACKAGE_PATH}odoo/addons/base/models/ir_actions_report.py" +FIND="if report_sudo.attachment and set(res_ids_wo_stream) != set(html_ids):" +REPLACE="if not report_sudo.attachment and set(res_ids_wo_stream) != set(html_ids):" + +# Get filename +FILE=$(basename "$FILE_PATH") + +# Copy from docker +docker cp "$CONTAINER":"$FILE_PATH" . + +# Find and replace +sed -i'' "s/$FIND/$REPLACE/g" $FILE + +# Copy back to docker +docker cp $FILE "$CONTAINER":"$FILE_PATH" + +# Remove file +rm -f $FILE + +# Register patch installation +echo "Patch $SCRIPT applied." +touch "/etc/odoo/${SCRIPT}_${CONTAINER}_installed" From e483223de650ff2b535f579e4c025b7b6df7f3c4 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 13 Oct 2023 17:21:47 +0200 Subject: [PATCH 126/147] snippets --- snippets/account.view_move_form.show_payment_ids.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snippets/account.view_move_form.show_payment_ids.xml diff --git a/snippets/account.view_move_form.show_payment_ids.xml b/snippets/account.view_move_form.show_payment_ids.xml new file mode 100644 index 00000000..845203f4 --- /dev/null +++ b/snippets/account.view_move_form.show_payment_ids.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 31bc10453e2fbcd85155c739b1f46175d8e3223b Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 16 Oct 2023 08:38:05 +0200 Subject: [PATCH 127/147] ref --- oca/dms | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/maintenance | 2 +- oca/survey | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/oca/dms b/oca/dms index dc12b219..4432b85b 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit dc12b219e9f26151cc222fb9eb15d4121fa3a145 +Subproject commit 4432b85bd1ae963bc655f9b8d0f11ce4873cc516 diff --git a/oca/hr-attendance b/oca/hr-attendance index a313d1fc..fb61e0b5 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit a313d1fcd180504ed63fbc6c29c78b65c4936c56 +Subproject commit fb61e0b562b3d3ce90d73ef3dbfbe99df37b021e diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 1a12f040..d20f165e 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 1a12f04081e7266698aef31b9c7fcf5948f21bba +Subproject commit d20f165ebbf7962b3d905de343165c0d507bb17a diff --git a/oca/maintenance b/oca/maintenance index 8b7a8312..c1939480 160000 --- a/oca/maintenance +++ b/oca/maintenance @@ -1 +1 @@ -Subproject commit 8b7a8312a28dc36e48ebdf572b98954349c26614 +Subproject commit c1939480caf9202577534ebe46c11d4ca2b0ce7b diff --git a/oca/survey b/oca/survey index 973837ab..8be897a1 160000 --- a/oca/survey +++ b/oca/survey @@ -1 +1 @@ -Subproject commit 973837abedd80fa3b30ab8bacd03a9bb0ee1bdfa +Subproject commit 8be897a176c3d98d277eb6b8138e9c30e671e841 From 18f035fe10c55f17e641a3cae129bc8e25d17e4e Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 16 Oct 2023 10:57:47 +0200 Subject: [PATCH 128/147] sync --- snippets/project.view_task_form2.domain_sale_line_id_active.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snippets/project.view_task_form2.domain_sale_line_id_active.xml b/snippets/project.view_task_form2.domain_sale_line_id_active.xml index ad729507..83b66adf 100644 --- a/snippets/project.view_task_form2.domain_sale_line_id_active.xml +++ b/snippets/project.view_task_form2.domain_sale_line_id_active.xml @@ -2,7 +2,7 @@ - [('x_service_policy', '=', 'delivered_timesheet'),('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale', 'done'])] + [('x_service_policy', '=', 'delivered_timesheet'),('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale'])] From 05c66aa49d361f1fd06009125bb41677e0e64c56 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 16 Oct 2023 18:16:49 +0200 Subject: [PATCH 129/147] ref --- addons/sale_workflow | 2 +- enterprise | 2 +- oca/account-financial-reporting | 2 +- oca/account-financial-tools | 2 +- oca/account-invoicing | 2 +- oca/account-reconcile | 2 +- oca/bank-payment | 2 +- oca/bank-statement-import | 2 +- oca/brand | 2 +- oca/contract | 2 +- oca/credit-control | 2 +- oca/dms | 2 +- oca/iot | 2 +- oca/maintenance | 2 +- oca/manufacture | 2 +- oca/partner-contact | 2 +- oca/product-attribute | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/reporting-engine | 2 +- oca/rest-framework | 2 +- oca/sale-workflow | 2 +- oca/server-auth | 2 +- oca/server-tools | 2 +- oca/social | 2 +- oca/stock-logistics-warehouse | 2 +- oca/stock-logistics-workflow | 2 +- oca/timesheet | 2 +- oca/web | 2 +- oca/website | 2 +- odoo | 2 +- themes | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/addons/sale_workflow b/addons/sale_workflow index 386284a8..37817480 160000 --- a/addons/sale_workflow +++ b/addons/sale_workflow @@ -1 +1 @@ -Subproject commit 386284a8dc89a1e4c166543cddd18ad22c1a9289 +Subproject commit 37817480edec95c3872762438cd312337af58fd0 diff --git a/enterprise b/enterprise index 9a62b440..f2cbf4b0 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 9a62b440f9b55bde0f398a03e04b8e9d8dbfe8ad +Subproject commit f2cbf4b099fcbab2fe70a469209a59a9b3dc24b6 diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting index 325048b7..3a74f639 160000 --- a/oca/account-financial-reporting +++ b/oca/account-financial-reporting @@ -1 +1 @@ -Subproject commit 325048b7d2a21b3b1c20c307bf3b176d1043fddd +Subproject commit 3a74f6394114ba642c9a233089c862d1631f6d98 diff --git a/oca/account-financial-tools b/oca/account-financial-tools index 75fc69fc..44c2f64c 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit 75fc69fc2cc9b7745ed6b280a6de54412a3a7655 +Subproject commit 44c2f64c4d0ba8ec4abbf9744ff6c8f46289ed01 diff --git a/oca/account-invoicing b/oca/account-invoicing index 505ff14d..fc8fbcbc 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit 505ff14d14b8a2105dcd88324196ec14e280a7f3 +Subproject commit fc8fbcbc228a876c66221e959d41fae73cb420d8 diff --git a/oca/account-reconcile b/oca/account-reconcile index 35f68c6f..9670ea6b 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit 35f68c6fc062b24d335048a829cca5ba1f27a595 +Subproject commit 9670ea6bfc44f06b8851dad727bbc9587c5b2b4e diff --git a/oca/bank-payment b/oca/bank-payment index 5ad18aa6..927df0fe 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 5ad18aa626878199bcb7c15d1e34073415a326d9 +Subproject commit 927df0fe880e329abb2b9ca449b2c28831705f4e diff --git a/oca/bank-statement-import b/oca/bank-statement-import index 9aeb37ed..3fa06c4f 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit 9aeb37eda45ae05b81304b3c46814c5f082f8c24 +Subproject commit 3fa06c4fcff69c3a2a66f4c8082191814e00c02e diff --git a/oca/brand b/oca/brand index 870e5d8f..dfa27792 160000 --- a/oca/brand +++ b/oca/brand @@ -1 +1 @@ -Subproject commit 870e5d8f42aec7e943fb5569ef48eef68dfde33f +Subproject commit dfa27792f3e2ef0aa848b374e3666f249663eaa7 diff --git a/oca/contract b/oca/contract index 360c25f3..38b35570 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit 360c25f3945daa1a23029071d1cc083e8d0d3842 +Subproject commit 38b355709f6f0c0e3f5c50c128d850e3c3ff7b99 diff --git a/oca/credit-control b/oca/credit-control index 10cb8a9e..4204ca6f 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 10cb8a9e647b0bcef0e33d83a4d1ac2b483ab70e +Subproject commit 4204ca6f1e02eae8bdbfb7be44a86d774dcc6e7f diff --git a/oca/dms b/oca/dms index 4432b85b..be80ad37 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit 4432b85bd1ae963bc655f9b8d0f11ce4873cc516 +Subproject commit be80ad37cdf5c379cf71644930d451fbdad64749 diff --git a/oca/iot b/oca/iot index 5fb91e68..b8e1e3d6 160000 --- a/oca/iot +++ b/oca/iot @@ -1 +1 @@ -Subproject commit 5fb91e68ee2caa9d4724357dfb3b978b91c6dd09 +Subproject commit b8e1e3d63efbdb3bc029a0da3e7adbdd60485658 diff --git a/oca/maintenance b/oca/maintenance index c1939480..01a9f91a 160000 --- a/oca/maintenance +++ b/oca/maintenance @@ -1 +1 @@ -Subproject commit c1939480caf9202577534ebe46c11d4ca2b0ce7b +Subproject commit 01a9f91afa03eee833c3d8507f0aa2a03bcbca79 diff --git a/oca/manufacture b/oca/manufacture index 853c18f5..e3cb91d1 160000 --- a/oca/manufacture +++ b/oca/manufacture @@ -1 +1 @@ -Subproject commit 853c18f54e8c1fed2727ff58159bfba8100696cf +Subproject commit e3cb91d140100ce9de4273109299b86658dccf6a diff --git a/oca/partner-contact b/oca/partner-contact index 4dcb2576..05043697 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 4dcb25763a85658b602a6a2464deb7cb84f38f3c +Subproject commit 050436972fef8bda98795a3bc4b8d726d537579e diff --git a/oca/product-attribute b/oca/product-attribute index 3c7a16cd..bda6cf08 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 3c7a16cd85897c375d03ae113bacd7d8c81ca133 +Subproject commit bda6cf083b6fe5cfe8402f449e1a6b7e058b9df3 diff --git a/oca/project b/oca/project index 70d0955e..85d7c27e 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 70d0955ee54aac89318355a90c9f898743a6a6b0 +Subproject commit 85d7c27ec3c7b3e7f78e36bc8794619fdcac127a diff --git a/oca/purchase-workflow b/oca/purchase-workflow index 07de3b3c..e7e5fc2c 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit 07de3b3ca6ee00aa2c793e36e9bb040669eea047 +Subproject commit e7e5fc2c3ae0661048fc29eb19450ede0f58a576 diff --git a/oca/reporting-engine b/oca/reporting-engine index 39097022..7b7a04f4 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 390970227f1842c254de01e6483df280f8358ba3 +Subproject commit 7b7a04f4bf62c82eda95e1a7201fe7b8160a0a7b diff --git a/oca/rest-framework b/oca/rest-framework index dd3f4338..e9b65cf1 160000 --- a/oca/rest-framework +++ b/oca/rest-framework @@ -1 +1 @@ -Subproject commit dd3f43380aecc052af686431596b5489fb52f16f +Subproject commit e9b65cf1ceb30101cdf0d951d29e056a2d2c284a diff --git a/oca/sale-workflow b/oca/sale-workflow index 77eb680c..485eb897 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 77eb680c727f56175b7d19cae8d8ea50d6b3039e +Subproject commit 485eb897c6bcce1e692a9fd22bc1f03c327e2578 diff --git a/oca/server-auth b/oca/server-auth index 018a8de5..6c78001d 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit 018a8de5b0db0ed75c648d1e1136eb1046c1b80c +Subproject commit 6c78001d180a30c4b4048d7c24f488e3ca140e15 diff --git a/oca/server-tools b/oca/server-tools index 3eaafd9c..0b6af130 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 3eaafd9cd4eed0e08a594e1f07d290ee28d06e32 +Subproject commit 0b6af13008d701353da939694754b534c64483f6 diff --git a/oca/social b/oca/social index 11605ff6..d097fa23 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit 11605ff6ad633fc9f059c70f0dee065794fce341 +Subproject commit d097fa2376967a05452ba1969006dfe85777ae24 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 4e8a9aec..3b0e90f3 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 4e8a9aec7c0aa1eb85aa56f087b47420c09aadf2 +Subproject commit 3b0e90f3e0a84358b051e1797a543b3f9ecd5880 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index b5b7dfeb..31cb065f 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit b5b7dfeb44c182309a0b7d7abd1847a8437319b1 +Subproject commit 31cb065f25c1f417311bbf18e6041f413b44307c diff --git a/oca/timesheet b/oca/timesheet index e6883c3d..b289ee29 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit e6883c3dac2ab6c43a3a2fde8135079f48e3f902 +Subproject commit b289ee293cad294181089acafc1f0ba789493e0b diff --git a/oca/web b/oca/web index 9edd0d73..0175acda 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 9edd0d73f646abfd6ec97e6424723db8364fed1d +Subproject commit 0175acda953be8f36648144e82b44b45e0aaf2c6 diff --git a/oca/website b/oca/website index 1dec2228..d7ca7db5 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit 1dec2228d48aa8a659398da3fe77c249a5c8aa56 +Subproject commit d7ca7db5a70c2d9ae813c31c8fea6469fe5dd3a8 diff --git a/odoo b/odoo index ae9f6019..4d119ea9 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit ae9f60195043b1fbfc3798370be31ebc26633efb +Subproject commit 4d119ea9fafd25ed4709eb868132b28a54a41bc0 diff --git a/themes b/themes index c3d2f03d..0102a825 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit c3d2f03db6eb54c8d6a82a1dd45155b779350384 +Subproject commit 0102a82538270f0ecb5941e057b04a50a103a9c3 From 01dccbf00933ce3fb831a47ad59503cc8102cbe2 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 17 Oct 2023 09:46:36 +0200 Subject: [PATCH 130/147] new submodule --- .gitmodules | 4 ++++ addons/account_invoicing | 1 + template/.flake8 | 2 +- template/.gitignore | 2 +- template/.isort.cfg | 2 +- template/.pre-commit-config.yaml | 2 +- template/.pylintrc | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) create mode 160000 addons/account_invoicing diff --git a/.gitmodules b/.gitmodules index 882f87a8..649eb88f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -234,3 +234,7 @@ path = addons/purchase_workflow url = git@github.com:Mint-System/Odoo-Apps-Purchase-Workflow.git branch = 16.0 +[submodule "addons/account_invoicing"] + path = addons/account_invoicing + url = git@github.com:mint-system/odoo-apps-account-invoicing.git + branch = 16.0 diff --git a/addons/account_invoicing b/addons/account_invoicing new file mode 160000 index 00000000..2fa54c1a --- /dev/null +++ b/addons/account_invoicing @@ -0,0 +1 @@ +Subproject commit 2fa54c1abe46ca06a67c5db303586cbfa49078de diff --git a/template/.flake8 b/template/.flake8 index 784e5771..e397e8ed 100644 --- a/template/.flake8 +++ b/template/.flake8 @@ -9,4 +9,4 @@ select = C,E,F,W,B,B9 # W503: line break before binary operator (black behaviour) ignore = E203,E501,W503 per-file-ignores= - __init__.py:F401 \ No newline at end of file + __init__.py:F401 diff --git a/template/.gitignore b/template/.gitignore index 646eb52e..9538ff10 100644 --- a/template/.gitignore +++ b/template/.gitignore @@ -3,4 +3,4 @@ default.vim .DS_Store *.swp .~lock* -*.pyc \ No newline at end of file +*.pyc diff --git a/template/.isort.cfg b/template/.isort.cfg index e9ca60ff..0ec187ef 100644 --- a/template/.isort.cfg +++ b/template/.isort.cfg @@ -10,4 +10,4 @@ known_odoo=odoo known_odoo_addons=odoo.addons sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER default_section=THIRDPARTY -ensure_newline_before_comments = True \ No newline at end of file +ensure_newline_before_comments = True diff --git a/template/.pre-commit-config.yaml b/template/.pre-commit-config.yaml index b4962e02..5e769c21 100644 --- a/template/.pre-commit-config.yaml +++ b/template/.pre-commit-config.yaml @@ -101,4 +101,4 @@ repos: args: - --rcfile=.pylintrc - --exit-zero - verbose: true \ No newline at end of file + verbose: true diff --git a/template/.pylintrc b/template/.pylintrc index 49292140..d9f6c68e 100644 --- a/template/.pylintrc +++ b/template/.pylintrc @@ -118,4 +118,4 @@ enable=anomalous-backslash-in-string, [REPORTS] msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} output-format=colorized -reports=no \ No newline at end of file +reports=no From 870399dc351212fef72390894383a03469efa366 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 18 Oct 2023 08:14:43 +0200 Subject: [PATCH 131/147] add patch script --- ...odoo16_sale_timesheet_line_exclude_depends | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 scripts/odoo16_sale_timesheet_line_exclude_depends diff --git a/scripts/odoo16_sale_timesheet_line_exclude_depends b/scripts/odoo16_sale_timesheet_line_exclude_depends new file mode 100755 index 00000000..d451a968 --- /dev/null +++ b/scripts/odoo16_sale_timesheet_line_exclude_depends @@ -0,0 +1,31 @@ +#!/bin/bash + +# Get script name +SCRIPT=$(basename "$0") + +# First param is docker container +CONTAINER=$1 + +# Custom configuration +FILE_PATH="/mnt/addons/sale_timesheet_line_exclude/__manifest__.py" +FIND='"depends": ["sale_timesheet"],' +REPLACE='"depends": ["sale_timesheet", "industry_fsm_sale"],' + +# Get filename +FILE=`basename "$FILE_PATH"` + +# Copy from docker +docker cp "$CONTAINER":"$FILE_PATH" . + +# Find and replace +sed -i'' "s/$FIND/$REPLACE/g" $FILE + +# Copy back to docker +docker cp $FILE "$CONTAINER":"$FILE_PATH" + +# Remove file +rm -f $FILE + +# Register patch installation +echo "Patch $SCRIPT applied." +touch "/etc/odoo/${SCRIPT}_${CONTAINER}_installed" From fc9d02a78ff5000f395ecdf1fea52daa1edc277d Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 18 Oct 2023 08:14:51 +0200 Subject: [PATCH 132/147] fix env load --- task | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task b/task index 4ebb7582..dc0da18a 100755 --- a/task +++ b/task @@ -24,7 +24,7 @@ export ODOO_DEVELOPMENT_CONFIG_DIR="$HOME/.config/odoo-build" export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 -if [[ -a ".env" ]]; then +if [[ "$(cat .env | sed 's/#.*//g')" ]]; then export $(cat .env | sed 's/#.*//g' | xargs) fi From 9c7f136b2ba77a3f41abcf5b59fadfbdae91c855 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 18 Oct 2023 08:17:30 +0200 Subject: [PATCH 133/147] check .env --- task | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/task b/task index dc0da18a..7620df60 100755 --- a/task +++ b/task @@ -24,14 +24,14 @@ export ODOO_DEVELOPMENT_CONFIG_DIR="$HOME/.config/odoo-build" export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 -if [[ "$(cat .env | sed 's/#.*//g')" ]]; then +if [[ -a ".env" && "$(cat .env | sed 's/#.*//g')" ]]; then export $(cat .env | sed 's/#.*//g' | xargs) fi function set-addons-path() { # Read addons path list ADDONS_PATH="$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ',' | sed 's/,*$//g')" - +z # Append env var ADDONS_PATH="${ADDONS_PATH}${ODOO_ADDONS_PATH}" From 79e98665ed825701dd948a23d848f6770957f449 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 19 Oct 2023 11:47:10 +0200 Subject: [PATCH 134/147] sync --- snippets/account.md | 14 +++ ..._report.report_sale.set_page_font_size.xml | 12 ++ ...report.report_sale.set_title_font_size.xml | 12 ++ snippets/base.md | 15 +++ ...ase.view_partner_form.attributes_child_ids | 8 ++ ...iew_partner_tree.show_company_registry.xml | 8 ++ snippets/hr.md | 24 ++++ snippets/ir_model.md | 44 +++++++ snippets/mail.md | 25 ++++ snippets/mrp.md | 2 +- snippets/project.md | 2 +- snippets/stock.md | 117 ++++++++++++++++-- ....report_delivery_document.hide_address.xml | 7 ++ ...delivery_document.style_swissfragrance.xml | 24 ++-- ...regated_move_lines.replace_description.xml | 15 +++ ...cktree.modify_invisible_scheduled_date.xml | 8 ++ snippets/web.md | 97 ++++++++++++++- 17 files changed, 406 insertions(+), 28 deletions(-) create mode 100644 snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml create mode 100644 snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml create mode 100644 snippets/base.view_partner_form.attributes_child_ids create mode 100644 snippets/base.view_partner_tree.show_company_registry.xml create mode 100644 snippets/stock.report_delivery_document.hide_address.xml create mode 100644 snippets/stock.vpicktree.modify_invisible_scheduled_date.xml diff --git a/snippets/account.md b/snippets/account.md index f2aa2740..ab594e26 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -5988,6 +5988,20 @@ ID: `mint_system.account.view_move_form.show_line_partner_id` ``` Source: [snippets/account.view_move_form.show_line_partner_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.show_line_partner_id.xml) +### Show Payment Ids +ID: `mint_system.account.view_move_form.show_payment_ids` +```xml + + + + + + + + +``` +Source: [snippets/account.view_move_form.show_payment_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.show_payment_ids.xml) + ### Show Payment State ID: `mint_system.account.view_move_form.show_payment_state` ```xml diff --git a/snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml b/snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml new file mode 100644 index 00000000..dbcb9861 --- /dev/null +++ b/snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml b/snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml new file mode 100644 index 00000000..8b80bc23 --- /dev/null +++ b/snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/base.md b/snippets/base.md index 0569cfe7..cb4548ed 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -682,6 +682,21 @@ ID: `mint_system.base.view_partner_tree.show_property_product_pricelist` ``` Source: [snippets/base.view_partner_tree.show_property_product_pricelist.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_property_product_pricelist.xml) +### Show Street +ID: `mint_system.base.view_partner_tree.show_street` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_tree.show_street.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_street.xml) + ### Show Type ID: `mint_system.base.view_partner_tree.show_type` ```xml diff --git a/snippets/base.view_partner_form.attributes_child_ids b/snippets/base.view_partner_form.attributes_child_ids new file mode 100644 index 00000000..aee3d59b --- /dev/null +++ b/snippets/base.view_partner_form.attributes_child_ids @@ -0,0 +1,8 @@ + + + + + tree + + + \ No newline at end of file diff --git a/snippets/base.view_partner_tree.show_company_registry.xml b/snippets/base.view_partner_tree.show_company_registry.xml new file mode 100644 index 00000000..72c08217 --- /dev/null +++ b/snippets/base.view_partner_tree.show_company_registry.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/hr.md b/snippets/hr.md index b3f02143..604c3918 100644 --- a/snippets/hr.md +++ b/snippets/hr.md @@ -1,4 +1,28 @@ # Hr +## Hr Employee Public View Form +### Add Action Time Off Dashboard +ID: `mint_system.hr.hr_employee_public_view_form.add_action_time_off_dashboard` +```xml + + + + + + + + +``` +Source: [snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml) + ## Hr Employee Public View Kanban ### Add Mobile Phone ID: `mint_system.hr.hr_employee_public_view_kanban.add_mobile_phone` diff --git a/snippets/ir_model.md b/snippets/ir_model.md index 042b2582..90bfdf39 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -2860,6 +2860,50 @@ ID: `mint_system.ir_model.stock_picking.x_client_order_ref` ``` Source: [snippets/ir_model.stock_picking.x_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_client_order_ref.xml) +### X Date Order +ID: `mint_system.ir_model.stock_picking.x_date_order` +```xml + + + + + Bestelldatum + stock.picking + + x_date_order + + + + datetime + sale_id.date_order + + + +``` +Source: [snippets/ir_model.stock_picking.x_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_date_order.xml) + +### X Vst +ID: `mint_system.ir_model.stock_picking.x_vst` +```xml + + + + + VST + stock.picking + + x_vst + + + + char + sale_id.x_vst + + + +``` +Source: [snippets/ir_model.stock_picking.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_vst.xml) + ## Stock Production Lot ### X Autoremove ID: `mint_system.ir_model.stock_production_lot.x_autoremove` diff --git a/snippets/mail.md b/snippets/mail.md index 9bc12080..5bb51563 100644 --- a/snippets/mail.md +++ b/snippets/mail.md @@ -41,6 +41,31 @@ ID: `mint_system.mail.mail_activity_view_form_popup.x_reference` ``` Source: [snippets/mail.mail_activity_view_form_popup.x_reference.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mail.mail_activity_view_form_popup.x_reference.xml) +## Mail Activity View Tree +### Activity View +ID: `mint_system.mail.mail_activity_view_tree.activity_view` +```xml + + + + + + + + + + + + + + + + + + +``` +Source: [snippets/mail.mail_activity_view_tree.activity_view.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mail.mail_activity_view_tree.activity_view.xml) + ## Mail Notification Borders ### Reduce To Content ID: `mint_system.mail.mail_notification_borders.reduce_to_content` diff --git a/snippets/mrp.md b/snippets/mrp.md index cf834471..134b0d13 100644 --- a/snippets/mrp.md +++ b/snippets/mrp.md @@ -184,7 +184,7 @@ ID: `mint_system.mrp.label_production_view_pdf.basis57` Verpackt am:
          - Zu verbrauchen bis: + Mindestens haltbar bis:
          diff --git a/snippets/project.md b/snippets/project.md index 720430b7..95bfea95 100644 --- a/snippets/project.md +++ b/snippets/project.md @@ -211,7 +211,7 @@ ID: `mint_system.project.view_task_form2.domain_sale_line_id_active` - [('x_service_policy', '=', 'delivered_timesheet'),('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale', 'done'])] + [('x_service_policy', '=', 'delivered_timesheet'),('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale'])] diff --git a/snippets/stock.md b/snippets/stock.md index f6687c82..2daafd44 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -62,8 +62,6 @@ ID: `mint_system.stock.label_transfer_template_view.basis57` - - @@ -87,6 +85,9 @@ ID: `mint_system.stock.label_transfer_template_view.basis57` + + + @@ -95,6 +96,9 @@ ID: `mint_system.stock.label_transfer_template_view.basis57` + + + @@ -102,12 +106,8 @@ ID: `mint_system.stock.label_transfer_template_view.basis57` - - - - @@ -191,8 +191,8 @@ ID: `mint_system.stock.label_transfer_template_view.basis57`

          - - + +

          @@ -211,7 +211,7 @@ ID: `mint_system.stock.label_transfer_template_view.basis57` Verpackt am:
          - Zu verbrauchen bis: + Mindestens haltbar bis:
          @@ -1397,6 +1397,22 @@ ID: `mint_system.stock.report_delivery_document.add_infotable` ``` Source: [snippets/stock.report_delivery_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.add_infotable.xml) +### Add Note +ID: `mint_system.stock.report_delivery_document.add_note` +```xml + + + + + + + + + + +``` +Source: [snippets/stock.report_delivery_document.add_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.add_note.xml) + ### Add Open Quantity In Backorder ID: `mint_system.stock.report_delivery_document.add_open_quantity_in_backorder` ```xml @@ -1591,13 +1607,27 @@ ID: `mint_system.stock.report_delivery_document.format_address_blocks` - + font-size:10pt; line-height: 1.2; padding-bottom:33mm ['address', 'name'] + + ``` Source: [snippets/stock.report_delivery_document.format_address_blocks.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.format_address_blocks.xml) @@ -3064,6 +3094,33 @@ ID: `mint_system.stock.report_delivery_document.style_carbo_link` ``` Source: [snippets/stock.report_delivery_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.style_carbo_link.xml) +### Style Swissfragrance +ID: `mint_system.stock.report_delivery_document.style_swissfragrance` +```xml + + + + + + + + + "date" + + + + "date" + + + +``` +Source: [snippets/stock.report_delivery_document.style_swissfragrance.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.style_swissfragrance.xml) + ### Style Tissa ID: `mint_system.stock.report_delivery_document.style_tissa` ```xml @@ -7087,6 +7144,20 @@ ID: `mint_system.stock.view_picking_form.x_count_boxes` ``` Source: [snippets/stock.view_picking_form.x_count_boxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_count_boxes.xml) +### X Date Order +ID: `mint_system.stock.view_picking_form.x_date_order` +```xml + + + + + + + + +``` +Source: [snippets/stock.view_picking_form.x_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_date_order.xml) + ### X Label Qty ID: `mint_system.stock.view_picking_form.x_label_qty` ```xml @@ -7102,6 +7173,20 @@ ID: `mint_system.stock.view_picking_form.x_label_qty` ``` Source: [snippets/stock.view_picking_form.x_label_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_label_qty.xml) +### X Vst +ID: `mint_system.stock.view_picking_form.x_vst` +```xml + + + + + + + + +``` +Source: [snippets/stock.view_picking_form.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_vst.xml) + ## View Picking Internal Search ### Filter Groupby Expected Date ID: `mint_system.stock.view_picking_internal_search.filter_groupby_expected_date` @@ -7374,3 +7459,15 @@ ID: `mint_system.stock.vpicktree.x_client_order_ref` ``` Source: [snippets/stock.vpicktree.x_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.x_client_order_ref.xml) +### X Date Order +ID: `mint_system.stock.vpicktree.x_date_order` +```xml + + + + + + +``` +Source: [snippets/stock.vpicktree.x_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.x_date_order.xml) + diff --git a/snippets/stock.report_delivery_document.hide_address.xml b/snippets/stock.report_delivery_document.hide_address.xml new file mode 100644 index 00000000..6ecb6ea0 --- /dev/null +++ b/snippets/stock.report_delivery_document.hide_address.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.style_swissfragrance.xml b/snippets/stock.report_delivery_document.style_swissfragrance.xml index e9f71711..96ead9c0 100644 --- a/snippets/stock.report_delivery_document.style_swissfragrance.xml +++ b/snippets/stock.report_delivery_document.style_swissfragrance.xml @@ -1,21 +1,21 @@ - + + - - - "date" + + + - - - "date" - - + \ No newline at end of file diff --git a/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml b/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml index 128fa133..a1bbb0f9 100644 --- a/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml +++ b/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml @@ -9,3 +9,18 @@ + + \ No newline at end of file diff --git a/snippets/stock.vpicktree.modify_invisible_scheduled_date.xml b/snippets/stock.vpicktree.modify_invisible_scheduled_date.xml new file mode 100644 index 00000000..7df97ba2 --- /dev/null +++ b/snippets/stock.vpicktree.modify_invisible_scheduled_date.xml @@ -0,0 +1,8 @@ + + + + + {'invisible': [('state', 'in' , 'cancel')]} + + + \ No newline at end of file diff --git a/snippets/web.md b/snippets/web.md index c6414ed4..a63e1d2a 100644 --- a/snippets/web.md +++ b/snippets/web.md @@ -433,11 +433,11 @@ ID: `mint_system.web.external_layout_standard.replace_footer`
          Page: - / -
          + /
          +
          - - + + + ``` Source: [snippets/web.external_layout_standard.replace_footer.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.replace_footer.xml) @@ -561,6 +636,20 @@ ID: `mint_system.web.external_layout_standard.show_sale_order_in_footer` ``` Source: [snippets/web.external_layout_standard.show_sale_order_in_footer.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.show_sale_order_in_footer.xml) +### Style Header +ID: `mint_system.web.external_layout_standard.style_header` +```xml + + + + border-bottom: 0px ; + + + + +``` +Source: [snippets/web.external_layout_standard.style_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.style_header.xml) + ### Tissa Layout ID: `mint_system.web.external_layout_standard.tissa_layout` ```xml From cd466a2991ffca775160e529c83aa682e85b174d Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 19 Oct 2023 11:47:32 +0200 Subject: [PATCH 135/147] remove snippet --- ....purchase_purchase_order_form.x_recurring_inverval.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 snippets/account.purchase_purchase_order_form.x_recurring_inverval.xml diff --git a/snippets/account.purchase_purchase_order_form.x_recurring_inverval.xml b/snippets/account.purchase_purchase_order_form.x_recurring_inverval.xml deleted file mode 100644 index fc71e229..00000000 --- a/snippets/account.purchase_purchase_order_form.x_recurring_inverval.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From 60e673bd6b0197a2087b419f1cbbc54afca4b281 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 20 Oct 2023 12:35:58 +0200 Subject: [PATCH 136/147] update task and readme --- README.md | 8 ++++++++ task | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c44f2a23..de91b207 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,14 @@ Scaffold a new module. task create-module addons/project_report ``` +**Load modules from thirdpary folder** + +To load modules from a thirdparty folder, set this env var in your `.env` file + +``` +ODOO_ADDONS=path/to/module/folder, +``` + ### Docker Run Odoo with Docker container. diff --git a/task b/task index 7620df60..d3137937 100755 --- a/task +++ b/task @@ -31,7 +31,7 @@ fi function set-addons-path() { # Read addons path list ADDONS_PATH="$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ',' | sed 's/,*$//g')" -z + # Append env var ADDONS_PATH="${ADDONS_PATH}${ODOO_ADDONS_PATH}" From 4adc9020f041f8c3dbe202e75a42f5fe609f0386 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 20 Oct 2023 17:23:41 +0200 Subject: [PATCH 137/147] update submoduls --- .gitignore | 3 ++- .gitmodules | 4 ---- README.md | 2 +- addons/server_tools | 2 +- addons/vertical_job_portal | 2 +- enterprise | 2 +- oca/account-financial-tools | 2 +- oca/account-reconcile | 2 +- oca/bank-payment | 2 +- oca/bank-statement-import | 2 +- oca/brand | 2 +- oca/community-data-files | 2 +- oca/credit-control | 2 +- oca/dms | 2 +- oca/edi | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/partner-contact | 2 +- oca/project | 2 +- oca/purchase-workflow | 2 +- oca/sale-workflow | 2 +- oca/server-tools | 2 +- oca/server-ux | 2 +- oca/social | 2 +- oca/stock-logistics-workflow | 2 +- oca/web | 2 +- odoo | 2 +- themes | 2 +- 28 files changed, 28 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index a812f7e9..ecfbd54c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ dist =4.0.0 origin.dump filestore -upgraded.dump \ No newline at end of file +upgraded.dump +sozialinfo diff --git a/.gitmodules b/.gitmodules index 649eb88f..f888fa55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -178,10 +178,6 @@ path = addons/stock_logistics_workflow url = git@github.com:Mint-System/Odoo-Apps-Stock-Logistics-Workflow.git branch = 16.0 -[submodule "addons/swiss_payroll"] - path = addons/swiss_payroll - url = git@gitlab.com:mint-system/odoo-apps-swiss-payroll.git - branch = 16.0 [submodule "oca/stock-logistics-workflow"] path = oca/stock-logistics-workflow url = git@github.com:OCA/stock-logistics-workflow.git diff --git a/README.md b/README.md index de91b207..8d612a72 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ task create-module addons/project_report To load modules from a thirdparty folder, set this env var in your `.env` file ``` -ODOO_ADDONS=path/to/module/folder, +ODOO_ADDONS_PATH=,path/to/module/folder ``` ### Docker diff --git a/addons/server_tools b/addons/server_tools index 381ff99b..751aff0c 160000 --- a/addons/server_tools +++ b/addons/server_tools @@ -1 +1 @@ -Subproject commit 381ff99b7cf98d46799113e0384c164dc3c6aedd +Subproject commit 751aff0cabfc20c25f45521c2328d254e7094381 diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal index c5f726e0..ea74f3ac 160000 --- a/addons/vertical_job_portal +++ b/addons/vertical_job_portal @@ -1 +1 @@ -Subproject commit c5f726e0f2cf955b6a1bc53f9000119d2ffae57c +Subproject commit ea74f3ac26818a7cc5fdc839217f5253a6ff7c8f diff --git a/enterprise b/enterprise index f2cbf4b0..c0c36a2e 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit f2cbf4b099fcbab2fe70a469209a59a9b3dc24b6 +Subproject commit c0c36a2ef4c877f286d3b7eb4dae7739ac5d343c diff --git a/oca/account-financial-tools b/oca/account-financial-tools index 44c2f64c..cda322ce 160000 --- a/oca/account-financial-tools +++ b/oca/account-financial-tools @@ -1 +1 @@ -Subproject commit 44c2f64c4d0ba8ec4abbf9744ff6c8f46289ed01 +Subproject commit cda322ce6f37b3bae27ad6805524b86ff3092675 diff --git a/oca/account-reconcile b/oca/account-reconcile index 9670ea6b..ed0c352f 160000 --- a/oca/account-reconcile +++ b/oca/account-reconcile @@ -1 +1 @@ -Subproject commit 9670ea6bfc44f06b8851dad727bbc9587c5b2b4e +Subproject commit ed0c352f5e045e42d521cea336e43dcbc5f52c21 diff --git a/oca/bank-payment b/oca/bank-payment index 927df0fe..42eb528d 160000 --- a/oca/bank-payment +++ b/oca/bank-payment @@ -1 +1 @@ -Subproject commit 927df0fe880e329abb2b9ca449b2c28831705f4e +Subproject commit 42eb528d02100e9e3ac631bc495f68caec48335e diff --git a/oca/bank-statement-import b/oca/bank-statement-import index 3fa06c4f..db018786 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit 3fa06c4fcff69c3a2a66f4c8082191814e00c02e +Subproject commit db0187863592c16c707e4bd9b1a145d84e4f33b4 diff --git a/oca/brand b/oca/brand index dfa27792..1eca8ad7 160000 --- a/oca/brand +++ b/oca/brand @@ -1 +1 @@ -Subproject commit dfa27792f3e2ef0aa848b374e3666f249663eaa7 +Subproject commit 1eca8ad74ca22b417b37c4b3ec305c2b471bdafb diff --git a/oca/community-data-files b/oca/community-data-files index 60b34ce7..164f3e32 160000 --- a/oca/community-data-files +++ b/oca/community-data-files @@ -1 +1 @@ -Subproject commit 60b34ce713701237fd28d1aee53ec7d453b4933b +Subproject commit 164f3e328a00fea7b10ea9bba604551963202607 diff --git a/oca/credit-control b/oca/credit-control index 4204ca6f..d02f51f3 160000 --- a/oca/credit-control +++ b/oca/credit-control @@ -1 +1 @@ -Subproject commit 4204ca6f1e02eae8bdbfb7be44a86d774dcc6e7f +Subproject commit d02f51f30ba65b03573ead14a354a131ab3d66bf diff --git a/oca/dms b/oca/dms index be80ad37..592d7a7f 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit be80ad37cdf5c379cf71644930d451fbdad64749 +Subproject commit 592d7a7ff9c64a03b2a2f4bfd8bf4333997d7cb0 diff --git a/oca/edi b/oca/edi index 2eaad999..32a0e493 160000 --- a/oca/edi +++ b/oca/edi @@ -1 +1 @@ -Subproject commit 2eaad999666fd1688e0482c015e001744ce11785 +Subproject commit 32a0e4938f755cbcce815c5ab613794056a8ad2c diff --git a/oca/hr-attendance b/oca/hr-attendance index fb61e0b5..66bb8ac7 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit fb61e0b562b3d3ce90d73ef3dbfbe99df37b021e +Subproject commit 66bb8ac7d754624ecfae7c8e5a7c53c4bf60fad4 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index d20f165e..2a5d0867 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit d20f165ebbf7962b3d905de343165c0d507bb17a +Subproject commit 2a5d0867e11d47acde565347256bc26f76de61b6 diff --git a/oca/partner-contact b/oca/partner-contact index 05043697..ef760295 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit 050436972fef8bda98795a3bc4b8d726d537579e +Subproject commit ef760295302254d74d09217c2072386fc3694d3f diff --git a/oca/project b/oca/project index 85d7c27e..6fc93584 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit 85d7c27ec3c7b3e7f78e36bc8794619fdcac127a +Subproject commit 6fc935848f82ff0d82f7a983c8f1c5ee12a1f221 diff --git a/oca/purchase-workflow b/oca/purchase-workflow index e7e5fc2c..973e865a 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit e7e5fc2c3ae0661048fc29eb19450ede0f58a576 +Subproject commit 973e865ad8fed78e7b170de725ab44fe3d0e91a8 diff --git a/oca/sale-workflow b/oca/sale-workflow index 485eb897..37ac9ba3 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit 485eb897c6bcce1e692a9fd22bc1f03c327e2578 +Subproject commit 37ac9ba3fabf1fdab7aca885661a37e75b8b24ff diff --git a/oca/server-tools b/oca/server-tools index 0b6af130..3a530518 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 0b6af13008d701353da939694754b534c64483f6 +Subproject commit 3a5305184a8eb87ce60b7acaa0b0465b1e5f8afc diff --git a/oca/server-ux b/oca/server-ux index 83de61c2..7daab0ad 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit 83de61c232b5faf19c0fe5c1a3262cd57d5cb017 +Subproject commit 7daab0ad9006ee1d6de60e817febdcb317f3f52b diff --git a/oca/social b/oca/social index d097fa23..190fc700 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit d097fa2376967a05452ba1969006dfe85777ae24 +Subproject commit 190fc700c26e66421577acb4d67a982c1644b323 diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index 31cb065f..d85eb899 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit 31cb065f25c1f417311bbf18e6041f413b44307c +Subproject commit d85eb8998d73e6c33bc272ebddcdff367adaca1a diff --git a/oca/web b/oca/web index 0175acda..5dc42ccd 160000 --- a/oca/web +++ b/oca/web @@ -1 +1 @@ -Subproject commit 0175acda953be8f36648144e82b44b45e0aaf2c6 +Subproject commit 5dc42ccd75641d6de4c0dd7a0b82ae781441d424 diff --git a/odoo b/odoo index 4d119ea9..55cd29c5 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 4d119ea9fafd25ed4709eb868132b28a54a41bc0 +Subproject commit 55cd29c5f2cb7787752d77103dbcc4c4007ff504 diff --git a/themes b/themes index 0102a825..5f3599fe 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit 0102a82538270f0ecb5941e057b04a50a103a9c3 +Subproject commit 5f3599fedae4cc0017f7259385b3ad8356376ab5 From 8ef7310d45a1e3176151ad7dc7f8d7d6794ffb21 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 23 Oct 2023 08:49:38 +0200 Subject: [PATCH 138/147] remove tabs in snippets --- snippets/account.md | 989 ++++++------- ...rt_invoice_document.add_header_padding.xml | 2 +- ...port_invoice_document.add_header_space.xml | 6 +- ...ount.report_invoice_document.add_taxes.xml | 20 +- ...t.report_invoice_document.custom_taxes.xml | 8 +- ...voice_document.format_qty_with_decimal.xml | 16 +- ...report_invoice_document.product_weight.xml | 4 +- ...eport_invoice_document.remove_incoterm.xml | 2 +- ..._document.remove_payment_communication.xml | 2 +- ...t_invoice_document.remove_payment_term.xml | 2 +- ...eport_invoice_document.replace_summary.xml | 89 +- ...nt.report_invoice_document.round_price.xml | 2 +- ...ccount.report_invoice_document.set_ids.xml | 32 +- ...port_invoice_document.style_carbo_link.xml | 20 +- ...nt.report_invoice_document.style_moser.xml | 66 +- ...nt.report_invoice_document.style_tissa.xml | 58 +- ....report_invoice_document.style_trimada.xml | 156 +- ...report_invoice_document.unit_precision.xml | 2 +- ..._journal_form.show_payment_method_code.xml | 8 + snippets/account_asset.md | 14 +- ...ccount_asset_form.account_ids_optional.xml | 14 +- snippets/account_budget.md | 6 +- ...ossovered_budget_line_tree.show_budget.xml | 6 +- ...l_report.general_ledger.replace_layout.xml | 6 +- ...l_report.internal_layout.style_trimada.xml | 230 +-- ...nancial_report.internal_layout.trimada.xml | 312 ++-- snippets/account_financial_report.md | 616 ++++---- ...eport_general_ledger_base.hide_filters.xml | 2 +- ...port_general_ledger_base.replace_title.xml | 10 +- ...eport_general_ledger_ending_cumul.hide.xml | 4 +- ...rt_general_ledger_lines.replace_header.xml | 52 +- snippets/account_sale_timesheet_report.md | 37 + snippets/base.md | 29 +- ...any_form.show_account_onboarding_panel.xml | 6 +- ...iew_company_form.show_analytic_plan_id.xml | 6 +- snippets/base.view_res_bank_tree.add_zip.xml | 2 +- snippets/business_requirement.md | 42 +- ...iness_requirement_form.clickable_state.xml | 6 +- ...usiness_requirement_form.hide_scenario.xml | 2 +- ...irement_form.hide_terms_and_conditions.xml | 2 +- ...siness_requirement_form.hide_test_case.xml | 2 +- ..._form.x_planned_hours_x_estimated_cost.xml | 8 +- ...business_requirement_form.x_project_id.xml | 4 +- ...ew_business_requirement_form.x_task_id.xml | 4 +- ...siness_requirement_search.x_project_id.xml | 4 +- ...ess_requirement_tree.hide_category_ids.xml | 2 +- ...iness_requirement_tree.x_planned_hours.xml | 4 +- ...business_requirement_tree.x_project_id.xml | 4 +- snippets/industry_fsm.md | 26 +- ..._fsm.worksheet_custom_page.style_moser.xml | 26 +- snippets/industry_fsm_sale.md | 6 +- ...orksheet_time_and_material.style_moser.xml | 6 +- ...h.l10n_ch_swissqr_template.style_moser.xml | 6 +- snippets/l10n_ch.md | 6 +- ...mail_notification_light.replace_footer.xml | 10 +- ...ail_notification_paynow.replace_footer.xml | 10 +- snippets/mail.md | 20 +- snippets/mrp.md | 114 +- snippets/mrp.mrp_bom_tree_view.sort_id.xml | 2 +- ...w.show_backorder_and_procurement_group.xml | 8 +- .../mrp.mrp_production_form_view.x_note.xml | 6 +- ...roduction_tree_view.hide_date_deadline.xml | 2 +- ...duction_tree_view.show_x_date_deadline.xml | 2 +- ...tion_tree_view.sort_date_planned_start.xml | 2 +- ...rp.report_mrporder.list_quality_points.xml | 8 +- ...order.modify_section_consumed_products.xml | 16 +- .../mrp.report_mrporder.quality_points.xml | 8 +- .../mrp.report_mrporder.show_expected.xml | 10 +- snippets/mrp.report_mrporder.show_lot.xml | 26 +- snippets/mrp.report_mrporder.show_stock.xml | 2 +- ...ry_kit_sections.expand_section_heading.xml | 2 +- ....view_mrp_bom_filter.add_operation_ids.xml | 8 +- ..._mrp_bom_filter.add_x_type_description.xml | 6 +- ..._mrp_production_filter.add_not_planned.xml | 6 +- snippets/project.md | 8 +- ...w_task_form2.x_business_requirement_id.xml | 4 +- .../project.view_task_form2.x_lead_id.xml | 4 +- snippets/purchase.md | 382 ++--- ....report_purchaseorder_document.set_ids.xml | 10 +- ...urchaseorder_document.style_carbo_link.xml | 34 +- ...ort_purchaseorder_document.style_gelso.xml | 6 +- ...ort_purchaseorder_document.style_moser.xml | 72 +- ...ort_purchaseorder_document.style_tissa.xml | 46 +- ...ort_purchasequotation_document.set_ids.xml | 6 +- ...purchasequotation_document.style_moser.xml | 68 +- ...rchasequotation_document.style_trimada.xml | 140 +- snippets/purchase_requisition.md | 332 ++--- ...ort_purchaserequisitions.replace_title.xml | 4 +- ...eport_purchaserequisitions.round_price.xml | 6 +- ...on.report_purchaserequisitions.set_ids.xml | 134 +- ...eport_purchaserequisitions.style_gelso.xml | 72 +- ...ort_purchaserequisitions.style_trimada.xml | 116 +- snippets/sale.md | 588 ++++---- ...e.report_blanketorder_document.set_ids.xml | 6 +- ...rt_saleorder_document.add_header_space.xml | 6 +- ...er_document.add_incoterm_blanket_order.xml | 22 +- ...eorder_document.add_informations_space.xml | 16 +- ...port_saleorder_document.add_note_space.xml | 6 +- ...er_document.add_shipping_address_space.xml | 6 +- ...e.report_saleorder_document.format_qty.xml | 12 +- ...order_document.format_qty_with_decimal.xml | 16 +- ...ort_saleorder_document.replace_summary.xml | 66 +- ...sale.report_saleorder_document.set_ids.xml | 44 +- ...rt_saleorder_document.style_carbo_link.xml | 22 +- ....report_saleorder_document.style_gelso.xml | 14 +- ....report_saleorder_document.style_moser.xml | 52 +- ....report_saleorder_document.style_tissa.xml | 135 +- ...eport_saleorder_document.style_trimada.xml | 135 +- ...aleorder_document.x_hide_on_sale_order.xml | 12 +- ...e.sale_order_portal_content.format_qty.xml | 6 +- ...sale_order_portal_content.get_position.xml | 4 +- ...sale_order_portal_content.product_name.xml | 2 +- ...tal_content.remove_discount_percentage.xml | 2 +- ...order_portal_content.show_default_code.xml | 4 +- snippets/sale_blanket_order.md | 296 ++-- ...blanketorder_document.add_header_space.xml | 6 +- ...eport_blanketorder_document.format_qty.xml | 6 +- ...r_document.replace_product_description.xml | 2 +- ...port_blanketorder_document.round_price.xml | 2 +- ...r.report_blanketorder_document.set_ids.xml | 84 +- ...rt_blanketorder_document.set_ids_tissa.xml | 14 +- ...port_blanketorder_document.style_gelso.xml | 18 +- ...port_blanketorder_document.style_tissa.xml | 58 +- ...rt_blanketorder_document.style_trimada.xml | 106 +- snippets/stock.md | 1261 +++++++++-------- ...y_document.backorder_signature_section.xml | 6 +- ....report_delivery_document.hide_address.xml | 4 +- ...ivery_document.hide_backorder_quantity.xml | 6 +- ...eport_delivery_document.replace_header.xml | 52 +- ...very_document.replace_order_definition.xml | 2 +- ...ivery_document.replace_product_uom_qty.xml | 6 +- ...stock.report_delivery_document.set_ids.xml | 66 +- ...ort_delivery_document.style_carbo_link.xml | 34 +- ...delivery_document.style_swissfragrance.xml | 22 +- ...k.report_delivery_document.style_tissa.xml | 32 +- ...report_delivery_document.style_trimada.xml | 128 +- ...ck.report_picking.format_qty_available.xml | 6 +- ...ock.report_picking.product_description.xml | 34 +- ...stock.report_picking.relocate_quantity.xml | 50 +- .../stock.report_picking.replace_barcode.xml | 24 +- .../stock.report_picking.replace_header.xml | 54 +- ...eport_picking.replace_order_definition.xml | 40 +- snippets/stock.report_picking.set_ids.xml | 32 +- .../stock.report_picking.style_trimada.xml | 186 +-- .../web.brand_promotion_message.remove.xml | 2 +- ...external_layout_standard.header_styles.xml | 6 +- ...xternal_layout_standard.remove_contact.xml | 2 +- ...b.external_layout_standard.replace_url.xml | 2 +- ....external_layout_standard.style_header.xml | 2 +- .../web.internal_layout.header_styles.xml | 6 +- .../web.internal_layout.replace_header.xml | 26 +- snippets/web.md | 46 +- snippets/website_sale.md | 12 +- ...ts_categories.bigger_categories_button.xml | 12 +- 154 files changed, 4373 insertions(+), 4264 deletions(-) create mode 100644 snippets/account.view_account_journal_form.show_payment_method_code.xml diff --git a/snippets/account.md b/snippets/account.md index ab594e26..9adee849 100644 --- a/snippets/account.md +++ b/snippets/account.md @@ -110,7 +110,7 @@ ID: `mint_system.account.report_invoice_document.add_header_padding` padding-top: 2rem - + @@ -123,9 +123,9 @@ ID: `mint_system.account.report_invoice_document.add_header_space` - - padding-top: 5rem - + + padding-top: 5rem + @@ -301,12 +301,12 @@ ID: `mint_system.account.report_invoice_document.add_taxes` - - - + font-size: 1.5rem; + } + + ``` @@ -457,12 +457,12 @@ ID: `mint_system.account.report_invoice_document.custom_taxes` - Steuern + Steuern - - - + + + @@ -561,14 +561,14 @@ ID: `mint_system.account.report_invoice_document.format_qty_with_decimal` - - - - - - - - + + + + + + + + ``` @@ -1152,8 +1152,8 @@ ID: `mint_system.account.report_invoice_document.product_weight`
          - Weight: - + Weight: +           @@ -1168,7 +1168,7 @@ ID: `mint_system.account.report_invoice_document.remove_incoterm` - + @@ -1182,7 +1182,7 @@ ID: `mint_system.account.report_invoice_document.remove_payment_communication` - + @@ -1195,7 +1195,7 @@ ID: `mint_system.account.report_invoice_document.remove_payment_term` -

          +

          @@ -1740,50 +1740,50 @@ ID: `mint_system.account.report_invoice_document.replace_summary` @@ -1863,7 +1863,6 @@ ID: `mint_system.account.report_invoice_document.replace_summary` - ``` Source: [snippets/account.report_invoice_document.replace_summary.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.replace_summary.xml) @@ -1907,7 +1906,7 @@ ID: `mint_system.account.report_invoice_document.round_price` - + @@ -2026,23 +2025,23 @@ ID: `mint_system.account.report_invoice_document.set_ids` - - th_quantity - + + th_quantity + - - description - - - quantity - - - qty - - - - price - + + description + + + quantity + + + qty + + + + price + ``` @@ -2341,12 +2340,12 @@ ID: `mint_system.account.report_invoice_document.style_carbo_link` - - - + font-size: 1.5rem; + } + + ``` @@ -2368,39 +2367,39 @@ ID: `mint_system.account.report_invoice_document.style_moser` ```xml - - - - - - table table-sm o_main_table mt-4 - - + + + + + + table table-sm o_main_table mt-4 + + ``` Source: [snippets/account.report_invoice_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_moser.xml) @@ -2411,39 +2410,39 @@ ID: `mint_system.account.report_invoice_document.style_tissa` - - - + + + - - text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} - + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + - - text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} - + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + - - margin-bottom: 0px - + + margin-bottom: 0px + - - margin-bottom: 0px - + + margin-bottom: 0px + @@ -2456,88 +2455,88 @@ ID: `mint_system.account.report_invoice_document.style_trimada` - - - + + + -
          - -
          + + +
          - - -
          + + +
          - "integer" - - + "integer" + + ``` @@ -2702,7 +2701,7 @@ ID: `mint_system.account.report_invoice_document.unit_precision` - "integer" + "integer" @@ -2856,7 +2855,7 @@ ID: `mint_system.account.report_invoice_document.add_header_padding` padding-top: 2rem - +           @@ -2869,9 +2868,9 @@ ID: `mint_system.account.report_invoice_document.add_header_space` - - padding-top: 5rem - + + padding-top: 5rem + @@ -3047,12 +3046,12 @@ ID: `mint_system.account.report_invoice_document.add_taxes` - - - + font-size: 1.5rem; + } + + ``` @@ -3203,12 +3202,12 @@ ID: `mint_system.account.report_invoice_document.custom_taxes` - Steuern + Steuern - - - + + + @@ -3307,14 +3306,14 @@ ID: `mint_system.account.report_invoice_document.format_qty_with_decimal` - - - - - - - - + + + + + + + + ``` @@ -3898,8 +3897,8 @@ ID: `mint_system.account.report_invoice_document.product_weight`
          - Weight: - + Weight: +           @@ -3914,7 +3913,7 @@ ID: `mint_system.account.report_invoice_document.remove_incoterm` - + @@ -3928,7 +3927,7 @@ ID: `mint_system.account.report_invoice_document.remove_payment_communication` - + @@ -3941,7 +3940,7 @@ ID: `mint_system.account.report_invoice_document.remove_payment_term` -

          +

          @@ -4486,50 +4485,50 @@ ID: `mint_system.account.report_invoice_document.replace_summary` @@ -4609,7 +4608,6 @@ ID: `mint_system.account.report_invoice_document.replace_summary` - ``` Source: [snippets/account.report_invoice_document.replace_summary.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.replace_summary.xml) @@ -4653,7 +4651,7 @@ ID: `mint_system.account.report_invoice_document.round_price` - + @@ -4772,23 +4770,23 @@ ID: `mint_system.account.report_invoice_document.set_ids` - - th_quantity - + + th_quantity + - - description - - - quantity - - - qty - - - - price - + + description + + + quantity + + + qty + + + + price + ``` @@ -5087,12 +5085,12 @@ ID: `mint_system.account.report_invoice_document.style_carbo_link` - - - + font-size: 1.5rem; + } + + ``` @@ -5114,39 +5112,39 @@ ID: `mint_system.account.report_invoice_document.style_moser` ```xml - - - - - - table table-sm o_main_table mt-4 - - + + + + + + table table-sm o_main_table mt-4 + + ``` Source: [snippets/account.report_invoice_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_moser.xml) @@ -5157,39 +5155,39 @@ ID: `mint_system.account.report_invoice_document.style_tissa` - - - + + + - - text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} - + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + - - text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} - + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + - - margin-bottom: 0px - + + margin-bottom: 0px + - - margin-bottom: 0px - + + margin-bottom: 0px + @@ -5202,88 +5200,88 @@ ID: `mint_system.account.report_invoice_document.style_trimada` - - - + + + -
          - -
          + + +
          - - -
          + + +
          - "integer" - - + "integer" + + ``` @@ -5448,7 +5446,7 @@ ID: `mint_system.account.report_invoice_document.unit_precision` - "integer" + "integer" @@ -5515,6 +5513,21 @@ ID: `mint_system.account.res_config_settings_view_form.domain_expense_currency_e ``` Source: [snippets/account.res_config_settings_view_form.domain_expense_currency_exchange_account_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.res_config_settings_view_form.domain_expense_currency_exchange_account_id.xml) +## View Account Journal Form +### Show Payment Method Code +ID: `mint_system.account.view_account_journal_form.show_payment_method_code` +```xml + + + + + + + + +``` +Source: [snippets/account.view_account_journal_form.show_payment_method_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_account_journal_form.show_payment_method_code.xml) + ## View Account List ### Show Deprecated ID: `mint_system.account.view_account_list.show_deprecated` diff --git a/snippets/account.report_invoice_document.add_header_padding.xml b/snippets/account.report_invoice_document.add_header_padding.xml index 56a68329..623693cb 100644 --- a/snippets/account.report_invoice_document.add_header_padding.xml +++ b/snippets/account.report_invoice_document.add_header_padding.xml @@ -3,6 +3,6 @@ padding-top: 2rem - +           diff --git a/snippets/account.report_invoice_document.add_header_space.xml b/snippets/account.report_invoice_document.add_header_space.xml index 607e7951..2577560b 100644 --- a/snippets/account.report_invoice_document.add_header_space.xml +++ b/snippets/account.report_invoice_document.add_header_space.xml @@ -1,8 +1,8 @@ - - padding-top: 5rem - + + padding-top: 5rem + diff --git a/snippets/account.report_invoice_document.add_taxes.xml b/snippets/account.report_invoice_document.add_taxes.xml index 898f804c..32459881 100644 --- a/snippets/account.report_invoice_document.add_taxes.xml +++ b/snippets/account.report_invoice_document.add_taxes.xml @@ -1,12 +1,12 @@ - - - + font-size: 1.5rem; + } + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.custom_taxes.xml b/snippets/account.report_invoice_document.custom_taxes.xml index 877a97cb..0fd2e204 100644 --- a/snippets/account.report_invoice_document.custom_taxes.xml +++ b/snippets/account.report_invoice_document.custom_taxes.xml @@ -2,12 +2,12 @@ - Steuern + Steuern - - - + + + diff --git a/snippets/account.report_invoice_document.format_qty_with_decimal.xml b/snippets/account.report_invoice_document.format_qty_with_decimal.xml index ad37e512..f9825953 100644 --- a/snippets/account.report_invoice_document.format_qty_with_decimal.xml +++ b/snippets/account.report_invoice_document.format_qty_with_decimal.xml @@ -1,13 +1,13 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.product_weight.xml b/snippets/account.report_invoice_document.product_weight.xml index a8187473..a6905a1f 100644 --- a/snippets/account.report_invoice_document.product_weight.xml +++ b/snippets/account.report_invoice_document.product_weight.xml @@ -4,8 +4,8 @@
          - Weight: - + Weight: +           diff --git a/snippets/account.report_invoice_document.remove_incoterm.xml b/snippets/account.report_invoice_document.remove_incoterm.xml index 4381cbb7..77248f31 100644 --- a/snippets/account.report_invoice_document.remove_incoterm.xml +++ b/snippets/account.report_invoice_document.remove_incoterm.xml @@ -1,7 +1,7 @@ - + diff --git a/snippets/account.report_invoice_document.remove_payment_communication.xml b/snippets/account.report_invoice_document.remove_payment_communication.xml index ece2d9fd..48b89f6a 100644 --- a/snippets/account.report_invoice_document.remove_payment_communication.xml +++ b/snippets/account.report_invoice_document.remove_payment_communication.xml @@ -1,6 +1,6 @@ - + diff --git a/snippets/account.report_invoice_document.remove_payment_term.xml b/snippets/account.report_invoice_document.remove_payment_term.xml index bf90be4e..3b58e51e 100644 --- a/snippets/account.report_invoice_document.remove_payment_term.xml +++ b/snippets/account.report_invoice_document.remove_payment_term.xml @@ -1,6 +1,6 @@ -

          +

          diff --git a/snippets/account.report_invoice_document.replace_summary.xml b/snippets/account.report_invoice_document.replace_summary.xml index ec3d8122..712c8ec9 100644 --- a/snippets/account.report_invoice_document.replace_summary.xml +++ b/snippets/account.report_invoice_document.replace_summary.xml @@ -4,50 +4,50 @@ @@ -126,4 +126,3 @@ - diff --git a/snippets/account.report_invoice_document.round_price.xml b/snippets/account.report_invoice_document.round_price.xml index fadaca87..0c493c45 100644 --- a/snippets/account.report_invoice_document.round_price.xml +++ b/snippets/account.report_invoice_document.round_price.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.set_ids.xml b/snippets/account.report_invoice_document.set_ids.xml index ca39188f..fc817530 100644 --- a/snippets/account.report_invoice_document.set_ids.xml +++ b/snippets/account.report_invoice_document.set_ids.xml @@ -1,22 +1,22 @@ - - th_quantity - + + th_quantity + - - description - - - quantity - - - qty - - - - price - + + description + + + quantity + + + qty + + + + price + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.style_carbo_link.xml b/snippets/account.report_invoice_document.style_carbo_link.xml index 898f804c..32459881 100644 --- a/snippets/account.report_invoice_document.style_carbo_link.xml +++ b/snippets/account.report_invoice_document.style_carbo_link.xml @@ -1,12 +1,12 @@ - - - + font-size: 1.5rem; + } + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.style_moser.xml b/snippets/account.report_invoice_document.style_moser.xml index 142976fd..ff1582d8 100644 --- a/snippets/account.report_invoice_document.style_moser.xml +++ b/snippets/account.report_invoice_document.style_moser.xml @@ -1,36 +1,36 @@ - - - - - - table table-sm o_main_table mt-4 - - + + + + + + table table-sm o_main_table mt-4 + + \ No newline at end of file diff --git a/snippets/account.report_invoice_document.style_tissa.xml b/snippets/account.report_invoice_document.style_tissa.xml index 05f82d4a..b3ac7144 100644 --- a/snippets/account.report_invoice_document.style_tissa.xml +++ b/snippets/account.report_invoice_document.style_tissa.xml @@ -1,38 +1,38 @@ - - - + + + - - text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} - + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + - - text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} - + + text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }} + - - margin-bottom: 0px - + + margin-bottom: 0px + - - margin-bottom: 0px - + + margin-bottom: 0px + diff --git a/snippets/account.report_invoice_document.style_trimada.xml b/snippets/account.report_invoice_document.style_trimada.xml index e5f4ecbc..1dbbd39a 100644 --- a/snippets/account.report_invoice_document.style_trimada.xml +++ b/snippets/account.report_invoice_document.style_trimada.xml @@ -1,86 +1,86 @@ - - - + + + -
          - -
          + + +
          - - -
          + + +
          - "integer" - - + "integer" + + diff --git a/snippets/account.report_invoice_document.unit_precision.xml b/snippets/account.report_invoice_document.unit_precision.xml index 687f2db9..f02f9566 100644 --- a/snippets/account.report_invoice_document.unit_precision.xml +++ b/snippets/account.report_invoice_document.unit_precision.xml @@ -2,7 +2,7 @@ - "integer" + "integer" diff --git a/snippets/account.view_account_journal_form.show_payment_method_code.xml b/snippets/account.view_account_journal_form.show_payment_method_code.xml new file mode 100644 index 00000000..49b8a3f3 --- /dev/null +++ b/snippets/account.view_account_journal_form.show_payment_method_code.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/snippets/account_asset.md b/snippets/account_asset.md index 18cbfb9c..83e55669 100644 --- a/snippets/account_asset.md +++ b/snippets/account_asset.md @@ -7,16 +7,16 @@ ID: `mint_system.account_asset.view_account_asset_form.account_ids_optional` - {'invisible': ['|', ('display_account_asset_id', '=', False), ('asset_type', '!=', 'purchase')]} - + {'invisible': ['|', ('display_account_asset_id', '=', False), ('asset_type', '!=', 'purchase')]} + - - 0 - + + 0 + - 0 - + 0 + ``` diff --git a/snippets/account_asset.view_account_asset_form.account_ids_optional.xml b/snippets/account_asset.view_account_asset_form.account_ids_optional.xml index 0ed475e4..4e7f116c 100644 --- a/snippets/account_asset.view_account_asset_form.account_ids_optional.xml +++ b/snippets/account_asset.view_account_asset_form.account_ids_optional.xml @@ -2,15 +2,15 @@ - {'invisible': ['|', ('display_account_asset_id', '=', False), ('asset_type', '!=', 'purchase')]} - + {'invisible': ['|', ('display_account_asset_id', '=', False), ('asset_type', '!=', 'purchase')]} + - - 0 - + + 0 + - 0 - + 0 + \ No newline at end of file diff --git a/snippets/account_budget.md b/snippets/account_budget.md index 4bf7c6b8..2001c951 100644 --- a/snippets/account_budget.md +++ b/snippets/account_budget.md @@ -6,9 +6,9 @@ ID: `mint_system.account_budget.view_crossovered_budget_line_tree.show_budget` - - - + + + ``` diff --git a/snippets/account_budget.view_crossovered_budget_line_tree.show_budget.xml b/snippets/account_budget.view_crossovered_budget_line_tree.show_budget.xml index 5ef49e4d..e718ebec 100644 --- a/snippets/account_budget.view_crossovered_budget_line_tree.show_budget.xml +++ b/snippets/account_budget.view_crossovered_budget_line_tree.show_budget.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/snippets/account_financial_report.general_ledger.replace_layout.xml b/snippets/account_financial_report.general_ledger.replace_layout.xml index c0a120d8..bb3636a7 100644 --- a/snippets/account_financial_report.general_ledger.replace_layout.xml +++ b/snippets/account_financial_report.general_ledger.replace_layout.xml @@ -1,8 +1,8 @@ - - account_financial_report.internal_layout_trimada - + + account_financial_report.internal_layout_trimada + \ No newline at end of file diff --git a/snippets/account_financial_report.internal_layout.style_trimada.xml b/snippets/account_financial_report.internal_layout.style_trimada.xml index 32474ba6..05ed942d 100644 --- a/snippets/account_financial_report.internal_layout.style_trimada.xml +++ b/snippets/account_financial_report.internal_layout.style_trimada.xml @@ -1,123 +1,123 @@ - + - + .o_account_financial_reports_page { + padding-top: 10px; + width: 90%; + margin-right: auto; + margin-left: auto; + font-family: Helvetica, Arial; + } + - + \ No newline at end of file diff --git a/snippets/account_financial_report.internal_layout.trimada.xml b/snippets/account_financial_report.internal_layout.trimada.xml index e24f0e96..6e3db73e 100644 --- a/snippets/account_financial_report.internal_layout.trimada.xml +++ b/snippets/account_financial_report.internal_layout.trimada.xml @@ -1,167 +1,167 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + -

          -
          -
          - -
          -
          - -
          -
          -
            -
          • - -
            • -
          • /
            • -
          • - -
            • -
          -
          -
          -
          +
          +
          +
          + +
          +
          + +
          +
          +
            +
          • + +
            • +
          • /
            • +
          • + +
            • +
          +
          +
          +
          -           \ No newline at end of file diff --git a/snippets/account_financial_report.md b/snippets/account_financial_report.md index f7c07a94..232a98e2 100644 --- a/snippets/account_financial_report.md +++ b/snippets/account_financial_report.md @@ -6,9 +6,9 @@ ID: `mint_system.account_financial_report.general_ledger.replace_layout` - - account_financial_report.internal_layout_trimada - + + account_financial_report.internal_layout_trimada + ``` @@ -21,125 +21,125 @@ ID: `mint_system.account_financial_report.internal_layout.style_trimada` - + - + .o_account_financial_reports_page { + padding-top: 10px; + width: 90%; + margin-right: auto; + margin-left: auto; + font-family: Helvetica, Arial; + } + - + ``` Source: [snippets/account_financial_report.internal_layout.style_trimada.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_financial_report.internal_layout.style_trimada.xml) @@ -150,169 +150,169 @@ ID: `mint_system.account_financial_report.internal_layout.trimada` - + - - - - - - - - - - - - + + + + + + + + + + + + -
          -
          -
          - -
          -
          - -
          -
          -
            -
          • - -
            • -
          • /
            • -
          • - -
            • -
          -
          -
          -
          +
          +
          +
          + +
          +
          + +
          +
          +
            +
          • + +
            • +
          • /
            • +
          • + +
            • +
          +
          +
          +
          -           ``` Source: [snippets/account_financial_report.internal_layout.trimada.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_financial_report.internal_layout.trimada.xml) @@ -324,7 +324,7 @@ ID: `mint_system.account_financial_report.report_general_ledger_base.hide_filter - + ``` @@ -336,11 +336,11 @@ ID: `mint_system.account_financial_report.report_general_ledger_base.replace_tit - -
          Kontoauszug vom - bis -
          -           + +
          Kontoauszug vom + bis +
          +           ``` @@ -353,8 +353,8 @@ ID: `mint_system.account_financial_report.report_general_ledger_ending_cumul.hid - - + + ``` Source: [snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml) @@ -542,44 +542,44 @@ ID: `mint_system.account_financial_report.report_general_ledger_lines.replace_he - + -
          +
          - -
          + +
          Date -
          +
          - -
          Entry
          + +
          Entry
          - -
          - Account -
          + +
          + Account +
          - -
          Debit
          + +
          Debit
          - -
          Credit
          + +
          Credit
          - -
          + +
          Cumul. Bal. -
          +
          - - -
          Amount cur.
          - -
          Cumul cur.
          -           + + +
          Amount cur.
          + +
          Cumul cur.
          +           -
          +
          -           +           ``` diff --git a/snippets/account_financial_report.report_general_ledger_base.hide_filters.xml b/snippets/account_financial_report.report_general_ledger_base.hide_filters.xml index 40f7b288..488ca603 100644 --- a/snippets/account_financial_report.report_general_ledger_base.hide_filters.xml +++ b/snippets/account_financial_report.report_general_ledger_base.hide_filters.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/snippets/account_financial_report.report_general_ledger_base.replace_title.xml b/snippets/account_financial_report.report_general_ledger_base.replace_title.xml index 2d6e611c..c6296dd2 100644 --- a/snippets/account_financial_report.report_general_ledger_base.replace_title.xml +++ b/snippets/account_financial_report.report_general_ledger_base.replace_title.xml @@ -1,10 +1,10 @@ - -
          Kontoauszug vom - bis -
          -           + +
          Kontoauszug vom + bis +
          +           \ No newline at end of file diff --git a/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml b/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml index b09ac2ea..de3e9de2 100644 --- a/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml +++ b/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/snippets/account_financial_report.report_general_ledger_lines.replace_header.xml b/snippets/account_financial_report.report_general_ledger_lines.replace_header.xml index 2d81203b..913757ba 100644 --- a/snippets/account_financial_report.report_general_ledger_lines.replace_header.xml +++ b/snippets/account_financial_report.report_general_ledger_lines.replace_header.xml @@ -1,43 +1,43 @@ - + -
          +
          - -
          + +
          Date -
          +
          - -
          Entry
          + +
          Entry
          - -
          - Account -
          + +
          + Account +
          - -
          Debit
          + +
          Debit
          - -
          Credit
          + +
          Credit
          - -
          + +
          Cumul. Bal. -
          +
          - - -
          Amount cur.
          - -
          Cumul cur.
          -           + + +
          Amount cur.
          + +
          Cumul cur.
          +           -
          +
          -           +           \ No newline at end of file diff --git a/snippets/account_sale_timesheet_report.md b/snippets/account_sale_timesheet_report.md index 0020fc71..b71751e2 100644 --- a/snippets/account_sale_timesheet_report.md +++ b/snippets/account_sale_timesheet_report.md @@ -45,6 +45,43 @@ ID: `mint_system.account_sale_timesheet_report.report_invoice_with_timesheets.pr ``` Source: [snippets/account_sale_timesheet_report.report_invoice_with_timesheets.print_with_payments.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_sale_timesheet_report.report_invoice_with_timesheets.print_with_payments.xml) +## Report Sale +### Set Page Font Size +ID: `mint_system.account_sale_timesheet_report.report_sale.set_page_font_size` +```xml + + + + + + + + +``` +Source: [snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml) + +### Set Title Font Size +ID: `mint_system.account_sale_timesheet_report.report_sale.set_title_font_size` +```xml + + + + + + + + +``` +Source: [snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml) + ## Timesheet Report ### Add Title Space ID: `mint_system.account_sale_timesheet_report.timesheet_report.add_title_space` diff --git a/snippets/base.md b/snippets/base.md index cb4548ed..ef8ba7ab 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -185,9 +185,9 @@ ID: `mint_system.base.view_company_form.show_account_onboarding_panel` - - - + + + @@ -200,9 +200,9 @@ ID: `mint_system.base.view_company_form.show_analytic_plan_id` - - - + + + @@ -637,6 +637,21 @@ ID: `mint_system.base.view_partner_tree.property_payment_term_id` ``` Source: [snippets/base.view_partner_tree.property_payment_term_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.property_payment_term_id.xml) +### Show Company Registry +ID: `mint_system.base.view_partner_tree.show_company_registry` +```xml + + + + + + + + + +``` +Source: [snippets/base.view_partner_tree.show_company_registry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_company_registry.xml) + ### Show Industry ID: `mint_system.base.view_partner_tree.show_industry` ```xml @@ -777,7 +792,7 @@ Source: [snippets/base.view_partner_tree.x_vst.xml](https://github.com/Mint-Syst ID: `mint_system.base.view_res_bank_tree.add_zip` ```xml - + diff --git a/snippets/base.view_company_form.show_account_onboarding_panel.xml b/snippets/base.view_company_form.show_account_onboarding_panel.xml index 817b9edb..563787e1 100644 --- a/snippets/base.view_company_form.show_account_onboarding_panel.xml +++ b/snippets/base.view_company_form.show_account_onboarding_panel.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/snippets/base.view_company_form.show_analytic_plan_id.xml b/snippets/base.view_company_form.show_analytic_plan_id.xml index ef2198c6..5dd0a18d 100644 --- a/snippets/base.view_company_form.show_analytic_plan_id.xml +++ b/snippets/base.view_company_form.show_analytic_plan_id.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/snippets/base.view_res_bank_tree.add_zip.xml b/snippets/base.view_res_bank_tree.add_zip.xml index 883ad2d1..5a848735 100644 --- a/snippets/base.view_res_bank_tree.add_zip.xml +++ b/snippets/base.view_res_bank_tree.add_zip.xml @@ -1,5 +1,5 @@ - + diff --git a/snippets/business_requirement.md b/snippets/business_requirement.md index c9bcd5fe..93994ea0 100644 --- a/snippets/business_requirement.md +++ b/snippets/business_requirement.md @@ -6,9 +6,9 @@ ID: `mint_system.business_requirement.view_business_requirement_form.clickable_s - - 1 - + + 1 + ``` @@ -20,7 +20,7 @@ ID: `mint_system.business_requirement.view_business_requirement_form.hide_scenar - + ``` @@ -32,7 +32,7 @@ ID: `mint_system.business_requirement.view_business_requirement_form.hide_terms_ - + ``` @@ -44,7 +44,7 @@ ID: `mint_system.business_requirement.view_business_requirement_form.hide_test_c - + ``` @@ -56,10 +56,10 @@ ID: `mint_system.business_requirement.view_business_requirement_form.x_planned_h - - - - + + + + ``` @@ -71,8 +71,8 @@ ID: `mint_system.business_requirement.view_business_requirement_form.x_project_i - - + + @@ -85,8 +85,8 @@ ID: `mint_system.business_requirement.view_business_requirement_form.x_task_id` - - + + @@ -100,8 +100,8 @@ ID: `mint_system.business_requirement.view_business_requirement_search.x_project - - + + @@ -115,7 +115,7 @@ ID: `mint_system.business_requirement.view_business_requirement_tree.hide_catego - + ``` @@ -127,8 +127,8 @@ ID: `mint_system.business_requirement.view_business_requirement_tree.x_planned_h - - + + @@ -141,8 +141,8 @@ ID: `mint_system.business_requirement.view_business_requirement_tree.x_project_i - - + + diff --git a/snippets/business_requirement.view_business_requirement_form.clickable_state.xml b/snippets/business_requirement.view_business_requirement_form.clickable_state.xml index 2a0ccf05..f97beb66 100644 --- a/snippets/business_requirement.view_business_requirement_form.clickable_state.xml +++ b/snippets/business_requirement.view_business_requirement_form.clickable_state.xml @@ -1,8 +1,8 @@ - - 1 - + + 1 + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml b/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml index 263f7905..fac70991 100644 --- a/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml +++ b/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml b/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml index 73502c9f..51bff6be 100644 --- a/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml +++ b/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml b/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml index f2c6695e..218c776c 100644 --- a/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml +++ b/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost.xml b/snippets/business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost.xml index d3106f65..79c5162d 100644 --- a/snippets/business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost.xml +++ b/snippets/business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost.xml @@ -1,9 +1,9 @@ - - - - + + + + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_form.x_project_id.xml b/snippets/business_requirement.view_business_requirement_form.x_project_id.xml index de806605..12cff261 100644 --- a/snippets/business_requirement.view_business_requirement_form.x_project_id.xml +++ b/snippets/business_requirement.view_business_requirement_form.x_project_id.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_form.x_task_id.xml b/snippets/business_requirement.view_business_requirement_form.x_task_id.xml index 33bb79fc..f7df2f30 100644 --- a/snippets/business_requirement.view_business_requirement_form.x_task_id.xml +++ b/snippets/business_requirement.view_business_requirement_form.x_task_id.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_search.x_project_id.xml b/snippets/business_requirement.view_business_requirement_search.x_project_id.xml index 2b9fe326..1840d12b 100644 --- a/snippets/business_requirement.view_business_requirement_search.x_project_id.xml +++ b/snippets/business_requirement.view_business_requirement_search.x_project_id.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml b/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml index 9f4cc630..054770a1 100644 --- a/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml +++ b/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_tree.x_planned_hours.xml b/snippets/business_requirement.view_business_requirement_tree.x_planned_hours.xml index 3165e120..ef2a99d8 100644 --- a/snippets/business_requirement.view_business_requirement_tree.x_planned_hours.xml +++ b/snippets/business_requirement.view_business_requirement_tree.x_planned_hours.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/snippets/business_requirement.view_business_requirement_tree.x_project_id.xml b/snippets/business_requirement.view_business_requirement_tree.x_project_id.xml index 893e842f..bad1556b 100644 --- a/snippets/business_requirement.view_business_requirement_tree.x_project_id.xml +++ b/snippets/business_requirement.view_business_requirement_tree.x_project_id.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/snippets/industry_fsm.md b/snippets/industry_fsm.md index 54b7987d..8ba39b9e 100644 --- a/snippets/industry_fsm.md +++ b/snippets/industry_fsm.md @@ -106,21 +106,21 @@ ID: `mint_system.industry_fsm.worksheet_custom_page.style_moser` ```xml - - - + #title { + font-size: 1.2rem; + } + + ``` diff --git a/snippets/industry_fsm.worksheet_custom_page.style_moser.xml b/snippets/industry_fsm.worksheet_custom_page.style_moser.xml index d632b2f7..a9bdc028 100644 --- a/snippets/industry_fsm.worksheet_custom_page.style_moser.xml +++ b/snippets/industry_fsm.worksheet_custom_page.style_moser.xml @@ -1,19 +1,19 @@ - - - + #title { + font-size: 1.2rem; + } + + \ No newline at end of file diff --git a/snippets/industry_fsm_sale.md b/snippets/industry_fsm_sale.md index df571f51..5c592ff4 100644 --- a/snippets/industry_fsm_sale.md +++ b/snippets/industry_fsm_sale.md @@ -110,9 +110,9 @@ ID: `mint_system.industry_fsm_sale.worksheet_time_and_material.style_moser` diff --git a/snippets/industry_fsm_sale.worksheet_time_and_material.style_moser.xml b/snippets/industry_fsm_sale.worksheet_time_and_material.style_moser.xml index f4ce8742..b294e356 100644 --- a/snippets/industry_fsm_sale.worksheet_time_and_material.style_moser.xml +++ b/snippets/industry_fsm_sale.worksheet_time_and_material.style_moser.xml @@ -2,9 +2,9 @@ diff --git a/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml b/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml index 7fce761f..1bdbbf34 100644 --- a/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml +++ b/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml @@ -1,8 +1,8 @@ - - - - - - - - - - + + + + + + @@ -923,7 +923,7 @@ ID: `mint_system.mrp.report_mrporder.modify_section_consumed_products`
          MengeDatum
          +
          MengeDatum
          Termin:
          - +           @@ -1195,10 +1195,10 @@ ID: `mint_system.mrp.report_mrporder.quality_points` - -
            -
          • ☐
            • -
          + +
            +
          • ☐
            • +
          @@ -1290,11 +1290,11 @@ ID: `mint_system.mrp.report_mrporder.show_expected` - - -
          Expected date:
          -           -           + + +
          Expected date:
          +           +           ``` @@ -1321,21 +1321,21 @@ ID: `mint_system.mrp.report_mrporder.show_lot` - - -
          Expected date:
          -           + + +
          Expected date:
          +           - + - -
          Lot(s): -           -           + +
          Lot(s): +           +           @@ -1411,7 +1411,7 @@ ID: `mint_system.mrp.report_mrporder.show_stock` ```xml - + Lagerort (Los) Menge @@ -1489,7 +1489,7 @@ ID: `mint_system.mrp.stock_report_delivery_kit_sections.expand_section_heading` ```xml - +
          bestehend aus:           @@ -1504,10 +1504,10 @@ ID: `mint_system.mrp.view_mrp_bom_filter.add_operation_ids` - - - - + + + + ``` @@ -1519,9 +1519,9 @@ ID: `mint_system.mrp.view_mrp_bom_filter.add_x_type_description` - - - + + + ``` @@ -1549,9 +1549,9 @@ ID: `mint_system.mrp.view_mrp_production_filter.add_not_planned` - - - + + + ``` diff --git a/snippets/mrp.mrp_bom_tree_view.sort_id.xml b/snippets/mrp.mrp_bom_tree_view.sort_id.xml index 8700ed55..279b02cb 100644 --- a/snippets/mrp.mrp_bom_tree_view.sort_id.xml +++ b/snippets/mrp.mrp_bom_tree_view.sort_id.xml @@ -4,5 +4,5 @@ id desc - +           \ No newline at end of file diff --git a/snippets/mrp.mrp_production_form_view.show_backorder_and_procurement_group.xml b/snippets/mrp.mrp_production_form_view.show_backorder_and_procurement_group.xml index 62fc72e3..827791f8 100644 --- a/snippets/mrp.mrp_production_form_view.show_backorder_and_procurement_group.xml +++ b/snippets/mrp.mrp_production_form_view.show_backorder_and_procurement_group.xml @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/snippets/mrp.mrp_production_form_view.x_note.xml b/snippets/mrp.mrp_production_form_view.x_note.xml index e4501d6e..3431aa3d 100644 --- a/snippets/mrp.mrp_production_form_view.x_note.xml +++ b/snippets/mrp.mrp_production_form_view.x_note.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml b/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml index 38061d3a..2967c166 100644 --- a/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml +++ b/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml @@ -3,5 +3,5 @@ - +           diff --git a/snippets/mrp.mrp_production_tree_view.show_x_date_deadline.xml b/snippets/mrp.mrp_production_tree_view.show_x_date_deadline.xml index 2297ca44..fe1cfb0d 100644 --- a/snippets/mrp.mrp_production_tree_view.show_x_date_deadline.xml +++ b/snippets/mrp.mrp_production_tree_view.show_x_date_deadline.xml @@ -4,5 +4,5 @@ - +           diff --git a/snippets/mrp.mrp_production_tree_view.sort_date_planned_start.xml b/snippets/mrp.mrp_production_tree_view.sort_date_planned_start.xml index 86e996eb..6fb949d9 100644 --- a/snippets/mrp.mrp_production_tree_view.sort_date_planned_start.xml +++ b/snippets/mrp.mrp_production_tree_view.sort_date_planned_start.xml @@ -4,5 +4,5 @@ date_planned_start asc - + diff --git a/snippets/mrp.report_mrporder.list_quality_points.xml b/snippets/mrp.report_mrporder.list_quality_points.xml index 0921c794..82de9c90 100644 --- a/snippets/mrp.report_mrporder.list_quality_points.xml +++ b/snippets/mrp.report_mrporder.list_quality_points.xml @@ -2,10 +2,10 @@ - -
            -
            • -
          + +
            +
            • +
          diff --git a/snippets/mrp.report_mrporder.modify_section_consumed_products.xml b/snippets/mrp.report_mrporder.modify_section_consumed_products.xml index 792f596a..e2445992 100644 --- a/snippets/mrp.report_mrporder.modify_section_consumed_products.xml +++ b/snippets/mrp.report_mrporder.modify_section_consumed_products.xml @@ -14,13 +14,13 @@ } - - - - - - - + + + + + + @@ -28,6 +28,6 @@
          MengeDatum
          +
          MengeDatum
          Termin:
          - + diff --git a/snippets/mrp.report_mrporder.quality_points.xml b/snippets/mrp.report_mrporder.quality_points.xml index 0118fd87..3d5e79a3 100644 --- a/snippets/mrp.report_mrporder.quality_points.xml +++ b/snippets/mrp.report_mrporder.quality_points.xml @@ -1,10 +1,10 @@ - -
            -
          • ☐
            • -
          + +
            +
          • ☐
            • +
          diff --git a/snippets/mrp.report_mrporder.show_expected.xml b/snippets/mrp.report_mrporder.show_expected.xml index 73b5ef42..118ac602 100644 --- a/snippets/mrp.report_mrporder.show_expected.xml +++ b/snippets/mrp.report_mrporder.show_expected.xml @@ -1,9 +1,9 @@ - - -
          Expected date:
          -           -           + + +
          Expected date:
          +           +           diff --git a/snippets/mrp.report_mrporder.show_lot.xml b/snippets/mrp.report_mrporder.show_lot.xml index f78113bb..071d817c 100644 --- a/snippets/mrp.report_mrporder.show_lot.xml +++ b/snippets/mrp.report_mrporder.show_lot.xml @@ -2,20 +2,20 @@ - - -
          Expected date:
          -           + + +
          Expected date:
          +           - + - -
          Lot(s): -           -           + +
          Lot(s): +           +           diff --git a/snippets/mrp.report_mrporder.show_stock.xml b/snippets/mrp.report_mrporder.show_stock.xml index 30a64cbb..aa31658a 100644 --- a/snippets/mrp.report_mrporder.show_stock.xml +++ b/snippets/mrp.report_mrporder.show_stock.xml @@ -1,6 +1,6 @@ - + Lagerort (Los) Menge diff --git a/snippets/mrp.stock_report_delivery_kit_sections.expand_section_heading.xml b/snippets/mrp.stock_report_delivery_kit_sections.expand_section_heading.xml index 9b3f05f3..69573514 100644 --- a/snippets/mrp.stock_report_delivery_kit_sections.expand_section_heading.xml +++ b/snippets/mrp.stock_report_delivery_kit_sections.expand_section_heading.xml @@ -1,6 +1,6 @@ - +
          bestehend aus:           diff --git a/snippets/mrp.view_mrp_bom_filter.add_operation_ids.xml b/snippets/mrp.view_mrp_bom_filter.add_operation_ids.xml index 70730a75..a3f121aa 100644 --- a/snippets/mrp.view_mrp_bom_filter.add_operation_ids.xml +++ b/snippets/mrp.view_mrp_bom_filter.add_operation_ids.xml @@ -1,9 +1,9 @@ - - - - + + + + \ No newline at end of file diff --git a/snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml b/snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml index 2d2a229e..8bf8e435 100644 --- a/snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml +++ b/snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/snippets/mrp.view_mrp_production_filter.add_not_planned.xml b/snippets/mrp.view_mrp_production_filter.add_not_planned.xml index 3d52480c..3623de39 100644 --- a/snippets/mrp.view_mrp_production_filter.add_not_planned.xml +++ b/snippets/mrp.view_mrp_production_filter.add_not_planned.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/snippets/project.md b/snippets/project.md index 95bfea95..d9917626 100644 --- a/snippets/project.md +++ b/snippets/project.md @@ -413,8 +413,8 @@ ID: `mint_system.project.view_task_form2.x_business_requirement_id` - - + + @@ -428,8 +428,8 @@ ID: `mint_system.project.view_task_form2.x_lead_id` - - + + diff --git a/snippets/project.view_task_form2.x_business_requirement_id.xml b/snippets/project.view_task_form2.x_business_requirement_id.xml index 3c811f0b..ed93a0e9 100644 --- a/snippets/project.view_task_form2.x_business_requirement_id.xml +++ b/snippets/project.view_task_form2.x_business_requirement_id.xml @@ -1,8 +1,8 @@ - - + + diff --git a/snippets/project.view_task_form2.x_lead_id.xml b/snippets/project.view_task_form2.x_lead_id.xml index 4adb61a3..82ef811a 100644 --- a/snippets/project.view_task_form2.x_lead_id.xml +++ b/snippets/project.view_task_form2.x_lead_id.xml @@ -1,8 +1,8 @@ - - + + diff --git a/snippets/purchase.md b/snippets/purchase.md index 65b27826..b907948d 100644 --- a/snippets/purchase.md +++ b/snippets/purchase.md @@ -1448,13 +1448,13 @@ ID: `mint_system.purchase.report_purchaseorder_document.set_ids` - - product_qty - + + product_qty + - product_uom - + product_uom +           @@ -1487,25 +1487,25 @@ ID: `mint_system.purchase.report_purchaseorder_document.style_carbo_link` ```xml - - - + + + - - "date" - + + "date" + - - "date" - + + "date" + ``` @@ -1516,9 +1516,9 @@ ID: `mint_system.purchase.report_purchaseorder_document.style_gelso` ```xml - - - + + + ``` @@ -1530,46 +1530,46 @@ ID: `mint_system.purchase.report_purchaseorder_document.style_moser` - - + + - - - + + + - - "date" - + + "date" + - - ['address'] - + + ['address'] + - - ['address', 'name'] - + + ['address', 'name'] + ``` @@ -1581,31 +1581,31 @@ ID: `mint_system.purchase.report_purchaseorder_document.style_tissa` - - - + + + - - {"widget": "contact", "fields": ["address"], "no_marker": True, "phone_icons": False} - + + {"widget": "contact", "fields": ["address"], "no_marker": True, "phone_icons": False} + - - {"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False} - + + {"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False} + ``` @@ -2275,9 +2275,9 @@ ID: `mint_system.purchase.report_purchasequotation_document.set_ids` - - product_qty - + + product_qty + ``` @@ -2289,44 +2289,44 @@ ID: `mint_system.purchase.report_purchasequotation_document.style_moser` - - - + + + - - - + + + - - "date" - + + "date" + - - ['address'] - + + ['address'] + - - ['address', 'name'] - + + ['address', 'name'] + ``` @@ -2338,78 +2338,78 @@ ID: `mint_system.purchase.report_purchasequotation_document.style_trimada` - - - + + + - - - + + + - - - + + + ``` diff --git a/snippets/purchase.report_purchaseorder_document.set_ids.xml b/snippets/purchase.report_purchaseorder_document.set_ids.xml index 04e20ac7..0216ca4e 100644 --- a/snippets/purchase.report_purchaseorder_document.set_ids.xml +++ b/snippets/purchase.report_purchaseorder_document.set_ids.xml @@ -1,12 +1,12 @@ - - product_qty - + + product_qty + - product_uom - + product_uom + diff --git a/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml b/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml index cb7fbfd4..4f93eeaf 100644 --- a/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml +++ b/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml @@ -1,23 +1,23 @@ - - - + + + - - "date" - + + "date" + - - "date" - + + "date" + \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.style_gelso.xml b/snippets/purchase.report_purchaseorder_document.style_gelso.xml index b3d263f8..2d1ea4cf 100644 --- a/snippets/purchase.report_purchaseorder_document.style_gelso.xml +++ b/snippets/purchase.report_purchaseorder_document.style_gelso.xml @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.style_moser.xml b/snippets/purchase.report_purchaseorder_document.style_moser.xml index 19496d72..00d2a2c9 100644 --- a/snippets/purchase.report_purchaseorder_document.style_moser.xml +++ b/snippets/purchase.report_purchaseorder_document.style_moser.xml @@ -1,45 +1,45 @@ - - + + - - - + + + - - "date" - + + "date" + - - ['address'] - + + ['address'] + - - ['address', 'name'] - + + ['address', 'name'] + \ No newline at end of file diff --git a/snippets/purchase.report_purchaseorder_document.style_tissa.xml b/snippets/purchase.report_purchaseorder_document.style_tissa.xml index e7cd0a1a..d34039bd 100644 --- a/snippets/purchase.report_purchaseorder_document.style_tissa.xml +++ b/snippets/purchase.report_purchaseorder_document.style_tissa.xml @@ -1,30 +1,30 @@ - - - + + + - - {"widget": "contact", "fields": ["address"], "no_marker": True, "phone_icons": False} - + + {"widget": "contact", "fields": ["address"], "no_marker": True, "phone_icons": False} + - - {"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False} - + + {"widget": "contact", "fields": ["address", "name"], "no_marker": True, "phone_icons": False} + \ No newline at end of file diff --git a/snippets/purchase.report_purchasequotation_document.set_ids.xml b/snippets/purchase.report_purchasequotation_document.set_ids.xml index 6c270ccd..f2674bbb 100644 --- a/snippets/purchase.report_purchasequotation_document.set_ids.xml +++ b/snippets/purchase.report_purchasequotation_document.set_ids.xml @@ -1,8 +1,8 @@ - - product_qty - + + product_qty + \ No newline at end of file diff --git a/snippets/purchase.report_purchasequotation_document.style_moser.xml b/snippets/purchase.report_purchasequotation_document.style_moser.xml index fc584047..6c98f7b7 100644 --- a/snippets/purchase.report_purchasequotation_document.style_moser.xml +++ b/snippets/purchase.report_purchasequotation_document.style_moser.xml @@ -1,43 +1,43 @@ - - - + + + - - - + + + - - "date" - + + "date" + - - ['address'] - + + ['address'] + - - ['address', 'name'] - + + ['address', 'name'] + \ No newline at end of file diff --git a/snippets/purchase.report_purchasequotation_document.style_trimada.xml b/snippets/purchase.report_purchasequotation_document.style_trimada.xml index 825e07b0..9f124411 100644 --- a/snippets/purchase.report_purchasequotation_document.style_trimada.xml +++ b/snippets/purchase.report_purchasequotation_document.style_trimada.xml @@ -1,77 +1,77 @@ - - - + + + - - - + + + - - - + + + \ No newline at end of file diff --git a/snippets/purchase_requisition.md b/snippets/purchase_requisition.md index 116af5c7..fd63cb70 100644 --- a/snippets/purchase_requisition.md +++ b/snippets/purchase_requisition.md @@ -682,8 +682,8 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.replace_title`

          Request for Quotation purchase contract

          -

          Purchase contract

          -           +

          Purchase contract

          +           @@ -697,9 +697,9 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.round_price` - - - + + + @@ -787,61 +787,61 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.set_ids` - - product_qty - + + product_qty + - - informations - - - - main_table - - - - details - - - - title_product - - - - name - - - - first - - - - name - - - - product_qty - - - - product_qty - - - - product_uom - + + informations + + + + main_table + + + + details + + + + title_product + + + + name + + + + first + + + + name + + + + product_qty + + + + product_qty + + + + product_uom + - - product_uom - - - - schedule_date - - - - schedule_date - + + product_uom + + + + schedule_date + + + + schedule_date + @@ -849,21 +849,21 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.set_ids` - - title_product - + + title_product + - - title_details - - - - product_qty - - - - details - + + title_details + + + + product_qty + + + + details + --> @@ -898,46 +898,46 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_gelso` - - - + + + - - col-auto - + + col-auto + - - col-auto - + + col-auto + - - col-auto - + + col-auto + - - col-auto - + + col-auto + ``` @@ -949,64 +949,64 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_trimada` - - - - - - - + + + + + + + ``` diff --git a/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml b/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml index fc444cb1..d2447db6 100644 --- a/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml +++ b/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml @@ -6,8 +6,8 @@

          Request for Quotation purchase contract

          -

          Purchase contract

          -           +

          Purchase contract

          +           \ No newline at end of file diff --git a/snippets/purchase_requisition.report_purchaserequisitions.round_price.xml b/snippets/purchase_requisition.report_purchaserequisitions.round_price.xml index fb57b652..0dc72811 100644 --- a/snippets/purchase_requisition.report_purchaserequisitions.round_price.xml +++ b/snippets/purchase_requisition.report_purchaserequisitions.round_price.xml @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml b/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml index 15d51040..db54ef7b 100644 --- a/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml +++ b/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml @@ -1,61 +1,61 @@ - - product_qty - + + product_qty + - - informations - - - - main_table - - - - details - - - - title_product - - - - name - - - - first - - - - name - - - - product_qty - - - - product_qty - - - - product_uom - + + informations + + + + main_table + + + + details + + + + title_product + + + + name + + + + first + + + + name + + + + product_qty + + + + product_qty + + + + product_uom + - - product_uom - - - - schedule_date - - - - schedule_date - + + product_uom + + + + schedule_date + + + + schedule_date + @@ -63,21 +63,21 @@ - - title_product - + + title_product + - - title_details - - - - product_qty - - - - details - + + title_details + + + + product_qty + + + + details + --> \ No newline at end of file diff --git a/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml b/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml index e9840fc4..eadc0c54 100644 --- a/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml +++ b/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml @@ -1,45 +1,45 @@ - - - + + + - - col-auto - + + col-auto + - - col-auto - + + col-auto + - - col-auto - + + col-auto + - - col-auto - + + col-auto + \ No newline at end of file diff --git a/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml b/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml index 69729aa8..65761766 100644 --- a/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml +++ b/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml @@ -1,63 +1,63 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/snippets/sale.md b/snippets/sale.md index 399ff4ac..2588915c 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -594,9 +594,9 @@ ID: `mint_system.sale.report_blanketorder_document.set_ids` - - table_total - + + table_total + ``` @@ -1035,9 +1035,9 @@ ID: `mint_system.sale.report_saleorder_document.add_header_space` - - padding-top: 5rem - + + padding-top: 5rem + @@ -1050,17 +1050,17 @@ ID: `mint_system.sale.report_saleorder_document.add_incoterm_blanket_order` - -
          - Incoterm: - -

          - - -

          - -

          -           + +
          + Incoterm: + +

          + + +

          + +

          +           ``` @@ -1072,14 +1072,14 @@ ID: `mint_system.sale.report_saleorder_document.add_informations_space` - - - + + + @@ -1199,9 +1199,9 @@ ID: `mint_system.sale.report_saleorder_document.add_note_space` padding-right: 75px; } -
          -

          -

          +
          +

          +

          @@ -1396,9 +1396,9 @@ ID: `mint_system.sale.report_saleorder_document.add_shipping_address_space` - - mt-3 d-block - + + mt-3 d-block + @@ -1773,14 +1773,14 @@ ID: `mint_system.sale.report_saleorder_document.format_qty_with_decimal` - - - - - - - - + + + + + + + + ``` @@ -1792,13 +1792,13 @@ ID: `mint_system.sale.report_saleorder_document.format_qty` - - "integer" - + + "integer" + - + ``` @@ -2257,39 +2257,39 @@ ID: `mint_system.sale.report_saleorder_document.replace_summary` @@ -2515,32 +2515,32 @@ ID: `mint_system.sale.report_saleorder_document.set_ids` - incoterm - - - - date_order - + incoterm + + + + date_order + - - description - + + description + - - product_uom_qty - + + product_uom_qty + - - product_uom_qty - - - - product_uom - + + product_uom_qty + + + + product_uom + - - product_uom_qty - + + product_uom_qty + ``` @@ -2720,18 +2720,18 @@ ID: `mint_system.sale.report_saleorder_document.style_carbo_link` ```xml - - - + + + - - "date" - + + "date" + ``` @@ -2743,13 +2743,13 @@ ID: `mint_system.sale.report_saleorder_document.style_gelso` - - - - - - "date" - + + + + + + "date" + ``` @@ -2760,32 +2760,32 @@ ID: `mint_system.sale.report_saleorder_document.style_moser` ```xml - - - - + + + + ``` Source: [snippets/sale.report_saleorder_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_moser.xml) @@ -2796,78 +2796,77 @@ ID: `mint_system.sale.report_saleorder_document.style_tissa` - - - + + + - - - - - - text-right - + + + + + + text-right + - ``` Source: [snippets/sale.report_saleorder_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_tissa.xml) @@ -2877,78 +2876,77 @@ ID: `mint_system.sale.report_saleorder_document.style_trimada` - - - + + + - - - - - - text-right - + + + + + + text-right + - ``` Source: [snippets/sale.report_saleorder_document.style_trimada.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_trimada.xml) @@ -2958,13 +2956,13 @@ ID: `mint_system.sale.report_saleorder_document.x_hide_on_sale_order` - - not line.display_type and not line.product_id.x_hide_on_sale_order - + + not line.display_type and not line.product_id.x_hide_on_sale_order + - - - + + + ``` @@ -3263,9 +3261,9 @@ ID: `mint_system.sale.sale_order_portal_content.format_qty` - - "integer" - + + "integer" + @@ -3279,11 +3277,11 @@ ID: `mint_system.sale.sale_order_portal_content.get_position` - + - + @@ -3299,7 +3297,7 @@ ID: `mint_system.sale.sale_order_portal_content.product_name` - + @@ -3343,7 +3341,7 @@ ID: `mint_system.sale.sale_order_portal_content.remove_discount_percentage` - Rabatt + Rabatt @@ -3371,7 +3369,7 @@ ID: `mint_system.sale.sale_order_portal_content.show_default_code` - + @@ -3380,7 +3378,7 @@ ID: `mint_system.sale.sale_order_portal_content.show_default_code` white-space: nowrap; } - + diff --git a/snippets/sale.report_blanketorder_document.set_ids.xml b/snippets/sale.report_blanketorder_document.set_ids.xml index 03b20e53..73094b75 100644 --- a/snippets/sale.report_blanketorder_document.set_ids.xml +++ b/snippets/sale.report_blanketorder_document.set_ids.xml @@ -1,8 +1,8 @@ - - table_total - + + table_total + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.add_header_space.xml b/snippets/sale.report_saleorder_document.add_header_space.xml index a0009b3b..e8d2975d 100644 --- a/snippets/sale.report_saleorder_document.add_header_space.xml +++ b/snippets/sale.report_saleorder_document.add_header_space.xml @@ -1,8 +1,8 @@ - - padding-top: 5rem - + + padding-top: 5rem + diff --git a/snippets/sale.report_saleorder_document.add_incoterm_blanket_order.xml b/snippets/sale.report_saleorder_document.add_incoterm_blanket_order.xml index 424c4865..4280b89d 100644 --- a/snippets/sale.report_saleorder_document.add_incoterm_blanket_order.xml +++ b/snippets/sale.report_saleorder_document.add_incoterm_blanket_order.xml @@ -1,16 +1,16 @@ - -
          - Incoterm: - -

          - - -

          - -

          -           + +
          + Incoterm: + +

          + + +

          + +

          +           \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.add_informations_space.xml b/snippets/sale.report_saleorder_document.add_informations_space.xml index 7b4b8791..0a698865 100644 --- a/snippets/sale.report_saleorder_document.add_informations_space.xml +++ b/snippets/sale.report_saleorder_document.add_informations_space.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/snippets/sale.report_saleorder_document.add_note_space.xml b/snippets/sale.report_saleorder_document.add_note_space.xml index d6640856..a4e3d21f 100644 --- a/snippets/sale.report_saleorder_document.add_note_space.xml +++ b/snippets/sale.report_saleorder_document.add_note_space.xml @@ -9,9 +9,9 @@ padding-right: 75px; } -
          -

          -

          +
          +

          +

          diff --git a/snippets/sale.report_saleorder_document.add_shipping_address_space.xml b/snippets/sale.report_saleorder_document.add_shipping_address_space.xml index 3ca5b8d7..be8d915b 100644 --- a/snippets/sale.report_saleorder_document.add_shipping_address_space.xml +++ b/snippets/sale.report_saleorder_document.add_shipping_address_space.xml @@ -1,8 +1,8 @@ - - mt-3 d-block - + + mt-3 d-block + diff --git a/snippets/sale.report_saleorder_document.format_qty.xml b/snippets/sale.report_saleorder_document.format_qty.xml index 1d752f11..ec174dc5 100644 --- a/snippets/sale.report_saleorder_document.format_qty.xml +++ b/snippets/sale.report_saleorder_document.format_qty.xml @@ -1,12 +1,12 @@ - - "integer" - + + "integer" + - + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.format_qty_with_decimal.xml b/snippets/sale.report_saleorder_document.format_qty_with_decimal.xml index 21a35a56..86b0aa6b 100644 --- a/snippets/sale.report_saleorder_document.format_qty_with_decimal.xml +++ b/snippets/sale.report_saleorder_document.format_qty_with_decimal.xml @@ -1,13 +1,13 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.replace_summary.xml b/snippets/sale.report_saleorder_document.replace_summary.xml index f378b20a..a4f60a0a 100644 --- a/snippets/sale.report_saleorder_document.replace_summary.xml +++ b/snippets/sale.report_saleorder_document.replace_summary.xml @@ -4,39 +4,39 @@
          PosPos

          		ReferenzReferenz
          diff --git a/snippets/sale.report_saleorder_document.set_ids.xml b/snippets/sale.report_saleorder_document.set_ids.xml index 8153d137..6a02580b 100644 --- a/snippets/sale.report_saleorder_document.set_ids.xml +++ b/snippets/sale.report_saleorder_document.set_ids.xml @@ -2,31 +2,31 @@ - incoterm - - - - date_order - + incoterm + + + + date_order + - - description - + + description + - - product_uom_qty - + + product_uom_qty + - - product_uom_qty - - - - product_uom - + + product_uom_qty + + + + product_uom + - - product_uom_qty - + + product_uom_qty + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.style_carbo_link.xml b/snippets/sale.report_saleorder_document.style_carbo_link.xml index b5ec0078..740433e0 100644 --- a/snippets/sale.report_saleorder_document.style_carbo_link.xml +++ b/snippets/sale.report_saleorder_document.style_carbo_link.xml @@ -1,16 +1,16 @@ - - - + + + - - "date" - + + "date" + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.style_gelso.xml b/snippets/sale.report_saleorder_document.style_gelso.xml index 551bbd78..6aacc427 100644 --- a/snippets/sale.report_saleorder_document.style_gelso.xml +++ b/snippets/sale.report_saleorder_document.style_gelso.xml @@ -1,12 +1,12 @@ - - - - - - "date" - + + + + + + "date" + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.style_moser.xml b/snippets/sale.report_saleorder_document.style_moser.xml index 6d81c5fa..768d772a 100644 --- a/snippets/sale.report_saleorder_document.style_moser.xml +++ b/snippets/sale.report_saleorder_document.style_moser.xml @@ -1,29 +1,29 @@ - - - - + + + + \ No newline at end of file diff --git a/snippets/sale.report_saleorder_document.style_tissa.xml b/snippets/sale.report_saleorder_document.style_tissa.xml index 8c48fbe1..a4026a5d 100644 --- a/snippets/sale.report_saleorder_document.style_tissa.xml +++ b/snippets/sale.report_saleorder_document.style_tissa.xml @@ -1,74 +1,73 @@ - - - + + + - - - - - - text-right - + + + + + + text-right + - diff --git a/snippets/sale.report_saleorder_document.style_trimada.xml b/snippets/sale.report_saleorder_document.style_trimada.xml index 8c48fbe1..a4026a5d 100644 --- a/snippets/sale.report_saleorder_document.style_trimada.xml +++ b/snippets/sale.report_saleorder_document.style_trimada.xml @@ -1,74 +1,73 @@ - - - + + + - - - - - - text-right - + + + + + + text-right + - diff --git a/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml b/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml index a9db7c6b..dbb1bb3d 100644 --- a/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml +++ b/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml @@ -1,12 +1,12 @@ - - not line.display_type and not line.product_id.x_hide_on_sale_order - + + not line.display_type and not line.product_id.x_hide_on_sale_order + - - - + + + \ No newline at end of file diff --git a/snippets/sale.sale_order_portal_content.format_qty.xml b/snippets/sale.sale_order_portal_content.format_qty.xml index 769c7074..c3e69e5a 100644 --- a/snippets/sale.sale_order_portal_content.format_qty.xml +++ b/snippets/sale.sale_order_portal_content.format_qty.xml @@ -1,8 +1,8 @@ - - "integer" - + + "integer" + diff --git a/snippets/sale.sale_order_portal_content.get_position.xml b/snippets/sale.sale_order_portal_content.get_position.xml index bb3047e5..45707e02 100644 --- a/snippets/sale.sale_order_portal_content.get_position.xml +++ b/snippets/sale.sale_order_portal_content.get_position.xml @@ -2,11 +2,11 @@ - + - + diff --git a/snippets/sale.sale_order_portal_content.product_name.xml b/snippets/sale.sale_order_portal_content.product_name.xml index 5dc34f3a..00edeb3b 100644 --- a/snippets/sale.sale_order_portal_content.product_name.xml +++ b/snippets/sale.sale_order_portal_content.product_name.xml @@ -3,7 +3,7 @@ - + diff --git a/snippets/sale.sale_order_portal_content.remove_discount_percentage.xml b/snippets/sale.sale_order_portal_content.remove_discount_percentage.xml index fd25c5d1..d2db80c9 100644 --- a/snippets/sale.sale_order_portal_content.remove_discount_percentage.xml +++ b/snippets/sale.sale_order_portal_content.remove_discount_percentage.xml @@ -2,7 +2,7 @@ - Rabatt + Rabatt diff --git a/snippets/sale.sale_order_portal_content.show_default_code.xml b/snippets/sale.sale_order_portal_content.show_default_code.xml index 4ab7c8b5..57b74b7d 100644 --- a/snippets/sale.sale_order_portal_content.show_default_code.xml +++ b/snippets/sale.sale_order_portal_content.show_default_code.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ white-space: nowrap; } - + diff --git a/snippets/sale_blanket_order.md b/snippets/sale_blanket_order.md index 3c594e04..574bb757 100644 --- a/snippets/sale_blanket_order.md +++ b/snippets/sale_blanket_order.md @@ -134,9 +134,9 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_header_spac - - padding-top: 5rem - + + padding-top: 5rem + ``` @@ -342,9 +342,9 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.format_qty` - - "integer" - + + "integer" + @@ -571,7 +571,7 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_product - + @@ -642,7 +642,7 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.round_price` - + @@ -718,14 +718,14 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.set_ids_tissa` - - address - - + + address + + - - summary - + + summary + ``` @@ -738,55 +738,55 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.set_ids` - original_uom_qty - + original_uom_qty + - - original_uom_qty - + + original_uom_qty + - + + price_subtotal + + + xpath expr="//table[2]//td[5]" position="attributes"> + price_subtotal + + + + price_total + + --> ``` @@ -845,15 +845,15 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_gelso` - - - - + + + + ``` Source: [snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml) @@ -864,38 +864,38 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_tissa` - - - + + - - #{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto - + + #{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto + ``` @@ -908,60 +908,60 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_trimada` - - + + - - - + + + diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_header_space.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_header_space.xml index 423d65e6..2facf9de 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.add_header_space.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.add_header_space.xml @@ -1,8 +1,8 @@ - - padding-top: 5rem - + + padding-top: 5rem + \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.format_qty.xml b/snippets/sale_blanket_order.report_blanketorder_document.format_qty.xml index c59993e6..9b4e377d 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.format_qty.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.format_qty.xml @@ -1,8 +1,8 @@ - - "integer" - + + "integer" + diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml index fef06207..7adf59a7 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml @@ -3,7 +3,7 @@ - + diff --git a/snippets/sale_blanket_order.report_blanketorder_document.round_price.xml b/snippets/sale_blanket_order.report_blanketorder_document.round_price.xml index 492ee943..7062dda1 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.round_price.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.round_price.xml @@ -2,7 +2,7 @@ - + diff --git a/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml b/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml index 91aacf98..06c3c16e 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml @@ -2,54 +2,54 @@ - original_uom_qty - + original_uom_qty + - - original_uom_qty - + + original_uom_qty + - + + price_subtotal + + + xpath expr="//table[2]//td[5]" position="attributes"> + price_subtotal + + + + price_total + + --> \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml b/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml index c034ecd8..8a60a7f2 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml @@ -1,13 +1,13 @@ - - address - - + + address + + - - summary - + + summary + \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml b/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml index da27a50a..418d4bb8 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml @@ -1,13 +1,13 @@ - - - - + + + + \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml b/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml index e54a997f..7351dd64 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml @@ -1,37 +1,37 @@ - - - + + - - #{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto - + + #{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto + \ No newline at end of file diff --git a/snippets/sale_blanket_order.report_blanketorder_document.style_trimada.xml b/snippets/sale_blanket_order.report_blanketorder_document.style_trimada.xml index 6baf202e..d061a655 100644 --- a/snippets/sale_blanket_order.report_blanketorder_document.style_trimada.xml +++ b/snippets/sale_blanket_order.report_blanketorder_document.style_trimada.xml @@ -2,59 +2,59 @@ - - + + - - - + + + diff --git a/snippets/stock.md b/snippets/stock.md index 2daafd44..7b50a505 100644 --- a/snippets/stock.md +++ b/snippets/stock.md @@ -1533,9 +1533,9 @@ ID: `mint_system.stock.report_delivery_document.backorder_signature_section`

          Retouren:

          - KEG: ___________ Anzahl

          - Harassen: ___________ Anzahl

          - Waren erhalten: Datum: ______________________ Unterschrift: _________________________________ + KEG: ___________ Anzahl

          + Harassen: ___________ Anzahl

          + Waren erhalten: Datum: ______________________ Unterschrift: _________________________________

          @@ -1830,15 +1830,28 @@ ID: `mint_system.stock.report_delivery_document.get_position` ``` Source: [snippets/stock.report_delivery_document.get_position.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.get_position.xml) +### Hide Address +ID: `mint_system.stock.report_delivery_document.hide_address` +```xml + + + + + + + +``` +Source: [snippets/stock.report_delivery_document.hide_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.hide_address.xml) + ### Hide Backorder Quantity ID: `mint_system.stock.report_delivery_document.hide_backorder_quantity` ```xml - - - + + + ``` @@ -2257,32 +2270,32 @@ ID: `mint_system.stock.report_delivery_document.replace_header` ```xml - - -
          PosPos

          		ReferenzReferenz
          - - - - - -           + + + + + + + + + ``` Source: [snippets/stock.report_delivery_document.replace_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_header.xml) @@ -2534,7 +2547,7 @@ ID: `mint_system.stock.report_delivery_document.replace_order_definition` padding-left: 10px; padding-bottom: 5px; } - + @@ -2614,9 +2627,9 @@ ID: `mint_system.stock.report_delivery_document.replace_product_uom_qty` - - - + + + @@ -2821,45 +2834,45 @@ ID: `mint_system.stock.report_delivery_document.set_ids` - - description - + + description + - - quantity - - - quantity - - - qty - + + quantity + + + quantity + + + qty + - - description - + + description + - - open_quantity - - - open_quantity - + + open_quantity + + + open_quantity + - - open_quantity - - - open_qty - + + open_quantity + + + open_qty + - - quantity - + + quantity + - - subtitel - + + subtitel + ``` @@ -3073,23 +3086,23 @@ ID: `mint_system.stock.report_delivery_document.style_carbo_link` - - - - - - "date" - - - - "date" - - + + + + + + "date" + + + + "date" + + ``` Source: [snippets/stock.report_delivery_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.style_carbo_link.xml) @@ -3097,26 +3110,26 @@ Source: [snippets/stock.report_delivery_document.style_carbo_link.xml](https://g ### Style Swissfragrance ID: `mint_system.stock.report_delivery_document.style_swissfragrance` ```xml - - - - - - - "date" - - - - "date" - - + + + + + + + + + + ``` Source: [snippets/stock.report_delivery_document.style_swissfragrance.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.style_swissfragrance.xml) @@ -3127,9 +3140,9 @@ ID: `mint_system.stock.report_delivery_document.style_tissa` - - - - + - - cell_right - - - - - - - - - - + + cell_right + + + + + + + + + + ``` @@ -3165,72 +3178,72 @@ ID: `mint_system.stock.report_delivery_document.style_trimada` - - - + + + -
          Fertigungsauftrag
          - -
          + + +
          - - -
          + + +
          @@ -3444,9 +3457,9 @@ ID: `mint_system.stock.report_picking.format_qty_available` - - "integer" - + + "integer" + ``` @@ -3805,24 +3818,24 @@ ID: `mint_system.stock.report_picking.product_description` - + - - - - -
          - - -
          -           - - -
          -           - - -           + + + + +
          + + +
          +           + + +
          +           + + +           ``` @@ -3834,36 +3847,36 @@ ID: `mint_system.stock.report_picking.relocate_quantity` - + - - - Quantity - - + + + Quantity + + - - - - - - - - - () - - - - - -
          - - - -           + + + + + + + + + () + + + + + +
          + + + +           ``` @@ -3952,21 +3965,21 @@ ID: `mint_system.stock.report_picking.replace_barcode` - + - - - - Barcode - Barcode - Barcode + + + + Barcode + Barcode + Barcode - - - - + + + + - + ``` Source: [snippets/stock.report_picking.replace_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_barcode.xml) @@ -3977,36 +3990,36 @@ ID: `mint_system.stock.report_picking.replace_header` - + - + - - - - - -
          Rüstschein - - - Barcode - -
          + + + + + +
          Rüstschein + + + Barcode + +
          -           +           ``` Source: [snippets/stock.report_picking.replace_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_header.xml) @@ -4020,26 +4033,26 @@ ID: `mint_system.stock.report_picking.replace_order_definition` @@ -4255,25 +4268,25 @@ ID: `mint_system.stock.report_picking.set_ids` - - th_product - + + th_product + - - product_uom_qty - + + product_uom_qty + - - th_to - + + th_to + - - barcode - - - - main_table - + + barcode + + + + main_table + ``` @@ -4492,100 +4505,100 @@ ID: `mint_system.stock.report_picking.style_trimada` - - - + + + -. - - +. + + ``` @@ -4851,9 +4864,9 @@ ID: `mint_system.stock.report_picking.format_qty_available` - - "integer" - + + "integer" + ``` @@ -5212,24 +5225,24 @@ ID: `mint_system.stock.report_picking.product_description` - + - - + + ``` @@ -5241,36 +5254,36 @@ ID: `mint_system.stock.report_picking.relocate_quantity` - + - - - + + + - - + + ``` @@ -5359,21 +5372,21 @@ ID: `mint_system.stock.report_picking.replace_barcode` - + - + + + + - + ``` Source: [snippets/stock.report_picking.replace_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_barcode.xml) @@ -5384,36 +5397,36 @@ ID: `mint_system.stock.report_picking.replace_header` - + - + -
          - - - -
          - - -
          -           - - -
          -           - -           		+ + + +
          + + +
          +           + + +
          +           + +           		- Quantity - + Quantity + - - - - - - - - () - - - - - -
          - - -           		+ + + + + + + + () + + + + + +
          + + +           		- - - Barcode - Barcode - Barcode + + + + Barcode + Barcode + Barcode - - - -
          - - - - -
          Rüstschein - - - Barcode - -
          + + + + + +
          Rüstschein + + + Barcode + +
          -           + ``` Source: [snippets/stock.report_picking.replace_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_header.xml) @@ -5427,26 +5440,26 @@ ID: `mint_system.stock.report_picking.replace_order_definition` @@ -5662,25 +5675,25 @@ ID: `mint_system.stock.report_picking.set_ids` - - th_product - + + th_product + - - product_uom_qty - + + product_uom_qty + - - th_to - + + th_to + - - barcode - - - - main_table - + + barcode + + + + main_table + ``` @@ -5899,100 +5912,100 @@ ID: `mint_system.stock.report_picking.style_trimada` - - - + + + -. - - +. + + ``` @@ -6235,6 +6248,20 @@ ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.replace_descr + ``` Source: [snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml) @@ -7419,6 +7446,20 @@ ID: `mint_system.stock.vpicktree.format_scheduled_date` ``` Source: [snippets/stock.vpicktree.format_scheduled_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.format_scheduled_date.xml) +### Modify Invisible Scheduled Date +ID: `mint_system.stock.vpicktree.modify_invisible_scheduled_date` +```xml + + + + + {'invisible': [('state', 'in' , 'cancel')]} + + + +``` +Source: [snippets/stock.vpicktree.modify_invisible_scheduled_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.modify_invisible_scheduled_date.xml) + ### Show Delivery Note ID: `mint_system.stock.vpicktree.show_delivery_note` ```xml diff --git a/snippets/stock.report_delivery_document.backorder_signature_section.xml b/snippets/stock.report_delivery_document.backorder_signature_section.xml index 2ff331b5..d6ae1f04 100644 --- a/snippets/stock.report_delivery_document.backorder_signature_section.xml +++ b/snippets/stock.report_delivery_document.backorder_signature_section.xml @@ -3,9 +3,9 @@

          Retouren:

          - KEG: ___________ Anzahl

          - Harassen: ___________ Anzahl

          - Waren erhalten: Datum: ______________________ Unterschrift: _________________________________ + KEG: ___________ Anzahl

          + Harassen: ___________ Anzahl

          + Waren erhalten: Datum: ______________________ Unterschrift: _________________________________

          diff --git a/snippets/stock.report_delivery_document.hide_address.xml b/snippets/stock.report_delivery_document.hide_address.xml index 6ecb6ea0..b88c8843 100644 --- a/snippets/stock.report_delivery_document.hide_address.xml +++ b/snippets/stock.report_delivery_document.hide_address.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.hide_backorder_quantity.xml b/snippets/stock.report_delivery_document.hide_backorder_quantity.xml index 1e506582..3208d9ed 100644 --- a/snippets/stock.report_delivery_document.hide_backorder_quantity.xml +++ b/snippets/stock.report_delivery_document.hide_backorder_quantity.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.replace_header.xml b/snippets/stock.report_delivery_document.replace_header.xml index 16aa88b6..e943b3e9 100644 --- a/snippets/stock.report_delivery_document.replace_header.xml +++ b/snippets/stock.report_delivery_document.replace_header.xml @@ -1,29 +1,29 @@ - - -
          - - - - - -           + + + + + + + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.replace_order_definition.xml b/snippets/stock.report_delivery_document.replace_order_definition.xml index 0f34c5f2..2b5a501b 100644 --- a/snippets/stock.report_delivery_document.replace_order_definition.xml +++ b/snippets/stock.report_delivery_document.replace_order_definition.xml @@ -14,7 +14,7 @@ padding-left: 10px; padding-bottom: 5px; } - + diff --git a/snippets/stock.report_delivery_document.replace_product_uom_qty.xml b/snippets/stock.report_delivery_document.replace_product_uom_qty.xml index 0504077d..7c331d64 100644 --- a/snippets/stock.report_delivery_document.replace_product_uom_qty.xml +++ b/snippets/stock.report_delivery_document.replace_product_uom_qty.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/snippets/stock.report_delivery_document.set_ids.xml b/snippets/stock.report_delivery_document.set_ids.xml index 4c82f155..20cdccb4 100644 --- a/snippets/stock.report_delivery_document.set_ids.xml +++ b/snippets/stock.report_delivery_document.set_ids.xml @@ -1,44 +1,44 @@ - - description - + + description + - - quantity - - - quantity - - - qty - + + quantity + + + quantity + + + qty + - - description - + + description + - - open_quantity - - - open_quantity - + + open_quantity + + + open_quantity + - - open_quantity - - - open_qty - + + open_quantity + + + open_qty + - - quantity - + + quantity + - - subtitel - + + subtitel + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.style_carbo_link.xml b/snippets/stock.report_delivery_document.style_carbo_link.xml index e9f71711..5de4a3dd 100644 --- a/snippets/stock.report_delivery_document.style_carbo_link.xml +++ b/snippets/stock.report_delivery_document.style_carbo_link.xml @@ -1,21 +1,21 @@ - - - - - - "date" - - - - "date" - - + + + + + + "date" + + + + "date" + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.style_swissfragrance.xml b/snippets/stock.report_delivery_document.style_swissfragrance.xml index 96ead9c0..f899a384 100644 --- a/snippets/stock.report_delivery_document.style_swissfragrance.xml +++ b/snippets/stock.report_delivery_document.style_swissfragrance.xml @@ -1,21 +1,21 @@ - + - - - + } + + - - - + + + \ No newline at end of file diff --git a/snippets/stock.report_delivery_document.style_tissa.xml b/snippets/stock.report_delivery_document.style_tissa.xml index 3124ed16..1d7a0ca8 100644 --- a/snippets/stock.report_delivery_document.style_tissa.xml +++ b/snippets/stock.report_delivery_document.style_tissa.xml @@ -1,9 +1,9 @@ - - - - + - - cell_right - - - - - - - - - - + + cell_right + + + + + + + + + + diff --git a/snippets/stock.report_delivery_document.style_trimada.xml b/snippets/stock.report_delivery_document.style_trimada.xml index 651a45c7..392d0307 100644 --- a/snippets/stock.report_delivery_document.style_trimada.xml +++ b/snippets/stock.report_delivery_document.style_trimada.xml @@ -1,71 +1,71 @@ - - - + + + -
          Fertigungsauftrag
          - -
          + + +
          - - -
          + + +
          diff --git a/snippets/stock.report_picking.format_qty_available.xml b/snippets/stock.report_picking.format_qty_available.xml index fea95207..7892aab5 100644 --- a/snippets/stock.report_picking.format_qty_available.xml +++ b/snippets/stock.report_picking.format_qty_available.xml @@ -1,8 +1,8 @@ - - "integer" - + + "integer" + \ No newline at end of file diff --git a/snippets/stock.report_picking.product_description.xml b/snippets/stock.report_picking.product_description.xml index 233fd198..b284ee83 100644 --- a/snippets/stock.report_picking.product_description.xml +++ b/snippets/stock.report_picking.product_description.xml @@ -1,23 +1,23 @@ - + - - - - -
          - - -
          -           - - -
          -           - - -           + + + + +
          + + +
          +           + + +
          +           + + +           \ No newline at end of file diff --git a/snippets/stock.report_picking.relocate_quantity.xml b/snippets/stock.report_picking.relocate_quantity.xml index 4d0926bc..b4033d0d 100644 --- a/snippets/stock.report_picking.relocate_quantity.xml +++ b/snippets/stock.report_picking.relocate_quantity.xml @@ -1,35 +1,35 @@ - + - - - Quantity - - + + + Quantity + + - - - - - - - - - () - - - - - -
          - - - -           + + + + + + + + + () + + + + + +
          + + + +           \ No newline at end of file diff --git a/snippets/stock.report_picking.replace_barcode.xml b/snippets/stock.report_picking.replace_barcode.xml index d3738634..25b77ef2 100644 --- a/snippets/stock.report_picking.replace_barcode.xml +++ b/snippets/stock.report_picking.replace_barcode.xml @@ -1,19 +1,19 @@ - + - - - - Barcode - Barcode - Barcode + + + + Barcode + Barcode + Barcode - - - - + + + + - + \ No newline at end of file diff --git a/snippets/stock.report_picking.replace_header.xml b/snippets/stock.report_picking.replace_header.xml index 2e122184..ce172b48 100644 --- a/snippets/stock.report_picking.replace_header.xml +++ b/snippets/stock.report_picking.replace_header.xml @@ -1,34 +1,34 @@ - + - + - - - - - -
          Rüstschein - - - Barcode - -
          + + + + + +
          Rüstschein + + + Barcode + +
          -           +           \ No newline at end of file diff --git a/snippets/stock.report_picking.replace_order_definition.xml b/snippets/stock.report_picking.replace_order_definition.xml index ec0c250d..a51a85d7 100644 --- a/snippets/stock.report_picking.replace_order_definition.xml +++ b/snippets/stock.report_picking.replace_order_definition.xml @@ -4,26 +4,26 @@ diff --git a/snippets/stock.report_picking.set_ids.xml b/snippets/stock.report_picking.set_ids.xml index 67625ae3..968400d5 100644 --- a/snippets/stock.report_picking.set_ids.xml +++ b/snippets/stock.report_picking.set_ids.xml @@ -1,24 +1,24 @@ - - th_product - + + th_product + - - product_uom_qty - + + product_uom_qty + - - th_to - + + th_to + - - barcode - - - - main_table - + + barcode + + + + main_table + \ No newline at end of file diff --git a/snippets/stock.report_picking.style_trimada.xml b/snippets/stock.report_picking.style_trimada.xml index 45398ad7..d3a3e87f 100644 --- a/snippets/stock.report_picking.style_trimada.xml +++ b/snippets/stock.report_picking.style_trimada.xml @@ -1,99 +1,99 @@ - - - + + + -. - - +. + + \ No newline at end of file diff --git a/snippets/web.brand_promotion_message.remove.xml b/snippets/web.brand_promotion_message.remove.xml index 751a9b0e..5855dbcc 100644 --- a/snippets/web.brand_promotion_message.remove.xml +++ b/snippets/web.brand_promotion_message.remove.xml @@ -2,7 +2,7 @@ - + diff --git a/snippets/web.external_layout_standard.header_styles.xml b/snippets/web.external_layout_standard.header_styles.xml index ac6d7cf4..596df2bf 100644 --- a/snippets/web.external_layout_standard.header_styles.xml +++ b/snippets/web.external_layout_standard.header_styles.xml @@ -3,9 +3,9 @@ diff --git a/snippets/web.external_layout_standard.remove_contact.xml b/snippets/web.external_layout_standard.remove_contact.xml index a88437e8..f32d29aa 100644 --- a/snippets/web.external_layout_standard.remove_contact.xml +++ b/snippets/web.external_layout_standard.remove_contact.xml @@ -3,7 +3,7 @@ - + diff --git a/snippets/web.external_layout_standard.replace_url.xml b/snippets/web.external_layout_standard.replace_url.xml index 339ccb71..64e8ff49 100644 --- a/snippets/web.external_layout_standard.replace_url.xml +++ b/snippets/web.external_layout_standard.replace_url.xml @@ -4,7 +4,7 @@ -
        • www.example.ch
          • +
        • www.example.ch
          •            diff --git a/snippets/web.external_layout_standard.style_header.xml b/snippets/web.external_layout_standard.style_header.xml index 3c66367b..1323d983 100644 --- a/snippets/web.external_layout_standard.style_header.xml +++ b/snippets/web.external_layout_standard.style_header.xml @@ -1,7 +1,7 @@ - border-bottom: 0px ; + border-bottom: 0px ; diff --git a/snippets/web.internal_layout.header_styles.xml b/snippets/web.internal_layout.header_styles.xml index 13b14b25..4b1a9027 100644 --- a/snippets/web.internal_layout.header_styles.xml +++ b/snippets/web.internal_layout.header_styles.xml @@ -3,9 +3,9 @@ diff --git a/snippets/web.internal_layout.replace_header.xml b/snippets/web.internal_layout.replace_header.xml index 8129e9e8..09bfcc78 100644 --- a/snippets/web.internal_layout.replace_header.xml +++ b/snippets/web.internal_layout.replace_header.xml @@ -1,18 +1,18 @@ - -
          -
          -
          -
          -
          -
          -
          - Logo -
          -
          -
          -           + +
          +
          +
          +
          +
          +
          +
          + Logo +
          +
          +
          +           \ No newline at end of file diff --git a/snippets/web.md b/snippets/web.md index a63e1d2a..7ca91915 100644 --- a/snippets/web.md +++ b/snippets/web.md @@ -126,7 +126,7 @@ ID: `mint_system.web.brand_promotion_message.remove` - + @@ -319,9 +319,9 @@ ID: `mint_system.web.external_layout_standard.header_styles` @@ -399,7 +399,7 @@ ID: `mint_system.web.external_layout_standard.remove_contact` - + @@ -579,7 +579,7 @@ ID: `mint_system.web.external_layout_standard.replace_url` -
        • www.example.ch
          • +
        • www.example.ch
          •            @@ -642,7 +642,7 @@ ID: `mint_system.web.external_layout_standard.style_header` - border-bottom: 0px ; + border-bottom: 0px ; @@ -757,9 +757,9 @@ ID: `mint_system.web.internal_layout.header_styles` @@ -773,19 +773,19 @@ ID: `mint_system.web.internal_layout.replace_header` - -
          -
          -
          -
          -
          -
          -
          - Logo -
          -
          -
          -           + +
          +
          +
          +
          +
          +
          +
          + Logo +
          +
          +
          +           ``` diff --git a/snippets/website_sale.md b/snippets/website_sale.md index e789ee81..e6068746 100644 --- a/snippets/website_sale.md +++ b/snippets/website_sale.md @@ -69,12 +69,12 @@ ID: `mint_system.website_sale.products_categories.bigger_categories_button` - - - + + + diff --git a/snippets/website_sale.products_categories.bigger_categories_button.xml b/snippets/website_sale.products_categories.bigger_categories_button.xml index 035ca5ec..155b0339 100644 --- a/snippets/website_sale.products_categories.bigger_categories_button.xml +++ b/snippets/website_sale.products_categories.bigger_categories_button.xml @@ -2,11 +2,11 @@ - - - + + + From b80333e421a7b617bbaf5e99a971738e813a2973 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 23 Oct 2023 11:26:26 +0200 Subject: [PATCH 139/147] add snippets --- snippets/website_sale.address.hide_shipping_use_same.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 snippets/website_sale.address.hide_shipping_use_same.xml diff --git a/snippets/website_sale.address.hide_shipping_use_same.xml b/snippets/website_sale.address.hide_shipping_use_same.xml new file mode 100644 index 00000000..7efa1db3 --- /dev/null +++ b/snippets/website_sale.address.hide_shipping_use_same.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 3ae94bb2494c093800d36120f82febb7f028f1c6 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 23 Oct 2023 11:26:34 +0200 Subject: [PATCH 140/147] ref --- addons/odoo_apps_partner | 2 +- addons/partner_contact | 2 +- odoo | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner index b7e45269..c3807a5e 160000 --- a/addons/odoo_apps_partner +++ b/addons/odoo_apps_partner @@ -1 +1 @@ -Subproject commit b7e4526959d107fbbbd67af1c289d807bf570445 +Subproject commit c3807a5ea3257d13213a43ffb7b4b48e1a73ca10 diff --git a/addons/partner_contact b/addons/partner_contact index f8b55232..4a3744cb 160000 --- a/addons/partner_contact +++ b/addons/partner_contact @@ -1 +1 @@ -Subproject commit f8b552324f79bf613b7131bbe7cbc10684de11ac +Subproject commit 4a3744cbc9a00c55f2dd9a81802a7c6b20c66832 diff --git a/odoo b/odoo index 55cd29c5..aa90123b 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 55cd29c5f2cb7787752d77103dbcc4c4007ff504 +Subproject commit aa90123b666784aea039ebb3c1febf0be81f8362 From 8137a579802fe0bbb03c2eb4c91adf72626708df Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 23 Oct 2023 14:42:28 +0200 Subject: [PATCH 141/147] update calculated fields --- .../ir_model.stock_move.x_count_boxes.xml | 55 ++++--------------- .../ir_model.stock_move.x_count_packaging.xml | 13 ++--- 2 files changed, 14 insertions(+), 54 deletions(-) diff --git a/snippets/ir_model.stock_move.x_count_boxes.xml b/snippets/ir_model.stock_move.x_count_boxes.xml index 86c41bc1..7bc539ca 100644 --- a/snippets/ir_model.stock_move.x_count_boxes.xml +++ b/snippets/ir_model.stock_move.x_count_boxes.xml @@ -3,6 +3,7 @@ Anzahl Kisten + Count the number of packaging boxes. stock.move x_count_boxes @@ -11,52 +12,16 @@ int quantity_done - # Count the number of packaging boxes -for rec in self: - rec['x_count_boxes'] = 0 - if rec.product_packaging: - - # Get picking delivery product name - delivery_name = rec.picking_id.carrier_id.product_id.name + for rec in self: + rec['x_count_boxes'] = 0 + if rec.product_packaging and rec.product_packaging.qty: + + rec['x_count_boxes'] = rec.quantity_done // rec.product_packaging.qty + + if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: + + rec['x_count_boxes'] = (rec.quantity_done + rec.product_packaging.qty)/rec.product_packaging.parent_packaging.qty - # Calculate the number of boxes depending on the selected packaging - - if rec.product_packaging.name == "Schale Gross": - rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5 - - elif rec.product_packaging.name == "Schale Klein": - rec['x_count_boxes'] = (rec.quantity_done/6 + 0.9)/1 - - elif rec.product_packaging.name == "Vakuum Gross": - rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5 - - elif rec.product_packaging.name == "Aktionären Gutschein": - rec['x_count_boxes'] = ((rec.quantity_done + 9)/20) - - elif rec.product_packaging.name == "Vakuum Klein": - if rec.product_id.id == 68: # Filet mit Haut TK - rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10 - elif rec.product_id.id == 74: # Filet mit Haut V-Schnitt Tiefgekühlt - rec['x_count_boxes'] = (rec.product_uom_qty + 9)/20 - else: - rec['x_count_boxes'] = (rec.quantity_done/8 + 0.9)/1 - - elif rec.product_packaging.name == "Karton": - rec['x_count_boxes'] = rec.quantity_done/rec.product_packaging.qty - - if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: - rec['x_count_boxes'] = rec.quantity_done/rec.product_packaging.parent_packaging.qty - - elif rec.product_packaging.name == "Kiste": - if rec.product_id.id == 68: # Filet mit Haut TK - rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10 - elif rec.product_id.id == 51: # Kopf / Backen - rec['x_count_boxes'] = (rec.product_uom_qty + 99)/100 - elif rec.product_id.id == 33: # Filet mit Haut - rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10 - else: - rec['x_count_boxes'] = (rec.product_uom_qty + 14)/15 - diff --git a/snippets/ir_model.stock_move.x_count_packaging.xml b/snippets/ir_model.stock_move.x_count_packaging.xml index eee96532..8efaa8e2 100644 --- a/snippets/ir_model.stock_move.x_count_packaging.xml +++ b/snippets/ir_model.stock_move.x_count_packaging.xml @@ -3,6 +3,7 @@ Anzahl Verpackungen + Counts the number of packages for dispaying in on the picking report. stock.move x_count_packaging @@ -11,15 +12,9 @@ int product_uom_qty - # Counts the number of packages for dispaying in on the picking report - for rec in self: - if rec.product_packaging: - if rec.product_packaging.name == "Kiste": - rec['x_count_packaging'] = (rec.product_uom_qty + 14)/15 - if rec.product_packaging.name == "Schale Gross": - rec['x_count_packaging'] = (rec.product_uom_qty + 2.4)/2.5 - if rec.product_packaging.name in ["Vakuum", "Schale Klein", "Karton"]: - rec['x_count_packaging'] = (rec.product_uom_qty + 0.9)/1 + for rec in self: + if rec.product_packaging: + rec['x_count_packaging'] = rec.product_uom_qty // rec.product_packaging.qty From a09049e51b8758b48068a8b5f6da9fa3d0fbf3ad Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 25 Oct 2023 11:07:38 +0200 Subject: [PATCH 142/147] update docs --- snippets/base.view_country_tree.set_limit.xml | 8 ++++ .../ir_model.stock_move.x_count_boxes.xml | 45 ++++++++++--------- 2 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 snippets/base.view_country_tree.set_limit.xml diff --git a/snippets/base.view_country_tree.set_limit.xml b/snippets/base.view_country_tree.set_limit.xml new file mode 100644 index 00000000..693697d2 --- /dev/null +++ b/snippets/base.view_country_tree.set_limit.xml @@ -0,0 +1,8 @@ + + + + + 250 + + + diff --git a/snippets/ir_model.stock_move.x_count_boxes.xml b/snippets/ir_model.stock_move.x_count_boxes.xml index 7bc539ca..a4a2f245 100644 --- a/snippets/ir_model.stock_move.x_count_boxes.xml +++ b/snippets/ir_model.stock_move.x_count_boxes.xml @@ -1,27 +1,28 @@ - - Anzahl Kisten - Count the number of packaging boxes. - stock.move - - x_count_boxes - - - - int - quantity_done - for rec in self: - rec['x_count_boxes'] = 0 - if rec.product_packaging and rec.product_packaging.qty: - - rec['x_count_boxes'] = rec.quantity_done // rec.product_packaging.qty - - if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: - - rec['x_count_boxes'] = (rec.quantity_done + rec.product_packaging.qty)/rec.product_packaging.parent_packaging.qty - - + + Anzahl Kisten + Count the number of packaging boxes. + stock.move + + x_count_boxes + + + + int + quantity_done + for rec in self: + rec['x_count_boxes'] = 0 + if rec.product_packaging and rec.product_packaging.qty: + + rec['x_count_boxes'] = rec.quantity_done // rec.product_packaging.qty + + if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: + + rec['x_count_boxes'] = (rec.quantity_done + rec.product_packaging.qty)/rec.product_packaging.parent_packaging.qty + + + From 596b898769dd311eb50708b81d0c178e1fb98fe0 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 25 Oct 2023 11:07:44 +0200 Subject: [PATCH 143/147] update docs --- snippets/base.md | 16 +++++++ snippets/ir_model.md | 91 ++++++++++++---------------------------- snippets/website_sale.md | 12 ++++++ 3 files changed, 54 insertions(+), 65 deletions(-) diff --git a/snippets/base.md b/snippets/base.md index ef8ba7ab..ee4d7342 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -209,6 +209,22 @@ ID: `mint_system.base.view_company_form.show_analytic_plan_id` ``` Source: [snippets/base.view_company_form.show_analytic_plan_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_company_form.show_analytic_plan_id.xml) +## View Country Tree +### Set Limit +ID: `mint_system.base.view_country_tree.set_limit` +```xml + + + + + 250 + + + + +``` +Source: [snippets/base.view_country_tree.set_limit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_country_tree.set_limit.xml) + ## View Model Fields Form ### Show State ID: `mint_system.base.view_model_fields_form.show_state` diff --git a/snippets/ir_model.md b/snippets/ir_model.md index 90bfdf39..ea073441 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -2544,64 +2544,30 @@ ID: `mint_system.ir_model.stock_move.x_count_boxes` - - Anzahl Kisten - stock.move - - x_count_boxes - - - - int - quantity_done - # Count the number of packaging boxes -for rec in self: - rec['x_count_boxes'] = 0 - if rec.product_packaging: - - # Get picking delivery product name - delivery_name = rec.picking_id.carrier_id.product_id.name - - # Calculate the number of boxes depending on the selected packaging - - if rec.product_packaging.name == "Schale Gross": - rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5 - - elif rec.product_packaging.name == "Schale Klein": - rec['x_count_boxes'] = (rec.quantity_done/6 + 0.9)/1 - - elif rec.product_packaging.name == "Vakuum Gross": - rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5 - - elif rec.product_packaging.name == "Aktionären Gutschein": - rec['x_count_boxes'] = ((rec.quantity_done + 9)/20) - - elif rec.product_packaging.name == "Vakuum Klein": - if rec.product_id.id == 68: # Filet mit Haut TK - rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10 - elif rec.product_id.id == 74: # Filet mit Haut V-Schnitt Tiefgekühlt - rec['x_count_boxes'] = (rec.product_uom_qty + 9)/20 - else: - rec['x_count_boxes'] = (rec.quantity_done/8 + 0.9)/1 + + Anzahl Kisten + Count the number of packaging boxes. + stock.move + + x_count_boxes + + + + int + quantity_done + for rec in self: + rec['x_count_boxes'] = 0 + if rec.product_packaging and rec.product_packaging.qty: - elif rec.product_packaging.name == "Karton": - rec['x_count_boxes'] = rec.quantity_done/rec.product_packaging.qty - - if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: - rec['x_count_boxes'] = rec.quantity_done/rec.product_packaging.parent_packaging.qty - - elif rec.product_packaging.name == "Kiste": - if rec.product_id.id == 68: # Filet mit Haut TK - rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10 - elif rec.product_id.id == 51: # Kopf / Backen - rec['x_count_boxes'] = (rec.product_uom_qty + 99)/100 - elif rec.product_id.id == 33: # Filet mit Haut - rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10 - else: - rec['x_count_boxes'] = (rec.product_uom_qty + 14)/15 - - + rec['x_count_boxes'] = rec.quantity_done // rec.product_packaging.qty + + if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: + + rec['x_count_boxes'] = (rec.quantity_done + rec.product_packaging.qty)/rec.product_packaging.parent_packaging.qty + + + ``` @@ -2615,6 +2581,7 @@ ID: `mint_system.ir_model.stock_move.x_count_packaging` Anzahl Verpackungen + Counts the number of packages for dispaying in on the picking report. stock.move x_count_packaging @@ -2623,15 +2590,9 @@ ID: `mint_system.ir_model.stock_move.x_count_packaging` int product_uom_qty - # Counts the number of packages for dispaying in on the picking report - for rec in self: - if rec.product_packaging: - if rec.product_packaging.name == "Kiste": - rec['x_count_packaging'] = (rec.product_uom_qty + 14)/15 - if rec.product_packaging.name == "Schale Gross": - rec['x_count_packaging'] = (rec.product_uom_qty + 2.4)/2.5 - if rec.product_packaging.name in ["Vakuum", "Schale Klein", "Karton"]: - rec['x_count_packaging'] = (rec.product_uom_qty + 0.9)/1 + for rec in self: + if rec.product_packaging: + rec['x_count_packaging'] = rec.product_uom_qty // rec.product_packaging.qty diff --git a/snippets/website_sale.md b/snippets/website_sale.md index e6068746..ab0edc58 100644 --- a/snippets/website_sale.md +++ b/snippets/website_sale.md @@ -1,5 +1,17 @@ # Website Sale ## Address +### Hide Shipping Use Same +ID: `mint_system.website_sale.address.hide_shipping_use_same` +```xml + + + + + + +``` +Source: [snippets/website_sale.address.hide_shipping_use_same.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.address.hide_shipping_use_same.xml) + ### Overwrite Required ID: `mint_system.website_sale.address.overwrite_required` ```xml From defde54171d432b9e9685a174807122f99063137 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 25 Oct 2023 15:08:25 +0200 Subject: [PATCH 144/147] sync --- ....view_partner_form.attributes_child_ids.xml} | 0 ...rder_document.add_header_and_footer_note.xml | 4 ++-- ...rt_saleorder_document.style_mint_system.xml} | 12 ------------ ...ortal_content.add_header_and_footer_note.xml | 16 ++++++++++++++++ ...sale_order_portal_content.x_description.xml} | 0 task | 17 +++++++++++------ task.md | 1 + 7 files changed, 30 insertions(+), 20 deletions(-) rename snippets/{base.view_partner_form.attributes_child_ids => base.view_partner_form.attributes_child_ids.xml} (100%) rename snippets/{sale.report_saleorder_document.x_sudio_description.xml => sale.report_saleorder_document.style_mint_system.xml} (85%) create mode 100644 snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml rename snippets/{sale.sale_order_portal_content.description.xml => sale.sale_order_portal_content.x_description.xml} (100%) diff --git a/snippets/base.view_partner_form.attributes_child_ids b/snippets/base.view_partner_form.attributes_child_ids.xml similarity index 100% rename from snippets/base.view_partner_form.attributes_child_ids rename to snippets/base.view_partner_form.attributes_child_ids.xml diff --git a/snippets/sale.report_saleorder_document.add_header_and_footer_note.xml b/snippets/sale.report_saleorder_document.add_header_and_footer_note.xml index 6d773fa2..8faf4eb4 100644 --- a/snippets/sale.report_saleorder_document.add_header_and_footer_note.xml +++ b/snippets/sale.report_saleorder_document.add_header_and_footer_note.xml @@ -1,13 +1,13 @@ - + - + diff --git a/snippets/sale.report_saleorder_document.x_sudio_description.xml b/snippets/sale.report_saleorder_document.style_mint_system.xml similarity index 85% rename from snippets/sale.report_saleorder_document.x_sudio_description.xml rename to snippets/sale.report_saleorder_document.style_mint_system.xml index ceb48619..ea82ab5e 100644 --- a/snippets/sale.report_saleorder_document.x_sudio_description.xml +++ b/snippets/sale.report_saleorder_document.style_mint_system.xml @@ -15,18 +15,6 @@ - - -
          -
          - -
          -
          -
          -
          -           -           - diff --git a/snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml b/snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml new file mode 100644 index 00000000..44fbfda0 --- /dev/null +++ b/snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/snippets/sale.sale_order_portal_content.description.xml b/snippets/sale.sale_order_portal_content.x_description.xml similarity index 100% rename from snippets/sale.sale_order_portal_content.description.xml rename to snippets/sale.sale_order_portal_content.x_description.xml diff --git a/task b/task index d3137937..6427df9f 100755 --- a/task +++ b/task @@ -508,14 +508,16 @@ function git-switch-branch() { } function checkout-config-files() { - echo "Checkout config files $GIT_BRANCH branch." - git checkout "$GIT_BRANCH" config/checkout_files config/reset_files + if test -z "$1"; then echo "\$1 is empty."; exit; fi + + echo "Checkout config files $1 branch." + git checkout "$1" config/checkout_files config/reset_files echo "Remove reset files." - git rm -r "$(tr '\n' ' ' < ./config/reset_files)" >/dev/null 2>&1 + git rm -r $(tr '\n' ' ' < ./config/reset_files) >/dev/null 2>&1 - echo "Sync checkout files from $GIT_BRANCH branch." - git checkout "$GIT_BRANCH" $(tr '\n' ' ' < ./config/checkout_files) + echo "Sync checkout files from $1 branch." + git checkout "$1" $(tr '\n' ' ' < ./config/checkout_files) } function checkout() { @@ -531,7 +533,7 @@ function checkout() { git-switch-branch "$1" - checkout-config-files + checkout-config-files $GIT_BRANCH } function checkout-revision() { @@ -977,6 +979,9 @@ case "$1" in checkout) checkout "$2" "$3" ;; + checkout-config-files) + checkout-config-files "$2" + ;; checkout-revision) checkout-revision "$2" ;; diff --git a/task.md b/task.md index 4e6d6561..2d3a1ac1 100644 --- a/task.md +++ b/task.md @@ -4,6 +4,7 @@ | --------------------------- | ----------------- | ----------------------------------------------------------------------------------------- | | change-uuid | [env] | Change database uuid via xmlrpc. | | checkout | [branch][branch] | Switch and merge from one branch to another. | +| checkout-config-files | [branch] | Checkout config files from another branch. | | checkout-revision | [revision] | Switch to a different Odoo revision by tag name. | | clear-assets | [db] | Clear all assets of Odoo database. | | clear-filestore | [db] | Clear local filestore folder. No param will clear all filestores. Default is branch name. | From ef45c183e199c6d942a9b0416a0f29422cac068e Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 25 Oct 2023 17:26:16 +0200 Subject: [PATCH 145/147] update snippets --- snippets/ir_model.stock_move.x_count_boxes.xml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/snippets/ir_model.stock_move.x_count_boxes.xml b/snippets/ir_model.stock_move.x_count_boxes.xml index a4a2f245..cf40d31d 100644 --- a/snippets/ir_model.stock_move.x_count_boxes.xml +++ b/snippets/ir_model.stock_move.x_count_boxes.xml @@ -11,17 +11,20 @@ int - quantity_done + quantity_done,product_packaging for rec in self: rec['x_count_boxes'] = 0 if rec.product_packaging and rec.product_packaging.qty: + product_qty = rec.product_packaging.qty + count_boxes = rec.quantity_done / product_qty + + rec['x_count_boxes'] = int(-(-count_boxes // 1)) + + if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: + parent_qty = rec.product_packaging.parent_packaging.qty + count_boxes = rec.quantity_done / parent_qty - rec['x_count_boxes'] = rec.quantity_done // rec.product_packaging.qty - - if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: - - rec['x_count_boxes'] = (rec.quantity_done + rec.product_packaging.qty)/rec.product_packaging.parent_packaging.qty - + rec['x_count_boxes'] = int(-(-count_boxes // 1)) From c5db4c97fd430556beaa58de7848e133b6e23061 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 26 Oct 2023 10:33:45 +0200 Subject: [PATCH 146/147] snippets --- .gitmodules | 4 + oca/e-commerce | 1 + snippets/base.md | 14 ++ snippets/ir_model.md | 17 +- snippets/sale.md | 187 +++++++++--------- ...te_sale.address.hide_shipping_use_same.xml | 9 +- snippets/website_sale.md | 22 ++- ...nfirmation_status.remove_communication.xml | 6 + 8 files changed, 157 insertions(+), 103 deletions(-) create mode 160000 oca/e-commerce create mode 100644 snippets/website_sale.payment_confirmation_status.remove_communication.xml diff --git a/.gitmodules b/.gitmodules index f888fa55..a847a992 100644 --- a/.gitmodules +++ b/.gitmodules @@ -234,3 +234,7 @@ path = addons/account_invoicing url = git@github.com:mint-system/odoo-apps-account-invoicing.git branch = 16.0 +[submodule "oca/e-commerce"] + path = oca/e-commerce + url = git@github.com:OCA/e-commerce.git + branch = 16.0 diff --git a/oca/e-commerce b/oca/e-commerce new file mode 160000 index 00000000..2314f0e0 --- /dev/null +++ b/oca/e-commerce @@ -0,0 +1 @@ +Subproject commit 2314f0e0014591c6986f431d71b25ab1e7c49511 diff --git a/snippets/base.md b/snippets/base.md index ee4d7342..48040fd2 100644 --- a/snippets/base.md +++ b/snippets/base.md @@ -307,6 +307,20 @@ ID: `mint_system.base.view_partner_form.add_display_name` ``` Source: [snippets/base.view_partner_form.add_display_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.add_display_name.xml) +### Attributes Child Ids +ID: `mint_system.base.view_partner_form.attributes_child_ids` +```xml + + + + + tree + + + +``` +Source: [snippets/base.view_partner_form.attributes_child_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.attributes_child_ids.xml) + ### Move Company Registry ID: `mint_system.base.view_partner_form.move_company_registry` ```xml diff --git a/snippets/ir_model.md b/snippets/ir_model.md index ea073441..356489fe 100644 --- a/snippets/ir_model.md +++ b/snippets/ir_model.md @@ -2554,17 +2554,20 @@ ID: `mint_system.ir_model.stock_move.x_count_boxes` int - quantity_done + quantity_done,product_packaging for rec in self: rec['x_count_boxes'] = 0 if rec.product_packaging and rec.product_packaging.qty: + product_qty = rec.product_packaging.qty + count_boxes = rec.quantity_done / product_qty + + rec['x_count_boxes'] = int(-(-count_boxes // 1)) + + if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: + parent_qty = rec.product_packaging.parent_packaging.qty + count_boxes = rec.quantity_done / parent_qty - rec['x_count_boxes'] = rec.quantity_done // rec.product_packaging.qty - - if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty: - - rec['x_count_boxes'] = (rec.quantity_done + rec.product_packaging.qty)/rec.product_packaging.parent_packaging.qty - + rec['x_count_boxes'] = int(-(-count_boxes // 1)) diff --git a/snippets/sale.md b/snippets/sale.md index 2588915c..6d119d91 100644 --- a/snippets/sale.md +++ b/snippets/sale.md @@ -1012,13 +1012,13 @@ ID: `mint_system.sale.report_saleorder_document.add_header_and_footer_note` - + - + @@ -2755,6 +2755,65 @@ ID: `mint_system.sale.report_saleorder_document.style_gelso` ``` Source: [snippets/sale.report_saleorder_document.style_gelso.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_gelso.xml) +### Style Mint System +ID: `mint_system.sale.report_saleorder_document.style_mint_system` +```xml + + + + + + + + + +
          +           +           + + + + + + + + + + + + + + + +
          +           +           + + +
          +
          + New Title +
          +
          +           + + + col h4 + + + +

          + Geschäftsbedingungen + + + + + + + +``` +Source: [snippets/sale.report_saleorder_document.style_mint_system.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_mint_system.xml) + ### Style Moser ID: `mint_system.sale.report_saleorder_document.style_moser` ```xml @@ -2968,77 +3027,6 @@ ID: `mint_system.sale.report_saleorder_document.x_hide_on_sale_order` ``` Source: [snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml) -### X Sudio Description -ID: `mint_system.sale.report_saleorder_document.x_sudio_description` -```xml - - - - - - - - - -
          -           -           - - - - - - - -

          -
          - -
          -
          -
          -
          - -           - - - - - - - - - - - -
          -           -           - - -
          -
          - New Title -
          -
          -           - - - col h4 - - - -

          - Geschäftsbedingungen - - - - - - - -``` -Source: [snippets/sale.report_saleorder_document.x_sudio_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.x_sudio_description.xml) - ### X Warranty ID: `mint_system.sale.report_saleorder_document.x_warranty` ```xml @@ -3216,6 +3204,29 @@ ID: `mint_system.sale.sale_order_line_view_form_readonly.show_subscription_id` Source: [snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml) ## Sale Order Portal Content +### Add Header And Footer Note +ID: `mint_system.sale.sale_order_portal_content.add_header_and_footer_note` +```xml + + + + + + + + + + + + + + + + + +``` +Source: [snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml) + ### Convert Html Note ID: `mint_system.sale.sale_order_portal_content.convert_html_note` ```xml @@ -3240,21 +3251,6 @@ ID: `mint_system.sale.sale_order_portal_content.convert_html_note` ``` Source: [snippets/sale.sale_order_portal_content.convert_html_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.convert_html_note.xml) -### Description -ID: `mint_system.sale.sale_order_portal_content.description` -```xml - - - - -

          - - - - -``` -Source: [snippets/sale.sale_order_portal_content.description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.description.xml) - ### Format Qty ID: `mint_system.sale.sale_order_portal_content.format_qty` ```xml @@ -3386,6 +3382,21 @@ ID: `mint_system.sale.sale_order_portal_content.show_default_code` ``` Source: [snippets/sale.sale_order_portal_content.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.show_default_code.xml) +### X Description +ID: `mint_system.sale.sale_order_portal_content.x_description` +```xml + + + + +

          + + + + +``` +Source: [snippets/sale.sale_order_portal_content.x_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.x_description.xml) + ### X Hide On Sale Order ID: `mint_system.sale.sale_order_portal_content.x_hide_on_sale_order` ```xml diff --git a/snippets/website_sale.address.hide_shipping_use_same.xml b/snippets/website_sale.address.hide_shipping_use_same.xml index 7efa1db3..67a9fb94 100644 --- a/snippets/website_sale.address.hide_shipping_use_same.xml +++ b/snippets/website_sale.address.hide_shipping_use_same.xml @@ -1,6 +1,7 @@ - - - - + + + display: none; + + \ No newline at end of file diff --git a/snippets/website_sale.md b/snippets/website_sale.md index ab0edc58..af8e4018 100644 --- a/snippets/website_sale.md +++ b/snippets/website_sale.md @@ -3,11 +3,12 @@ ### Hide Shipping Use Same ID: `mint_system.website_sale.address.hide_shipping_use_same` ```xml - - - - + + + display: none; + + ``` Source: [snippets/website_sale.address.hide_shipping_use_same.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.address.hide_shipping_use_same.xml) @@ -73,6 +74,19 @@ ID: `mint_system.website_sale.address.show_firstname_lastname` ``` Source: [snippets/website_sale.address.show_firstname_lastname.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.address.show_firstname_lastname.xml) +## Payment Confirmation Status +### Remove Communication +ID: `mint_system.website_sale.payment_confirmation_status.remove_communication` +```xml + + + + + + +``` +Source: [snippets/website_sale.payment_confirmation_status.remove_communication.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.payment_confirmation_status.remove_communication.xml) + ## Products Categories ### Bigger Categories Button ID: `mint_system.website_sale.products_categories.bigger_categories_button` diff --git a/snippets/website_sale.payment_confirmation_status.remove_communication.xml b/snippets/website_sale.payment_confirmation_status.remove_communication.xml new file mode 100644 index 00000000..54838717 --- /dev/null +++ b/snippets/website_sale.payment_confirmation_status.remove_communication.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From b06aae9ef86082f6a6112c1618b116e3d75b4aeb Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 26 Oct 2023 10:33:53 +0200 Subject: [PATCH 147/147] ref --- enterprise | 2 +- oca/hr-attendance | 2 +- oca/l10n-switzerland | 2 +- oca/website | 2 +- odoo | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/enterprise b/enterprise index c0c36a2e..09d6293c 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit c0c36a2ef4c877f286d3b7eb4dae7739ac5d343c +Subproject commit 09d6293cbad97ac53430733e03951fc56fbba93d diff --git a/oca/hr-attendance b/oca/hr-attendance index 66bb8ac7..35e0e0f4 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 66bb8ac7d754624ecfae7c8e5a7c53c4bf60fad4 +Subproject commit 35e0e0f4332052eeb749b69ddd1960954ea9a955 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index 2a5d0867..370e2390 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit 2a5d0867e11d47acde565347256bc26f76de61b6 +Subproject commit 370e23903c56c3300dfa7369ec94321bca0f8b30 diff --git a/oca/website b/oca/website index d7ca7db5..bf9fd731 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit d7ca7db5a70c2d9ae813c31c8fea6469fe5dd3a8 +Subproject commit bf9fd7314f1dde157718e8ff9d2ca947f2f6bac3 diff --git a/odoo b/odoo index aa90123b..b2727949 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit aa90123b666784aea039ebb3c1febf0be81f8362 +Subproject commit b27279492fea98f2cd6bfba962bfd570e464d361