Merge remote-tracking branch 'origin/3.9' into develop
Conflicts: htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php htdocs/commande/orderstoinvoice.php htdocs/public/demo/index.php htdocs/societe/commerciaux.php
No related branches found
No related tags found
Showing
- htdocs/accountancy/customer/list.php 2 additions, 3 deletionshtdocs/accountancy/customer/list.php
- htdocs/commande/orderstoinvoice.php 4 additions, 2 deletionshtdocs/commande/orderstoinvoice.php
- htdocs/compta/bank/card.php 1 addition, 1 deletionhtdocs/compta/bank/card.php
- htdocs/compta/bank/class/account.class.php 28 additions, 0 deletionshtdocs/compta/bank/class/account.class.php
- htdocs/core/lib/admin.lib.php 12 additions, 8 deletionshtdocs/core/lib/admin.lib.php
- htdocs/fourn/facture/card.php 0 additions, 6 deletionshtdocs/fourn/facture/card.php
- htdocs/holiday/card.php 73 additions, 85 deletionshtdocs/holiday/card.php
- htdocs/holiday/class/holiday.class.php 43 additions, 17 deletionshtdocs/holiday/class/holiday.class.php
- htdocs/holiday/define_holiday.php 15 additions, 14 deletionshtdocs/holiday/define_holiday.php
- htdocs/holiday/list.php 7 additions, 7 deletionshtdocs/holiday/list.php
- htdocs/index.php 5 additions, 1 deletionhtdocs/index.php
- htdocs/install/mysql/migration/3.8.0-3.9.0.sql 1 addition, 0 deletionshtdocs/install/mysql/migration/3.8.0-3.9.0.sql
- htdocs/install/mysql/tables/llx_holiday.key.sql 3 additions, 1 deletionhtdocs/install/mysql/tables/llx_holiday.key.sql
- htdocs/langs/en_US/admin.lang 2 additions, 0 deletionshtdocs/langs/en_US/admin.lang
- htdocs/langs/fr_FR/admin.lang 2 additions, 1 deletionhtdocs/langs/fr_FR/admin.lang
- htdocs/public/demo/index.php 11 additions, 0 deletionshtdocs/public/demo/index.php
- htdocs/societe/commerciaux.php 22 additions, 17 deletionshtdocs/societe/commerciaux.php
Loading
Please register or sign in to comment