-
- Downloads
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php
No related branches found
No related tags found
Showing
- htdocs/accountancy/admin/card.php 13 additions, 11 deletionshtdocs/accountancy/admin/card.php
- htdocs/accountancy/admin/export.php 3 additions, 0 deletionshtdocs/accountancy/admin/export.php
- htdocs/accountancy/admin/index.php 26 additions, 0 deletionshtdocs/accountancy/admin/index.php
- htdocs/accountancy/class/accountancyexport.class.php 4 additions, 0 deletionshtdocs/accountancy/class/accountancyexport.class.php
- htdocs/accountancy/customer/index.php 28 additions, 35 deletionshtdocs/accountancy/customer/index.php
- htdocs/accountancy/customer/list.php 2 additions, 1 deletionhtdocs/accountancy/customer/list.php
- htdocs/accountancy/journal/purchasesjournal.php 2 additions, 2 deletionshtdocs/accountancy/journal/purchasesjournal.php
- htdocs/accountancy/journal/sellsjournal.php 1 addition, 1 deletionhtdocs/accountancy/journal/sellsjournal.php
- htdocs/accountancy/supplier/index.php 46 additions, 105 deletionshtdocs/accountancy/supplier/index.php
- htdocs/adherents/list.php 7 additions, 7 deletionshtdocs/adherents/list.php
- htdocs/admin/ihm.php 2 additions, 2 deletionshtdocs/admin/ihm.php
- htdocs/categories/card.php 3 additions, 2 deletionshtdocs/categories/card.php
- htdocs/categories/viewcat.php 2 additions, 1 deletionhtdocs/categories/viewcat.php
- htdocs/comm/propal/card.php 19 additions, 17 deletionshtdocs/comm/propal/card.php
- htdocs/commande/card.php 47 additions, 22 deletionshtdocs/commande/card.php
- htdocs/compta/bank/account.php 5 additions, 10 deletionshtdocs/compta/bank/account.php
- htdocs/compta/bank/card.php 5 additions, 1 deletionhtdocs/compta/bank/card.php
- htdocs/compta/charges/index.php 25 additions, 2 deletionshtdocs/compta/charges/index.php
- htdocs/compta/facture.php 71 additions, 46 deletionshtdocs/compta/facture.php
- htdocs/compta/facture/fiche-rec.php 26 additions, 190 deletionshtdocs/compta/facture/fiche-rec.php
Loading
Please register or sign in to comment