diff --git a/apply_patches.sh b/apply_patches.sh index 490277a..7ffbbd1 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -39,17 +39,13 @@ pt_vendor () echo " Patch vendor modules" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - 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/vendor/ OPTIONS="-p1 --verbose" pushd $DEST - #git apply $OPTIONS $SRC/patches/20211209_hr-avancys_delete-without-sql-in-holiday-book.patch + # Included upstream: + # git apply $OPTIONS $SRC/patches/20211209_hr-avancys_delete-without-sql-in-holiday-book.patch git apply $OPTIONS $SRC/patches/20211210_hr-avancys_fixes--payment-date-on-payslip.patch popd @@ -61,6 +57,11 @@ pt_special () echo " Patch special electronic invoice 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/v14-electronic-documents/ OPTIONS="-p1 --verbose"