Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop Conflicts: htdocs/comm/propal/class/propal.class.php
No related branches found
No related tags found
Showing
- htdocs/adherents/admin/adherent_extrafields.php 1 addition, 1 deletionhtdocs/adherents/admin/adherent_extrafields.php
- htdocs/adherents/admin/adherent_type_extrafields.php 1 addition, 1 deletionhtdocs/adherents/admin/adherent_type_extrafields.php
- htdocs/adherents/card_subscriptions.php 0 additions, 2 deletionshtdocs/adherents/card_subscriptions.php
- htdocs/adherents/class/adherent.class.php 9 additions, 0 deletionshtdocs/adherents/class/adherent.class.php
- htdocs/adherents/class/adherent_type.class.php 1 addition, 0 deletionshtdocs/adherents/class/adherent_type.class.php
- htdocs/adherents/fiche.php 1 addition, 1 deletionhtdocs/adherents/fiche.php
- htdocs/admin/agenda_extrafields.php 1 addition, 1 deletionhtdocs/admin/agenda_extrafields.php
- htdocs/admin/order_extrafields.php 1 addition, 1 deletionhtdocs/admin/order_extrafields.php
- htdocs/admin/pdf.php 50 additions, 43 deletionshtdocs/admin/pdf.php
- htdocs/admin/supplierinvoice_extrafields.php 1 addition, 1 deletionhtdocs/admin/supplierinvoice_extrafields.php
- htdocs/admin/supplierorder_extrafields.php 1 addition, 1 deletionhtdocs/admin/supplierorder_extrafields.php
- htdocs/comm/action/class/actioncomm.class.php 1 addition, 1 deletionhtdocs/comm/action/class/actioncomm.class.php
- htdocs/comm/action/document.php 2 additions, 0 deletionshtdocs/comm/action/document.php
- htdocs/comm/action/fiche.php 2 additions, 2 deletionshtdocs/comm/action/fiche.php
- htdocs/comm/action/info.php 5 additions, 2 deletionshtdocs/comm/action/info.php
- htdocs/comm/admin/propal_extrafields.php 1 addition, 1 deletionhtdocs/comm/admin/propal_extrafields.php
- htdocs/comm/mailing/fiche.php 1 addition, 1 deletionhtdocs/comm/mailing/fiche.php
- htdocs/comm/propal.php 2 additions, 2 deletionshtdocs/comm/propal.php
- htdocs/comm/propal/class/propal.class.php 27 additions, 7 deletionshtdocs/comm/propal/class/propal.class.php
- htdocs/commande/class/commande.class.php 23 additions, 0 deletionshtdocs/commande/class/commande.class.php
Loading
Please register or sign in to comment