From f7f0756641188f1a211d2d2dc7fe5584d5134e8d Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Wed, 22 Apr 2020 14:33:12 +0200 Subject: [PATCH] [REF] pretty xml --- easy_my_coop/data/easy_my_coop_data.xml | 13 +- easy_my_coop/data/mail_template_data.xml | 116 +- easy_my_coop/data/paperformat.xml | 4 +- easy_my_coop/demo/coop.xml | 30 +- easy_my_coop/demo/users.xml | 6 +- .../report/cooperator_certificat_G001.xml | 35 +- .../report/cooperator_invoice_G002.xml | 136 +- .../report/cooperator_register_G001.xml | 236 +-- .../report/cooperator_subscription_G001.xml | 206 +- easy_my_coop/report/easy_my_coop_report.xml | 68 +- easy_my_coop/report/layout.xml | 65 +- easy_my_coop/security/res_groups.xml | 6 +- easy_my_coop/views/account_invoice_view.xml | 148 +- easy_my_coop/views/account_journal_view.xml | 24 +- .../views/cooperator_register_view.xml | 145 +- easy_my_coop/views/email_template_view.xml | 20 +- easy_my_coop/views/menus.xml | 62 +- easy_my_coop/views/operation_request_view.xml | 224 ++- easy_my_coop/views/product_view.xml | 285 +-- easy_my_coop/views/res_company_view.xml | 63 +- easy_my_coop/views/res_partner_view.xml | 396 ++-- .../views/subscription_request_view.xml | 301 +-- .../wizard/cooperative_history_wizard.xml | 43 +- .../create_subscription_from_partner.xml | 41 +- easy_my_coop/wizard/update_partner_info.xml | 27 +- easy_my_coop/wizard/update_share_line.xml | 18 +- .../wizard/validate_subscription_request.xml | 17 +- .../views/subscription_template.xml | 56 +- .../views/dividend_views.xml | 179 +- easy_my_coop_eater/view/product_view.xml | 8 +- .../wizard/export_global_wizard.xml | 27 +- .../views/certificate_template.xml | 154 +- easy_my_coop_fr/views/layout_template.xml | 23 +- .../views/subscription_template.xml | 24 +- easy_my_coop_loan/data/mail_template_data.xml | 33 +- easy_my_coop_loan/demo/coop.xml | 6 +- easy_my_coop_loan/views/loan_view.xml | 451 ++--- easy_my_coop_loan/views/menus.xml | 14 +- easy_my_coop_loan/views/partner_view.xml | 85 +- .../data/website_loan_data.xml | 12 +- .../template/loan_issue_template.xml | 123 +- .../data/mail_template_data.xml | 11 +- .../data/scheduler_data.xml | 6 +- .../demo/tax_shelter_demo.xml | 19 +- .../reports/tax_shelter_report.xml | 32 +- .../reports/tax_shelter_resold_report.xml | 101 +- .../reports/tax_shelter_shares_report.xml | 186 +- .../tax_shelter_subscription_report.xml | 157 +- .../views/tax_shelter_declaration_view.xml | 44 +- .../views/subscription_template.xml | 1690 ++++++++++------- .../easy_my_coop_website_portal_templates.xml | 348 ++-- ...y_my_coop_website_taxshelter_templates.xml | 179 +- partner_age/view/partner_view.xml | 27 +- theme_light/report/header_report_G002.xml | 375 ++-- theme_light/views/layout_template.xml | 417 ++-- .../views/res_config.xml | 73 +- .../views/website_view.xml | 11 +- 57 files changed, 4494 insertions(+), 3112 deletions(-) diff --git a/easy_my_coop/data/easy_my_coop_data.xml b/easy_my_coop/data/easy_my_coop_data.xml index 3f80622..40c9c7c 100644 --- a/easy_my_coop/data/easy_my_coop_data.xml +++ b/easy_my_coop/data/easy_my_coop_data.xml @@ -1,14 +1,15 @@ - - + + Cooperative Management Manage your cooperative. 3 - - + + Company Share @@ -19,7 +20,7 @@ True - + Subscription Journal SUBJ sale @@ -39,5 +40,5 @@ - + diff --git a/easy_my_coop/data/mail_template_data.xml b/easy_my_coop/data/mail_template_data.xml index 24aeed0..c487e1a 100644 --- a/easy_my_coop/data/mail_template_data.xml +++ b/easy_my_coop/data/mail_template_data.xml @@ -5,15 +5,24 @@ - Request to Release Capital - Send by Email - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} - ${object.company_id.name} Request to Release Capital (Ref ${object.number or 'n/a'}) + Request to Release Capital - Send by Email + + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${object.company_id.name} Request to Release + Capital (Ref ${object.number or 'n/a'}) + ${object.partner_id.id} - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + - ${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} + + ${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} + ${object.partner_id.lang} Confirmation Email - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + Subscription request confirmation ${object.email} - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + ${object.lang} @@ -112,10 +125,15 @@ Waiting List Email - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} - Subscription request added on waiting list. + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + Subscription request added on waiting list. + ${object.email} - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + ${object.lang} @@ -167,10 +185,15 @@ Company Confirmation Email - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + Subscription request confirmation - ${object.email},${object.company_email} - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + ${object.email},${object.company_email} + + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + ${object.lang} @@ -221,15 +244,23 @@ - Payment Received Confirmation - Send By Email - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + Payment Received Confirmation - Send By Email + + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + Payment Received Confirmation ${object.id} - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + - - Certificat ${(object.cooperator_register_number or '')} + + Certificat + ${(object.cooperator_register_number or '')} + ${object.lang} - Share Increase - Payment Received Confirmation - Send By Email - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + Share Increase - Payment Received Confirmation - + Send By Email + + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + Payment Received Confirmation ${object.id} - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + - - Certificat ${(object.cooperator_register_number or '')} + + Certificat + ${(object.cooperator_register_number or '')} + ${object.lang} Share transfer - Send By Email - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + Share transfert ${object.id} - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + - - Certificat ${(object.cooperator_register_number or '')} + + Certificat + ${(object.cooperator_register_number or '')} + ${object.lang} Share update - Send By Email - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + Share update ${object.id} - ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + + ${(object.company_id.coop_email_contact or object.user_id.email)|safe} + - - Certificat ${(object.cooperator_register_number or '')} + + Certificat + ${(object.cooperator_register_number or '')} + ${object.lang} A4 easy my coop larger logo - + A4 0 0 @@ -12,7 +12,7 @@ 20 7 7 - + 45 90 diff --git a/easy_my_coop/demo/coop.xml b/easy_my_coop/demo/coop.xml index d7b784c..2535627 100644 --- a/easy_my_coop/demo/coop.xml +++ b/easy_my_coop/demo/coop.xml @@ -18,9 +18,9 @@ - FR7611808009101234567890147 - Bank - + FR7611808009101234567890147 + Bank + @@ -53,9 +53,9 @@ - BE71096123456769 - Bank - + BE71096123456769 + Bank + @@ -77,7 +77,8 @@ - + @@ -116,24 +117,29 @@ manual 3 - + en_US - + 2 50 - + - + 4 50 - + diff --git a/easy_my_coop/demo/users.xml b/easy_my_coop/demo/users.xml index 1177375..98a69da 100644 --- a/easy_my_coop/demo/users.xml +++ b/easy_my_coop/demo/users.xml @@ -20,7 +20,8 @@ user-emc demo - + @@ -38,7 +39,8 @@ manager-emc demo - + diff --git a/easy_my_coop/report/cooperator_certificat_G001.xml b/easy_my_coop/report/cooperator_certificat_G001.xml index 26e2442..02661a1 100644 --- a/easy_my_coop/report/cooperator_certificat_G001.xml +++ b/easy_my_coop/report/cooperator_certificat_G001.xml @@ -5,7 +5,8 @@ -
+

