jegomez/odoo14-dev-environment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ADD] Removes patches included upstream

Browse Source
This commit is contained in:
Jorge Enrique Gómez Gómez 2021-12-21 16:23:36 -05:00
parent 1765d2eb15
commit 52dc0ef51e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apply_patches.sh
View File

@ -39,17 +39,13 @@ pt_vendor ()
echo " Patch vendor modules" echo " Patch vendor modules"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" 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 SRC=$PWD
DEST=$DESTDIR/vendor/ DEST=$DESTDIR/vendor/
OPTIONS="-p1 --verbose" OPTIONS="-p1 --verbose"
pushd $DEST 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 git apply $OPTIONS $SRC/patches/20211210_hr-avancys_fixes--payment-date-on-payslip.patch
popd popd
@ -61,6 +57,11 @@ pt_special ()
echo " Patch special electronic invoice modules" echo " Patch special electronic invoice modules"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" 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 SRC=$PWD
DEST=$DESTDIR/v14-electronic-documents/ DEST=$DESTDIR/v14-electronic-documents/
OPTIONS="-p1 --verbose" OPTIONS="-p1 --verbose"