[DEL] Removes vendor02 repo since it was never used

.gitignore

@@ -4,5 +4,4 @@ core/
 custom/
 vendor/
 vendor01/
-vendor02/
 special/

README.md

@@ -16,26 +16,24 @@ To be installed into this directory structure:
         │
         ├── vendor    [Developed by an Odoo partner under contract]
         │
-        ├── vendor01  [In-house copy of modules removed from e-invoice repo]
-        │
-        └── vendor02  [New e-document modules (replaces original e-invoice repo)]
+        └── vendor01  [In-house copy of modules removed from e-invoice repo]
 
 ```
 
 ## To download or update code from repositories:
 
 ```sh
-./update_from_repo.sh [-h] -o={all|core|community|vendor|vendor01|vendor02|custom}
+./update_from_repo.sh [-h] -o={all|core|community|vendor|vendor01|custom}
 ```
 
 ## To install into the production structure:
 
 ```sh
-sudo ./install_odoo_code.sh [-h] -o={all|core|community|vendor|vendor01|vendor02|custom}
+sudo ./install_odoo_code.sh [-h] -o={all|core|community|vendor|vendor01|custom}
 ```
 
 ## To apply patches to installed code:
 
 ```sh
-sudo ./apply_patches.sh [-h] -o={all|core|community|vendor|vendor02}
+sudo ./apply_patches.sh [-h] -o={all|core|community|vendor}
 ```

apply_patches.sh

@@ -13,12 +13,12 @@ DESTDIR=/opt/odoo
 
 Help ()
 {
-    echo "Usage: $0 [-h] -o={all|core|vendor|vendor02|community}"
+    echo "Usage: $0 [-h] -o={all|core|vendor|community}"
     echo
     echo "Options:"
     echo "-h    Help (display this text)"
     echo "-o    Modules to be patched (one of 'all', 'core', 'vendor',"
-    echo "        'vendor02', 'community'). Required."
+    echo "        'community'). Required."
     echo
 }
 
@@ -66,36 +66,6 @@ pt_vendor ()
 
 }
 
-pt_vendor02 ()
-{
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    echo " Patch electronic document modules"
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-
-    # Roll patch against 'special' repo (taken from 'vendor')
-    #DEST=$DESTDIR/vendor/electronic_invoice_dian/
-    #OPTIONS="--directory=$DEST --strip=1"
-    #patch $OPTIONS < patches/20210922_electronic-invoice-dian_changes-after-1-8.patch
-
-    SRC=$PWD
-    DEST=$DESTDIR/vendor02/
-    OPTIONS="-p1 --verbose"
-
-    pushd $DEST
-    git apply $OPTIONS $SRC/patches/20220408_l10n-co-account-e-invoicing_fixes-dependencies.patch
-    # Re-roll:
-    git apply $OPTIONS $SRC/patches/20211119_l10n-co-account-e-invoicing_fixes-off-by-one.patch
-    git apply $OPTIONS $SRC/patches/20210908_l10n-co-base-location_ignore-country-state-city-data.patch
-    # Moved to vendor01 replacement repo:
-    # git apply $OPTIONS $SRC/patches/20210915_l10n-co-partner-person-type_fixes-depends.patch
-    popd
-
-    # Just required for initial installation. Revert afterwards:
-    # pushd $DEST
-    # git apply $OPTIONS patches/20210908_l10n-co-account-e-invoicing_remove-computes-for-initial-install.patch
-    # popd
-}
-
 pt_community ()
 {
     echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -117,7 +87,6 @@ pt_all ()
 {
     pt_core      # Apply patches to Odoo core
     pt_vendor    # Apply patches to Avancys modules
-    pt_vendor02  # Apply patches to special Avancys modules
     pt_community # Apply patches to OCA modules
 }
 
@@ -153,9 +122,6 @@ case $Modules in
     'vendor') # Apply patches to Avancys modules
         pt_vendor
         exit;;
-    'vendor02') # Apply patches to e-document Avancys modules
-        pt_vendor02
-        exit;;
     'community') # Apply patches to OCA modules
         pt_community
         exit;;

install_odoo_code.sh

@@ -13,12 +13,12 @@ OPTIONS="-av --exclude-from=common_exclude_patterns.txt --chown odoo:odoo"
 
 Help ()
 {
-    echo "Usage: $0 [-h] -o={all|core|community|apps|vendor|vendor02|custom}"
+    echo "Usage: $0 [-h] -o={all|core|community|apps|vendor|custom}"
     echo
     echo "Options:"
     echo "-h    Help (display this text)"
     echo "-o    Modules to be installed (one of 'all', 'core', 'community',"
-    echo "        'apps', 'vendor', 'vendor02, 'custom'). Required."
+    echo "        'apps', 'vendor', 'custom'). Required."
     echo
 }
 
@@ -99,24 +99,6 @@ cp_vendor01 ()
     echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 }
 
-cp_vendor02 ()
-{
-    REPO="Avancys v14 electronic documents"
-    SRC=./vendor02/
-    DEST=$DESTDIR/vendor02/
-    # Exclude modules/files already included in other repos:
-    EXCL="--exclude-from=rejected_vendor02_modules.txt"
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    echo "Install $REPO into production directory structure"
-    echo "(selected modules)"
-    echo "  …from $SRC to $DEST"
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    rsync $OPTIONS $EXCL $SRC $DEST
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    echo " [!] Remember to apply patches to the installed code"
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-}
-
 cp_custom ()
 {
     REPO="Custom in-house modules "
@@ -135,7 +117,6 @@ cp_all ()
     cp_community # Install OCA modules
     cp_vendor    # Install standard Avancys modules
     cp_vendor01  # Install replacement for removed Avancys modules
-    cp_vendor02  # Install Avancys e-document modules
     cp_custom    # Install Custom modules
 }
 
@@ -180,9 +161,6 @@ case $Modules in
     'vendor01') # Install replacement for removed Avancys modules
         cp_vendor01
         exit;;
-    'vendor02') # Install Avancys e-document modules
-        cp_vendor02
-        exit;;
     'custom') # Install Custom modules developed in-house
         cp_custom
         exit;;

patches/20210922_electronic-invoice-dian_changes-after-1-8.patch

@@ -1,72 +0,0 @@
-diff -rupN electronic_invoice_dian.orig/__manifest__.py electronic_invoice_dian.patch/__manifest__.py
---- electronic_invoice_dian.orig/__manifest__.py	2021-09-22 18:22:44.527545853 -0500
-+++ electronic_invoice_dian.patch/__manifest__.py	2021-09-23 12:44:10.531259879 -0500
-@@ -13,7 +13,7 @@
-     'category': 'Accounting/Accounting',
-     'version': '14.0.0.0',
-     'depends': ['account', 'sale'],
--    'license': 'OEEL-1',
-+    'license': '',
-     'installable': True,
-     'data': [
-         'data/data.xml',
-diff -rupN electronic_invoice_dian.orig/models/account_move.py electronic_invoice_dian.patch/models/account_move.py
---- electronic_invoice_dian.orig/models/account_move.py	2021-09-22 18:22:44.527545853 -0500
-+++ electronic_invoice_dian.patch/models/account_move.py	2021-09-23 12:51:07.934868234 -0500
-@@ -220,7 +220,7 @@ class AccountMove(models.Model):
-             "id_param": str(journal.resolution_id.id_param),
-             "test": "0",
-             "ambiente": "1" if company.ei_environment == 'production' else "2",
--            "ruta_to_soap": ("SendBillSync"
-+            "ruta_to_soap": ("SendBillAttachmentAsync"
-                              if company.ei_environment == 'production'
-                              else "SendTestSetAsync")
-         }
-@@ -276,7 +276,7 @@ class AccountMove(models.Model):
-                               if is_colombia(partner_country) else ""),
-             "RUT_direcci\u00f3n": invoice_partner.street,
-             "RUT_impuesto": "01",
--            "Respon_fiscales": "",
-+            "Respon_fiscales": "O-13",
-             "Num_matricula_mercantil": "",
-             "Nombre_contacto": invoice_partner.name,
-             "Tel_contacto": invoice_partner.phone,
-@@ -300,7 +300,7 @@ class AccountMove(models.Model):
-             "RUT_municipio": "",
-             "RUT_direcci\u00f3n": "",
-             "RUT_impuesto": "",
--            "Respon_fiscales": "",
-+            "Respon_fiscales": "O-13",
-             "Num_matricula_mercantil": "",
-             "Nombre_contacto": "",
-             "Tel_contacto": "",
-@@ -621,7 +621,7 @@ class AccountMove(models.Model):
- 
-     def valid_email_address(self):
-         regex = r'(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)'
--        emails = self.partner_id.email or ''
-+        emails = self.partner_id.ei_email or self.partner_id.email or ''
-         email_list = emails.split(';')
-         return list(filter(
-             lambda email: re.match(regex, email),
-@@ -642,7 +642,7 @@ class AccountMove(models.Model):
-                 continue
-             email_pool = email_pool + email
-             invoice.create_transaction_log(invoice, 'email_sent', 'OK')
--            invoice.ei_email_sent = True
-+            invoice.sudo().ei_email_sent = True
-         if force_send:
-             email_pool.send()
- 
-diff -rupN electronic_invoice_dian.orig/templates/customer_acknowledge_email.xml electronic_invoice_dian.patch/templates/customer_acknowledge_email.xml
---- electronic_invoice_dian.orig/templates/customer_acknowledge_email.xml	2021-09-22 18:22:44.527545853 -0500
-+++ electronic_invoice_dian.patch/templates/customer_acknowledge_email.xml	2021-09-22 18:50:59.214220403 -0500
-@@ -6,7 +6,7 @@
-             <field name="email_from">${object.company_id.email or ''}</field>
-             <field name="subject">${object.company_id.partner_id.ref_num};${object.company_id.partner_id.name};${object.name};${object.journal_id.resolution_id.document_type};${object.company_id.partner_id.name}</field>
-             <field name="model_id" ref="account.model_account_move" />
--            <field name="email_to">${(object.partner_id.email or object.partner_id.ei_email)}</field>
-+            <field name="email_to">${(object.partner_id.ei_email or object.partner_id.email)}</field>
-             <field name="partner_to">${False}</field>
-             <field name="auto_delete" eval="True" />
-             <field name="body_html">

rejected_vendor02_modules.txt

@@ -1,3 +0,0 @@
-requirements.txt
-account_invoice_force_number_extended
-partner_coc

update_from_repo.sh

@@ -5,12 +5,12 @@
 
 Help ()
 {
-    echo "Usage: $0 [-h] -o={all|core|community|vendor|vendor02|custom}"
+    echo "Usage: $0 [-h] -o={all|core|community|vendor|custom}"
     echo
     echo "Options:"
     echo "-h    Help (display this text)"
     echo "-o    Repositories to be updated (one of 'all', 'core', 'community',"
-    echo "        'vendor', 'vendor02, 'custom'). Required."
+    echo "        'vendor', 'custom'). Required."
     echo
 }
 
@@ -98,27 +98,6 @@ gt_vendor01 ()
     fi
 }
 
-gt_vendor02 ()
-{
-    REPO="Electronic documents by Avancys"
-    SRC=git@gitlab.com:mgarcia.avancys/v14-electronic-documents-agofer.git
-    DEST=./vendor02/
-    OPTIONS=""
-    if [ ! -d "$DEST" ]; then
-        echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        echo "Clone $REPO"
-        echo "  …to $DEST"
-        echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        git clone $OPTIONS $SRC $DEST
-    else
-        echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        echo "Update $REPO"
-        echo "  …in $DEST"
-        echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        git -C $DEST pull
-    fi
-}
-
 gt_custom ()
 {
     REPO="Custom in-house modules"
@@ -146,7 +125,6 @@ gt_all ()
     gt_community # OCA modules repo, using git submodules
     gt_vendor    # Avancys main repo
     gt_vendor01  # In-house replacement repo for removed Avancys modules
-    gt_vendor02  # Avancys e-document modules
     gt_custom    # Custom in-house modules
 }
 
@@ -188,9 +166,6 @@ case $Modules in
     'vendor01') # Download original e-invoice Avancys modules
         gt_vendor01
         exit;;
-    'vendor02') # Download from Avancys e-document modules
-        gt_vendor02
-        exit;;
     'custom') # Download from repo Custom modules developed in-house
         gt_custom
         exit;;