diff --git a/apply_patches.sh b/apply_patches.sh index 5e28692..8e8aaeb 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -98,6 +98,8 @@ pt_community () echo " Patch OCA modules" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + # Note: git apply has issues with submodules. Use patch command instead. + DEST=$DESTDIR/community/base_location/ OPTIONS="--directory=$DEST --strip=1" patch $OPTIONS < patches/20210821_base-location_no-zip-from-city.patch @@ -106,14 +108,9 @@ pt_community () OPTIONS="--directory=$DEST --strip=1" patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch - SRC=$PWD - DEST=$DESTDIR/community/ - OPTIONS="-p1 --verbose" - - pushd $DEST - git apply $OPTIONS $SRC/patches/20211216_account-invoice-force-number_post-instead-of-action.patch - popd - + DEST=$DESTDIR/community/account_invoice_force_number/ + OPTIONS="--directory=$DEST --strip=1" + patch $OPTIONS < patches/20211216_account-invoice-force-number_post-instead-of-action.patch } pt_all ()