diff --git a/merge_same_products/__openerp__.py b/merge_same_products/__openerp__.py index 0fb3d5eaa..f4ebc49a5 100644 --- a/merge_same_products/__openerp__.py +++ b/merge_same_products/__openerp__.py @@ -29,7 +29,7 @@ 'depends': ['account', 'base', 'sale', 'purchase'], 'license': 'AGPL-3', 'data': [], - 'images': ['static/description/banner.jpg'], + 'images': ['static/description/banner.gif'], 'demo': [], 'installable': True, 'auto_install': False, diff --git a/merge_same_products/static/description/images/banner-content-text.png b/merge_same_products/static/description/images/banner-content-text.png index 2529aa3a9..acc0c9be2 100644 Binary files a/merge_same_products/static/description/images/banner-content-text.png and b/merge_same_products/static/description/images/banner-content-text.png differ diff --git a/merge_same_products/static/description/images/banner-img.jpg b/merge_same_products/static/description/images/banner-img.jpg deleted file mode 100644 index aa1906a9c..000000000 Binary files a/merge_same_products/static/description/images/banner-img.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/banner-img.png b/merge_same_products/static/description/images/banner-img.png index b3dc97cf1..b55ee97dc 100644 Binary files a/merge_same_products/static/description/images/banner-img.png and b/merge_same_products/static/description/images/banner-img.png differ diff --git a/merge_same_products/static/description/images/content-area-img.png b/merge_same_products/static/description/images/content-area-img.png index 8dbaceeb5..d734b3aa9 100644 Binary files a/merge_same_products/static/description/images/content-area-img.png and b/merge_same_products/static/description/images/content-area-img.png differ diff --git a/merge_same_products/static/description/images/single product 2.png b/merge_same_products/static/description/images/single product 2.png deleted file mode 100644 index 4477eb1cc..000000000 Binary files a/merge_same_products/static/description/images/single product 2.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-1.jpg b/merge_same_products/static/description/images/template-white-theam-1.jpg deleted file mode 100644 index 58d7a6234..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-1.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-1.png b/merge_same_products/static/description/images/template-white-theam-1.png new file mode 100644 index 000000000..9fcdc97b8 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-1.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-10.png b/merge_same_products/static/description/images/template-white-theam-10.png new file mode 100644 index 000000000..5b2060858 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-10.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-11.png b/merge_same_products/static/description/images/template-white-theam-11.png new file mode 100644 index 000000000..9d3fe3eb9 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-11.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-12.jpg b/merge_same_products/static/description/images/template-white-theam-12.jpg deleted file mode 100644 index bf859be48..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-12.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-13.png b/merge_same_products/static/description/images/template-white-theam-13.png index 16a343fdb..702682e02 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-13.png and b/merge_same_products/static/description/images/template-white-theam-13.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-14.png b/merge_same_products/static/description/images/template-white-theam-14.png index defb635d4..5e30c9195 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-14.png and b/merge_same_products/static/description/images/template-white-theam-14.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-15.png b/merge_same_products/static/description/images/template-white-theam-15.png index bbb670dd8..e9bac17c9 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-15.png and b/merge_same_products/static/description/images/template-white-theam-15.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-16.png b/merge_same_products/static/description/images/template-white-theam-16.png index be3ccb8c4..e41808902 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-16.png and b/merge_same_products/static/description/images/template-white-theam-16.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-17.png b/merge_same_products/static/description/images/template-white-theam-17.png index d8d1d80b5..9e25b774d 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-17.png and b/merge_same_products/static/description/images/template-white-theam-17.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-18.jpg b/merge_same_products/static/description/images/template-white-theam-18.jpg deleted file mode 100644 index 46b4fb0a0..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-18.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-18.png b/merge_same_products/static/description/images/template-white-theam-18.png new file mode 100644 index 000000000..9915742f5 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-18.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-19.png b/merge_same_products/static/description/images/template-white-theam-19.png deleted file mode 100644 index ce001b93f..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-19.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-2.png b/merge_same_products/static/description/images/template-white-theam-2.png index f877dc268..f0589ba26 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-2.png and b/merge_same_products/static/description/images/template-white-theam-2.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-20.png b/merge_same_products/static/description/images/template-white-theam-20.png deleted file mode 100644 index 373c6ec92..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-20.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-21.png b/merge_same_products/static/description/images/template-white-theam-21.png deleted file mode 100644 index 86ac74df4..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-21.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-22.png b/merge_same_products/static/description/images/template-white-theam-22.png deleted file mode 100644 index f3eadb561..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-22.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-23.png b/merge_same_products/static/description/images/template-white-theam-23.png index ec1b7bfe1..7911d2eb1 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-23.png and b/merge_same_products/static/description/images/template-white-theam-23.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-24.jpg b/merge_same_products/static/description/images/template-white-theam-24.jpg deleted file mode 100644 index 56afa4de1..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-24.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-24.png b/merge_same_products/static/description/images/template-white-theam-24.png new file mode 100644 index 000000000..43e7e14e0 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-24.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-25.png b/merge_same_products/static/description/images/template-white-theam-25.png index e8ec95c75..968f5a45c 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-25.png and b/merge_same_products/static/description/images/template-white-theam-25.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-26.png b/merge_same_products/static/description/images/template-white-theam-26.png index f5f1f9194..5418cbb4c 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-26.png and b/merge_same_products/static/description/images/template-white-theam-26.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-27.jpg b/merge_same_products/static/description/images/template-white-theam-27.jpg deleted file mode 100644 index 62a65628a..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-27.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-28.jpg b/merge_same_products/static/description/images/template-white-theam-28.jpg deleted file mode 100644 index 96e3c6600..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-28.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-29.jpg b/merge_same_products/static/description/images/template-white-theam-29.jpg deleted file mode 100644 index 22f1ea67f..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-29.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-3.png b/merge_same_products/static/description/images/template-white-theam-3.png index 8a0c1ea5b..4e89f9c4c 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-3.png and b/merge_same_products/static/description/images/template-white-theam-3.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-30.png b/merge_same_products/static/description/images/template-white-theam-30.png deleted file mode 100644 index 63bf7099d..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-30.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-31.jpg b/merge_same_products/static/description/images/template-white-theam-31.jpg deleted file mode 100644 index 516807a65..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-31.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-32.jpg b/merge_same_products/static/description/images/template-white-theam-32.jpg deleted file mode 100644 index f9896aaab..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-32.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-32.png b/merge_same_products/static/description/images/template-white-theam-32.png new file mode 100644 index 000000000..46c132055 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-32.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-33.png b/merge_same_products/static/description/images/template-white-theam-33.png deleted file mode 100644 index 911519f85..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-33.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-34.jpg b/merge_same_products/static/description/images/template-white-theam-34.jpg deleted file mode 100644 index f66f1ae73..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-34.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-35.jpg b/merge_same_products/static/description/images/template-white-theam-35.jpg deleted file mode 100644 index 0aa7351b5..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-35.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-36.png b/merge_same_products/static/description/images/template-white-theam-36.png deleted file mode 100644 index fb7068554..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-36.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-37.png b/merge_same_products/static/description/images/template-white-theam-37.png deleted file mode 100644 index 782e6220b..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-37.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-38.jpg b/merge_same_products/static/description/images/template-white-theam-38.jpg deleted file mode 100644 index f5c491e97..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-38.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-39.png b/merge_same_products/static/description/images/template-white-theam-39.png deleted file mode 100644 index f94d73b7b..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-39.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-4.jpg b/merge_same_products/static/description/images/template-white-theam-4.jpg deleted file mode 100644 index 45f73a7d4..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-4.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-4.png b/merge_same_products/static/description/images/template-white-theam-4.png new file mode 100644 index 000000000..9eecee80a Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-4.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-40.jpg b/merge_same_products/static/description/images/template-white-theam-40.jpg deleted file mode 100644 index ca917bd27..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-40.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-41.png b/merge_same_products/static/description/images/template-white-theam-41.png deleted file mode 100644 index 152ae1a4d..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-41.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-42.png b/merge_same_products/static/description/images/template-white-theam-42.png deleted file mode 100644 index 4b89318d6..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-42.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-43.jpg b/merge_same_products/static/description/images/template-white-theam-43.jpg deleted file mode 100644 index 72885f1f5..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-43.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-44.png b/merge_same_products/static/description/images/template-white-theam-44.png deleted file mode 100644 index 1f2b2234a..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-44.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-45.png b/merge_same_products/static/description/images/template-white-theam-45.png deleted file mode 100644 index 270fec831..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-45.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-46.png b/merge_same_products/static/description/images/template-white-theam-46.png deleted file mode 100644 index dca83813e..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-46.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-47.png b/merge_same_products/static/description/images/template-white-theam-47.png deleted file mode 100644 index 3c17dff11..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-47.png and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-5.png b/merge_same_products/static/description/images/template-white-theam-5.png index 1717fd172..022f9863b 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-5.png and b/merge_same_products/static/description/images/template-white-theam-5.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-6.jpg b/merge_same_products/static/description/images/template-white-theam-6.jpg deleted file mode 100644 index ddc2557f0..000000000 Binary files a/merge_same_products/static/description/images/template-white-theam-6.jpg and /dev/null differ diff --git a/merge_same_products/static/description/images/template-white-theam-6.png b/merge_same_products/static/description/images/template-white-theam-6.png new file mode 100644 index 000000000..8213d9f60 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-6.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-7.png b/merge_same_products/static/description/images/template-white-theam-7.png index aaa17c007..c5218f2b7 100644 Binary files a/merge_same_products/static/description/images/template-white-theam-7.png and b/merge_same_products/static/description/images/template-white-theam-7.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-8.png b/merge_same_products/static/description/images/template-white-theam-8.png new file mode 100644 index 000000000..3d6a92f62 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-8.png differ diff --git a/merge_same_products/static/description/images/template-white-theam-9-4x.png b/merge_same_products/static/description/images/template-white-theam-9-4x.png new file mode 100644 index 000000000..3664caec2 Binary files /dev/null and b/merge_same_products/static/description/images/template-white-theam-9-4x.png differ diff --git a/merge_same_products/static/description/index.html b/merge_same_products/static/description/index.html index 3f2fa3141..d732281e5 100644 --- a/merge_same_products/static/description/index.html +++ b/merge_same_products/static/description/index.html @@ -1,27 +1,9 @@ - - - - odoo - - - - - - - - - - - -
- -
+
@@ -29,10 +11,7 @@ - - - -
+
@@ -84,17 +63,19 @@ -
+
-
+
-
+
- +
@@ -105,7 +86,7 @@ -
+
@@ -114,17 +95,19 @@
-

