-
- Downloads
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Conflicts: htdocs/admin/system/perf.php
Showing
- ChangeLog 9 additions, 1 deletionChangeLog
- dev/initdata/generate-commande.php 1 addition, 1 deletiondev/initdata/generate-commande.php
- dev/initdata/generate-facture.php 6 additions, 2 deletionsdev/initdata/generate-facture.php
- dev/initdata/generate-propale.php 3 additions, 1 deletiondev/initdata/generate-propale.php
- htdocs/.gitignore 5 additions, 3 deletionshtdocs/.gitignore
- htdocs/adherents/card_subscriptions.php 2 additions, 2 deletionshtdocs/adherents/card_subscriptions.php
- htdocs/adherents/cotisations.php 2 additions, 0 deletionshtdocs/adherents/cotisations.php
- htdocs/admin/pdf.php 2 additions, 2 deletionshtdocs/admin/pdf.php
- htdocs/admin/system/perf.php 23 additions, 2 deletionshtdocs/admin/system/perf.php
- htdocs/comm/propal.php 0 additions, 1 deletionhtdocs/comm/propal.php
- htdocs/comm/propal/class/propal.class.php 2 additions, 4 deletionshtdocs/comm/propal/class/propal.class.php
- htdocs/commande/class/commande.class.php 3 additions, 3 deletionshtdocs/commande/class/commande.class.php
- htdocs/commande/fiche.php 0 additions, 2 deletionshtdocs/commande/fiche.php
- htdocs/commande/orderstoinvoice.php 1 addition, 2 deletionshtdocs/commande/orderstoinvoice.php
- htdocs/compta/facture.php 2 additions, 5 deletionshtdocs/compta/facture.php
- htdocs/compta/facture/class/facture-rec.class.php 3 additions, 3 deletionshtdocs/compta/facture/class/facture-rec.class.php
- htdocs/compta/facture/class/facture.class.php 3 additions, 4 deletionshtdocs/compta/facture/class/facture.class.php
- htdocs/core/class/hookmanager.class.php 1 addition, 1 deletionhtdocs/core/class/hookmanager.class.php
- htdocs/core/class/html.formfile.class.php 44 additions, 33 deletionshtdocs/core/class/html.formfile.class.php
- htdocs/core/tpl/passwordforgotten.tpl.php 3 additions, 3 deletionshtdocs/core/tpl/passwordforgotten.tpl.php
Loading
Please register or sign in to comment