diff --git a/apply_patches.sh b/apply_patches.sh index f74d188..b573525 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -13,11 +13,11 @@ DESTDIR=/opt/odoo Help () { - echo "Usage: $0 [-h] -o={all|core|vendor|community}" + echo "Usage: $0 [-h] -o={all|core|community}" echo echo "Options:" echo "-h Help (display this text)" - echo "-o Modules to be patched (one of 'all', 'core', 'vendor'," + echo "-o Modules to be patched (one of 'all', 'core'," echo " 'community'). Required." echo } @@ -46,26 +46,6 @@ pt_core () popd } -pt_vendor () -{ - echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - echo " Patch vendor modules" - echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - - SRC=$PWD - DEST=$DESTDIR/vendor/ - OPTIONS="-p1 --verbose" - - pushd $DEST - # Included upstream: - # git apply $OPTIONS $SRC/patches/20211209_hr-avancys_delete-without-sql-in-holiday-book.patch - # Already applied: - # git apply $OPTIONS $SRC/patches/20211210_hr-avancys_fixes--payment-date-on-payslip.patch - git apply $OPTIONS $SRC/patches/20230713_account-avancys_adds-account-field.patch - popd - -} - pt_community () { echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" @@ -86,7 +66,6 @@ pt_community () pt_all () { pt_core # Apply patches to Odoo core - pt_vendor # Apply patches to Avancys modules pt_community # Apply patches to OCA modules } @@ -119,9 +98,6 @@ case $Modules in 'core') # Apply patches to Odoo core pt_core exit;; - 'vendor') # Apply patches to Avancys modules - pt_vendor - exit;; 'community') # Apply patches to OCA modules pt_community exit;; diff --git a/install_odoo_code.sh b/install_odoo_code.sh index be2801a..3e7b1ef 100755 --- a/install_odoo_code.sh +++ b/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|custom}" + echo "Usage: $0 [-h] -o={all|core|community|apps|vendor|vendor01|custom}" echo echo "Options:" echo "-h Help (display this text)" echo "-o Modules to be installed (one of 'all', 'core', 'community'," - echo " 'apps', 'vendor', 'custom'). Required." + echo " 'apps', 'vendor', 'vendor01', 'custom'). Required." echo } @@ -71,17 +71,11 @@ cp_vendor () REPO="Avancys v14 for Agofer" SRC=./vendor/ DEST=$DESTDIR/vendor/ - # Exclude proprietary modules and modules included in other repos: - EXCL="--exclude-from=rejected_vendor_modules.txt" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "Install $REPO into production directory structure" - echo "(selected modules)" echo " …from $SRC to $DEST" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - rsync $OPTIONS $EXCL $SRC $DEST - rsync $OPTIONS ./vendor_requirements.txt ${DEST}requirements.txt - echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - echo " [!] Remember to apply patches to the installed code" + rsync $OPTIONS $SRC $DEST echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" } @@ -92,7 +86,6 @@ cp_vendor01 () DEST=$DESTDIR/vendor01/ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "Install $REPO into production directory structure" - echo "(selected modules)" echo " …from $SRC to $DEST" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" rsync $OPTIONS $SRC $DEST diff --git a/patches/20211209_hr-avancys_delete-without-sql-in-holiday-book.patch b/patches/20211209_hr-avancys_delete-without-sql-in-holiday-book.patch deleted file mode 100644 index 950fa59..0000000 --- a/patches/20211209_hr-avancys_delete-without-sql-in-holiday-book.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/hr_avancys/models/hr_contract/hr_holiday_book.py b/hr_avancys/models/hr_contract/hr_holiday_book.py -index d1b36c9..5e843d0 100644 ---- a/hr_avancys/models/hr_contract/hr_holiday_book.py -+++ b/hr_avancys/models/hr_contract/hr_holiday_book.py -@@ -79,7 +79,9 @@ class HrHolidayBook(models.Model): - ) - - def delete_lines(self, contract_id): -- self._cr.execute("DELETE FROM hr_holiday_book WHERE contract_id = {id} and (manual = 'f' or manual is null)".format(id=contract_id.id)) -+ holiday_book_ids = contract_id.holiday_book_ids -+ holiday_book_ids = holiday_book_ids.filtered(lambda hb: hb.manual is not True) -+ holiday_book_ids.unlink() - - def check_date_for_work(self, contract_id, date): - days_work = list(set([int(x.dayofweek) for x in contract_id.resource_calendar_id.attendance_ids])) - diff --git a/patches/20211210_hr-avancys_fixes--payment-date-on-payslip.patch b/patches/20211210_hr-avancys_fixes--payment-date-on-payslip.patch deleted file mode 100644 index e0edd5b..0000000 --- a/patches/20211210_hr-avancys_fixes--payment-date-on-payslip.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/hr_avancys/models/hr_payslip/hr_payslip_processing.py b/hr_avancys/models/hr_payslip/hr_payslip_processing.py -index d19fdde..ce5402d 100644 ---- a/hr_avancys/models/hr_payslip/hr_payslip_processing.py -+++ b/hr_avancys/models/hr_payslip/hr_payslip_processing.py -@@ -151,7 +151,7 @@ class HrPayslipProcessing(models.Model): - 'contract_id': cnp[0], - 'employee_id': cnp[1], - 'liquidation_date': record.liquidation_date, -- 'accounting_date': record.accounting_date, -+ 'accounting_date': record.payment_date, - 'company_id': self.env.company.id, - 'period_id': record.period_id.id, - 'payslip_type_id': record.payslip_type_id.id, diff --git a/patches/20230713_account-avancys_adds-account-field.patch b/patches/20230713_account-avancys_adds-account-field.patch deleted file mode 100644 index 3df9387..0000000 --- a/patches/20230713_account-avancys_adds-account-field.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/account_avancys/wizards/account_financial_reports/account_financial_report_assistant_wizard.py b/account_avancys/wizards/account_financial_reports/account_financial_report_assistant_wizard.py -index aa6705b..b5ce435 100644 ---- a/account_avancys/wizards/account_financial_reports/account_financial_report_assistant_wizard.py -+++ b/account_avancys/wizards/account_financial_reports/account_financial_report_assistant_wizard.py -@@ -382,38 +382,40 @@ class AccountFinancialReportAssistantWizard(models.TransientModel): - ws.write(4,1,str(datetime.now())) - # EXCEL FIELDS - ws.write(6, 0, 'Fecha', bold2) -- ws.write(6, 1, 'Diario',bold2) -- ws.write(6, 2, 'Referencia', bold2) -- ws.write(6, 3, 'Tercero', bold2) -- ws.write(6, 4, 'Ref1',bold2) -- ws.write(6, 5, 'Asiento', bold2) -- ws.write(6, 6, 'Linea', bold2) -- ws.write(6, 7, 'Saldo Inicial', bold2) -- ws.write(6, 8, 'Debito', bold2) -- ws.write(6, 9, 'Credito', bold2) -- ws.write(6, 10, 'Saldo Final', bold2) -+ ws.write(6, 1, 'Cuenta',bold2) -+ ws.write(6, 2, 'Diario',bold2) -+ ws.write(6, 3, 'Referencia', bold2) -+ ws.write(6, 4, 'Tercero', bold2) -+ ws.write(6, 5, 'Ref1',bold2) -+ ws.write(6, 6, 'Asiento', bold2) -+ ws.write(6, 7, 'Linea', bold2) -+ ws.write(6, 8, 'Saldo Inicial', bold2) -+ ws.write(6, 9, 'Debito', bold2) -+ ws.write(6, 10, 'Credito', bold2) -+ ws.write(6, 11, 'Saldo Final', bold2) - row = 7 - col = 0 - # LINES - for line in report_lines: -- ws.merge_range(row, col, row, col + 5, line.get('code') + ' ' + line.get('name'),bold3) -- ws.write(row, col+7, line.get('amount_initial'),bold3) -- ws.write(row, col+8, line.get('debit'),bold3) -- ws.write(row, col+9, line.get('credit'),bold3) -- ws.write(row, col+10, line.get('balance'),bold3) -+ ws.merge_range(row, col, row, col + 6, line.get('code') + ' ' + line.get('name'),bold3) -+ ws.write(row, col+8, line.get('amount_initial'),bold3) -+ ws.write(row, col+9, line.get('debit'),bold3) -+ ws.write(row, col+10, line.get('credit'),bold3) -+ ws.write(row, col+11, line.get('balance'),bold3) - for move_line in line.get('move_lines'): - row+=1 - ws.write(row, col, str(move_line.get('ldate')),date_format) -- ws.write(row, col + 1, move_line.get('lcode')) -- ws.write(row, col + 2, move_line.get('ref_num')) -- ws.write(row, col + 3, move_line.get('partner_name')) -- ws.write(row, col + 4, move_line.get('lref')) -- ws.write(row, col + 5, move_line.get('move_name')) -- ws.write(row, col + 6, move_line.get('lname')) -- ws.write(row, col + 7, 0,money_format) -- ws.write(row, col + 8, move_line.get('debit'),money_format) -- ws.write(row, col + 9, move_line.get('credit'),money_format) -- ws.write(row, col + 10, move_line.get('balance'),money_format) -+ ws.write(row, col + 1, line.get('code') + ' ' + line.get('name')) -+ ws.write(row, col + 2, move_line.get('lcode')) -+ ws.write(row, col + 3, move_line.get('ref_num')) -+ ws.write(row, col + 4, move_line.get('partner_name')) -+ ws.write(row, col + 5, move_line.get('lref')) -+ ws.write(row, col + 6, move_line.get('move_name')) -+ ws.write(row, col + 7, move_line.get('lname')) -+ ws.write(row, col + 8, 0,money_format) -+ ws.write(row, col + 9, move_line.get('debit'),money_format) -+ ws.write(row, col + 10, move_line.get('credit'),money_format) -+ ws.write(row, col + 11, move_line.get('balance'),money_format) - row += 1 - # CLOSE IO AND GENERATE FILE - wb.close() -@@ -445,4 +447,4 @@ class AccountFinancialReportAssistantWizard(models.TransientModel): - return ( - self.env["ir.actions.report"].search([("report_name", "=", 'account_avancys.report_assistant_pdf'), - ("report_type", "=", 'qweb-pdf')],limit=1,).report_action(self, data=data) -- ) -\ No newline at end of file -+ ) diff --git a/rejected_vendor_modules.txt b/rejected_vendor_modules.txt deleted file mode 100644 index a595d75..0000000 --- a/rejected_vendor_modules.txt +++ /dev/null @@ -1,6 +0,0 @@ -electronic_invoice_dian -account_accountant -mail_enterprise -web_mobile -hr_avancys_backup -hr_avancys_new diff --git a/update_from_repo.sh b/update_from_repo.sh index b378192..dc70dce 100755 --- a/update_from_repo.sh +++ b/update_from_repo.sh @@ -5,12 +5,12 @@ Help () { - echo "Usage: $0 [-h] -o={all|core|community|vendor|custom}" + echo "Usage: $0 [-h] -o={all|core|community|vendor|vendor01|custom}" echo echo "Options:" echo "-h Help (display this text)" echo "-o Repositories to be updated (one of 'all', 'core', 'community'," - echo " 'vendor', 'custom'). Required." + echo " 'vendor', 'vendor01', 'custom'). Required." echo } @@ -59,7 +59,7 @@ gt_community () gt_vendor () { REPO="Avancys v14 for Agofer" - SRC=git@gitlab.com:mgarcia.avancys/v14_avancys_agofer.git + SRC=ssh://git@gitea.agofer.net:22001/Agofer/vendor.git DEST=./vendor/ OPTIONS="" if [ ! -d "$DEST" ]; then @@ -123,8 +123,8 @@ gt_all () { gt_core # Download from Odoo core repo gt_community # OCA modules repo, using git submodules - gt_vendor # Avancys main repo - gt_vendor01 # In-house replacement repo for removed Avancys modules + gt_vendor # Local replacement repo for Avancys main modules + gt_vendor01 # Local replacement repo for removed Avancys modules gt_custom # Custom in-house modules } @@ -160,7 +160,7 @@ case $Modules in 'community') # Download from repo OCA modules gt_community exit;; - 'vendor') # Download from repo Avancys modules + 'vendor') # Download local copy of Avancys modules gt_vendor exit;; 'vendor01') # Download original e-invoice Avancys modules diff --git a/vendor_requirements.txt b/vendor_requirements.txt deleted file mode 100644 index 9711af5..0000000 --- a/vendor_requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -pyopenssl==17.5.0 -cryptography==3.4.8 -xmlsig==0.1.5 -xades==0.2.1 -pg-xades==0.0.7