-
- Downloads
Merge remote-tracking branch 'origin/develop' into 3.8
Conflicts: htdocs/expedition/class/expedition.class.php
Showing
- ChangeLog 1 addition, 1 deletionChangeLog
- build/debian/README.howto 5 additions, 5 deletionsbuild/debian/README.howto
- htdocs/admin/tools/listevents.php 3 additions, 4 deletionshtdocs/admin/tools/listevents.php
- htdocs/comm/askpricesupplier/index.php 2 additions, 2 deletionshtdocs/comm/askpricesupplier/index.php
- htdocs/comm/mailing/list.php 3 additions, 4 deletionshtdocs/comm/mailing/list.php
- htdocs/comm/propal/index.php 2 additions, 2 deletionshtdocs/comm/propal/index.php
- htdocs/comm/prospect/index.php 2 additions, 2 deletionshtdocs/comm/prospect/index.php
- htdocs/commande/index.php 2 additions, 2 deletionshtdocs/commande/index.php
- htdocs/compta/bank/categ.php 1 addition, 4 deletionshtdocs/compta/bank/categ.php
- htdocs/compta/bank/ligne.php 6 additions, 8 deletionshtdocs/compta/bank/ligne.php
- htdocs/compta/facture/mergepdftool.php 1 addition, 1 deletionhtdocs/compta/facture/mergepdftool.php
- htdocs/contact/list.php 1 addition, 1 deletionhtdocs/contact/list.php
- htdocs/contrat/services.php 4 additions, 6 deletionshtdocs/contrat/services.php
- htdocs/core/boxes/box_contacts.php 1 addition, 1 deletionhtdocs/core/boxes/box_contacts.php
- htdocs/core/class/html.formother.class.php 5 additions, 4 deletionshtdocs/core/class/html.formother.class.php
- htdocs/core/lib/functions.lib.php 1 addition, 1 deletionhtdocs/core/lib/functions.lib.php
- htdocs/core/lib/project.lib.php 2 additions, 3 deletionshtdocs/core/lib/project.lib.php
- htdocs/core/modules/project/doc/pdf_baleine.modules.php 6 additions, 1 deletionhtdocs/core/modules/project/doc/pdf_baleine.modules.php
- htdocs/core/modules/project/doc/pdf_beluga.modules.php 211 additions, 228 deletionshtdocs/core/modules/project/doc/pdf_beluga.modules.php
- htdocs/core/tpl/objectline_edit.tpl.php 6 additions, 4 deletionshtdocs/core/tpl/objectline_edit.tpl.php
Loading
Please register or sign in to comment