-
- Downloads
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts: htdocs/main.inc.php
Showing
- ChangeLog 4 additions, 1 deletionChangeLog
- htdocs/admin/propal.php 45 additions, 0 deletionshtdocs/admin/propal.php
- htdocs/comm/propal.php 6 additions, 4 deletionshtdocs/comm/propal.php
- htdocs/comm/propal/class/propal.class.php 18 additions, 2 deletionshtdocs/comm/propal/class/propal.class.php
- htdocs/commande/card.php 26 additions, 20 deletionshtdocs/commande/card.php
- htdocs/commande/class/commande.class.php 18 additions, 2 deletionshtdocs/commande/class/commande.class.php
- htdocs/compta/facture/class/facture.class.php 17 additions, 1 deletionhtdocs/compta/facture/class/facture.class.php
- htdocs/compta/index.php 2 additions, 2 deletionshtdocs/compta/index.php
- htdocs/contrat/class/contrat.class.php 0 additions, 35 deletionshtdocs/contrat/class/contrat.class.php
- htdocs/core/boxes/box_graph_invoices_permonth.php 2 additions, 2 deletionshtdocs/core/boxes/box_graph_invoices_permonth.php
- htdocs/core/boxes/box_graph_invoices_supplier_permonth.php 2 additions, 2 deletionshtdocs/core/boxes/box_graph_invoices_supplier_permonth.php
- htdocs/core/boxes/box_graph_orders_permonth.php 2 additions, 2 deletionshtdocs/core/boxes/box_graph_orders_permonth.php
- htdocs/core/boxes/box_graph_orders_supplier_permonth.php 2 additions, 2 deletionshtdocs/core/boxes/box_graph_orders_supplier_permonth.php
- htdocs/core/boxes/box_graph_propales_permonth.php 2 additions, 2 deletionshtdocs/core/boxes/box_graph_propales_permonth.php
- htdocs/core/class/html.form.class.php 1 addition, 1 deletionhtdocs/core/class/html.form.class.php
- htdocs/core/lib/functions.lib.php 6 additions, 5 deletionshtdocs/core/lib/functions.lib.php
- htdocs/core/lib/pdf.lib.php 4 additions, 1 deletionhtdocs/core/lib/pdf.lib.php
- htdocs/core/modules/commande/doc/pdf_einstein.modules.php 1 addition, 1 deletionhtdocs/core/modules/commande/doc/pdf_einstein.modules.php
- htdocs/core/modules/commande/doc/pdf_proforma.modules.php 1 addition, 1 deletionhtdocs/core/modules/commande/doc/pdf_proforma.modules.php
- htdocs/core/modules/contract/doc/pdf_strato.modules.php 1 addition, 1 deletionhtdocs/core/modules/contract/doc/pdf_strato.modules.php
Loading
Please register or sign in to comment