espresso

+

ECOFOOD

-
    -
  • Website Design
    • +
      +
    • Theme
    • UI/UX
      • -
    • Developing
      • +
    • Web Development
      • +
    • Mobile Responsive
      • +
    @@ -153,9 +136,9 @@
    -

    make a break
    +

    WELCOME
    -for a hot
    coffee     +TO ECOLIFE
    STORE

    @@ -177,7 +160,7 @@
    -
    +
    @@ -214,7 +197,7 @@

    Key features

    -
    +
    @@ -283,7 +266,7 @@
    -Up-to-date Development +Up-to-date development

    Lorem ipsum dolor sit am consectetur adipiscing elit. Nam teD dolovehicula consequat. Duis et eros vestibulum.

    @@ -302,7 +285,7 @@
    -Responsive Design +Responsive design

    Lorem ipsum dolor sit am consectetur adipiscing elit. Nam teD dolovehicula consequat. Duis et eros vestibulum.

    @@ -357,19 +340,23 @@
    -

    Main page

    +

    Main page

    -
      +
      • Home
        • -
      • About us
        • -
      • Menu
        • -
      • Team
        • +
      • Features
        • +
      • Banners
        • +
      • Best Seller
        • +
      • Featured Products
        • +
      • New Arrivals
        • +
      • Shopping Banner
        • +
      • Recently Added
      • Testimonials
        • -
      • Reservation
        • +
      • Footer
      @@ -404,7 +391,7 @@
      - +
      @@ -444,7 +431,7 @@
      - +
      @@ -471,7 +458,7 @@
      - +
      @@ -493,47 +480,39 @@
    -
    - -
    - -
    +
    +
    + -
    +
    -
    -
    +
    -
    -

    Menu page

    -
    -
    -
    +
    -
      -
    • Banner
      • -
    • Easy Categorized menu
      • -
    • Product List
      • -
    • Offer Banner
      • +
      + -
    +
    +
    -
    +
    -
    +
    +
    @@ -542,47 +521,83 @@
    +
    +
    + -
    +
    -
    +
    -
    +
    +
    + + + + +
    + + +
    -
    -
    -
    -
    +
    -
    -
    -
    + +
    +
    + +
    + +
    + +

    Mobile Responsive Design

    +
    + +
    + +
    + + + +
    + + +
    + + + +
    + + + + +
    -
    +
    @@ -601,76 +616,45 @@
    - -
    - - -
    - -
    - - - - -
    - - -
    - - -
    - -
    - - - -
    -
    - -
    - - -
    -
    -
    +
    -
    +
    -

    Single Product page

    -
    +

    Product page

    +
    -
    - -
      -
    • Product Discription
      • -
    • Similer Product
      • -
    • Offer Banner
      • +
      +
        +
      • Banner
        • +
      • Filter & Product List
        • +
      • Grid View
        • +
      • Footer
      @@ -685,108 +669,73 @@
      + +
    -
    +
    +
    +
    - - - -
    +
    -
    - -
    - - - -
    -
    +
    +
    +
    -
    -
    -
    - - -
    - -
    - -
    - -

    Cart & Check out

    -
    - -
    - -
    - -
      -
    • Product Description
      • -
    • Similar Product
      • -
    • Offer Banner
      • - -
    - -
    +
    -
    +
    +
    -
    -
    - - -
    - -
    - +
    @@ -794,62 +743,61 @@
    +
    -
    +
    + -
    -
    -
    +
    +
    -
    +
    -
    +
    - +

    Mobile Responsive Design

    +
    +
    -
    +
    -
    +
    -
    -
    +
    -
    -
    -
    -
    +
    - +
    -
    +
    -
    +
    -
    +
    @@ -860,7 +808,6 @@
    -
    @@ -869,7 +816,9 @@
    -
    + + +
    @@ -878,18 +827,19 @@
    -

    Shop Page

    +

    Cart page

    -
      -
    • Product Description
      • -
    • Similar Product
      • -
    • Offer Banner
      • - +
        +
      • Personal Information
        • +
      • Address
        • +
      • Shipping Method
        • +
      • Payment
        • +
      • Footer
      @@ -909,111 +859,79 @@
    +
    - - - - -
    -
    +
    -
    - - - - -
    - +
    -
    - - -
    - - -
    -
    - -
    +
    -
    - - +
    -
    +
    -
    - - +
    -
    - -
    +
    -
    +
    -
    +
    -

    Shop Page

    +

    Mobile Responsive Design

    -
    - -
      -
    • Banner
      • -
    • About Us
      • -
    • Quality
      • -
    • Promo Video
      • +
      -
    @@ -1031,7 +949,9 @@
    -
    + + +
    @@ -1040,24 +960,16 @@
    -
    - - - +
    -
    +
    -
    - - -
    - - +
    @@ -1065,578 +977,13 @@
    +
    -
    - - -
    - - - - -
    - - -
    - - -
    - - -
    - - - - -
    - - -
    - - - -
    - - -
    - - -
    - - -
    - - -
    - -
    - -
    - -

    Reservation Page

    -
    - -
    - -
    - -
      -
    • Banner
      • -
    • Reservation
      • -
    • Location
      • - -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - - -
    - - - - -
    - - -
    - - - -
    - - -
    - - - - -
    - - -
    - - -
    - - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - -
    - - - - - -
    - - -
    - -
    - -
    - -

    Features Page

    -
    - -
    - -
    - -
      -
    • Banner
      • -
    • Home Delivery
      • -
    • Other Features
      • - -
    -
    -
    - -
    - -
    - - - -
    - -
    - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - -
    - - -
    - - - - -
    - - -
    - - -
    - - -
    - - - - -
    - - -
    - - - - - -
    - -
    - - - - -
    - - -
    - -
    - -
    - -

    Gallery Page

    -
    - -
    - -
    - -
      -
    • Banner
      • -
    • Category
      • -
    • Gallery images
      • -
    - - - -
    - - -
    - - - -
    - - - - -
    - - - - - -
    - -
    - -
    - - - - - -
    - - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - - -
    - - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - -
    - - -
    - - -
    - -
    - -
    - -

    Faq Page

    -
    - -
    - -
    - -
      -
    • Question & Answers
      • -
    • Banner
      • - -
    - - - -
    - - -
    - - - -
    - - - - -
    - - -
    - -
    - -
    - - - - - -
    - - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - -
    - - -
    - - - - -
    - - -
    - - - -
    - - -
    - - -
    - - - - -
    - - -
    - -
    - -
    - -

    Login popup

    -
    - -
    - -
    - - - -
    - - - - -
    - - - - - -
    - -
    - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - -
    - - -
    - - -
    - - - - -
    - - -
    - -
    - -
    - -

    Login popup

    -
    - -
    - -
    - - - -
    - - - - -
    - - - - -
    - -
    - -
    - - - - -
    - - -
    - - - - -
    - - -
    - - -
    - - -
    - - -
    - - - - - - - - - - -
    +
    @@ -1783,7 +1130,7 @@ -
    +
    @@ -1943,8 +1290,3 @@ management application

    - - - - -