Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql
No related branches found
No related tags found
Showing
- htdocs/commande/class/commande.class.php 6 additions, 4 deletionshtdocs/commande/class/commande.class.php
- htdocs/compta/bank/class/account.class.php 1 addition, 1 deletionhtdocs/compta/bank/class/account.class.php
- htdocs/compta/facture/class/facture-rec.class.php 83 additions, 15 deletionshtdocs/compta/facture/class/facture-rec.class.php
- htdocs/compta/facture/fiche-rec.php 18 additions, 2 deletionshtdocs/compta/facture/fiche-rec.php
- htdocs/core/class/html.form.class.php 2 additions, 2 deletionshtdocs/core/class/html.form.class.php
- htdocs/core/class/html.formfile.class.php 6 additions, 5 deletionshtdocs/core/class/html.formfile.class.php
- htdocs/core/class/translate.class.php 1 addition, 1 deletionhtdocs/core/class/translate.class.php
- htdocs/core/lib/functions.lib.php 3 additions, 2 deletionshtdocs/core/lib/functions.lib.php
- htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php 1 addition, 1 deletionhtdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
- htdocs/install/mysql/migration/4.0.0-5.0.0.sql 3 additions, 0 deletionshtdocs/install/mysql/migration/4.0.0-5.0.0.sql
- htdocs/install/mysql/tables/llx_bank_account.sql 2 additions, 1 deletionhtdocs/install/mysql/tables/llx_bank_account.sql
- htdocs/install/mysql/tables/llx_facturedet_rec.sql 1 addition, 0 deletionshtdocs/install/mysql/tables/llx_facturedet_rec.sql
- htdocs/product/class/product.class.php 1 addition, 1 deletionhtdocs/product/class/product.class.php
- htdocs/public/cron/cron_run_jobs.php 1 addition, 1 deletionhtdocs/public/cron/cron_run_jobs.php
- htdocs/societe/rib.php 3 additions, 3 deletionshtdocs/societe/rib.php
Loading
Please register or sign in to comment