@@ -13,9 +14,9 @@

- Certificate generated on - -

+ Certificate generated on + +

@@ -24,7 +25,8 @@

- +
@@ -51,11 +53,11 @@ @@ -67,14 +69,16 @@
+ t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> + t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
- +
Total + Total + - share(s) + share(s) + t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
@@ -85,7 +89,7 @@

- For the board of . + For the board of.

@@ -93,9 +97,9 @@

+ t-attf-class="mt16 w-50" + t-attf-style="{{ 'min-width: 100px; max-width: 250px' if report_type == 'pdf' else '' }}" + t-att-src="'data:image/png;base64,%s' % o.company_id.signature_scan.decode()"/>
@@ -107,7 +111,8 @@ diff --git a/easy_my_coop/report/cooperator_invoice_G002.xml b/easy_my_coop/report/cooperator_invoice_G002.xml index d845a31..d630031 100644 --- a/easy_my_coop/report/cooperator_invoice_G002.xml +++ b/easy_my_coop/report/cooperator_invoice_G002.xml @@ -5,39 +5,56 @@ -
-
:
+
+
: + +

- Request to Release Capital + Request to Release + Capital + - Invoice - Draft Invoice - Cancelled Invoice + + Invoice + + + Draft Invoice + + + Cancelled Invoice + Credit Note - Vendor Credit Note + Vendor Credit Note + Vendor Bill

