Merge remote-tracking branch 'origin/3.4' into develop
Conflicts: ChangeLog htdocs/adherents/admin/adherent.php htdocs/comm/propal/class/propal.class.php htdocs/commande/document.php htdocs/compta/facture/class/facture.class.php htdocs/compta/facture/list.php htdocs/cron/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/commande/document.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cron.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/nl_NL/categories.lang htdocs/langs/nl_NL/commercial.lang htdocs/langs/nl_NL/companies.lang htdocs/langs/nl_NL/dict.lang htdocs/langs/nl_NL/main.lang htdocs/langs/nl_NL/margins.lang htdocs/langs/nl_NL/products.lang htdocs/societe/class/societe.class.php htdocs/societe/rib.php
No related branches found
No related tags found
Showing
- ChangeLog 5 additions, 0 deletionsChangeLog
- build/debian/changelog 14 additions, 0 deletionsbuild/debian/changelog
- htdocs/adherents/admin/adherent.php 2 additions, 2 deletionshtdocs/adherents/admin/adherent.php
- htdocs/comm/propal/class/propal.class.php 10 additions, 10 deletionshtdocs/comm/propal/class/propal.class.php
- htdocs/comm/propal/document.php 1 addition, 1 deletionhtdocs/comm/propal/document.php
- htdocs/commande/class/commande.class.php 1 addition, 1 deletionhtdocs/commande/class/commande.class.php
- htdocs/commande/document.php 1 addition, 1 deletionhtdocs/commande/document.php
- htdocs/compta/prelevement/bons.php 1 addition, 1 deletionhtdocs/compta/prelevement/bons.php
- htdocs/compta/prelevement/factures.php 2 additions, 2 deletionshtdocs/compta/prelevement/factures.php
- htdocs/compta/prelevement/fiche-rejet.php 2 additions, 2 deletionshtdocs/compta/prelevement/fiche-rejet.php
- htdocs/compta/prelevement/fiche-stat.php 2 additions, 2 deletionshtdocs/compta/prelevement/fiche-stat.php
- htdocs/compta/prelevement/fiche.php 2 additions, 2 deletionshtdocs/compta/prelevement/fiche.php
- htdocs/compta/prelevement/ligne.php 1 addition, 1 deletionhtdocs/compta/prelevement/ligne.php
- htdocs/compta/prelevement/lignes.php 2 additions, 2 deletionshtdocs/compta/prelevement/lignes.php
- htdocs/compta/prelevement/liste.php 1 addition, 1 deletionhtdocs/compta/prelevement/liste.php
- htdocs/cron/card.php 8 additions, 7 deletionshtdocs/cron/card.php
- htdocs/fourn/class/fournisseur.commande.class.php 8 additions, 8 deletionshtdocs/fourn/class/fournisseur.commande.class.php
- htdocs/fourn/class/fournisseur.product.class.php 2 additions, 2 deletionshtdocs/fourn/class/fournisseur.product.class.php
- htdocs/fourn/commande/document.php 1 addition, 1 deletionhtdocs/fourn/commande/document.php
- htdocs/fourn/facture/paiement.php 1 addition, 1 deletionhtdocs/fourn/facture/paiement.php
Loading
Please register or sign in to comment