-
+
Description:

-
+
Request Date:

-
+
Structured Communication:

Account Number: - +

@@ -53,20 +70,36 @@

- + - +
- - - - - + + + + + @@ -75,26 +108,38 @@ - - + + - - - + + + @@ -116,9 +161,9 @@ @@ -131,7 +176,9 @@
DescriptionSource DocumentPart TypeQuantityUnit Price + Description + + Source Document + - Amount - Total Price + Part Type + + Quantity + + Unit Price + + + Amount + + + Total Price +
+ + + + - + - - + + Subtotal + t-esc="current_subtotal" + t-options='{"widget": "monetary", "display_currency": o.currency_id}' + />
- + @@ -141,7 +188,10 @@

- Please use the following communication for your payment : + Please use the following communication for your payment : + + +

@@ -152,13 +202,22 @@

-
+

- Scan me with your banking app.

- + Scan me with your banking + app. + +
+
+

- The SEPA QR Code informations are not set correctly.
+ The SEPA QR Code + informations are not set correctly. + +

@@ -169,7 +228,8 @@ diff --git a/easy_my_coop/report/cooperator_register_G001.xml b/easy_my_coop/report/cooperator_register_G001.xml index 6bc790b..845b739 100644 --- a/easy_my_coop/report/cooperator_register_G001.xml +++ b/easy_my_coop/report/cooperator_register_G001.xml @@ -1,121 +1,145 @@ - diff --git a/easy_my_coop/report/cooperator_subscription_G001.xml b/easy_my_coop/report/cooperator_subscription_G001.xml index 70286e6..b3cbdec 100644 --- a/easy_my_coop/report/cooperator_subscription_G001.xml +++ b/easy_my_coop/report/cooperator_subscription_G001.xml @@ -1,106 +1,130 @@ - diff --git a/easy_my_coop/report/easy_my_coop_report.xml b/easy_my_coop/report/easy_my_coop_report.xml index 6e2dac7..84e2d5a 100644 --- a/easy_my_coop/report/easy_my_coop_report.xml +++ b/easy_my_coop/report/easy_my_coop_report.xml @@ -1,49 +1,49 @@ - + - - + diff --git a/easy_my_coop/report/layout.xml b/easy_my_coop/report/layout.xml index fc43853..eea8fa3 100644 --- a/easy_my_coop/report/layout.xml +++ b/easy_my_coop/report/layout.xml @@ -1,38 +1,60 @@ -
Total + Total +