-
- Downloads
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/commande/class/api_commande.class.php htdocs/compta/facture/class/api_invoice.class.php htdocs/product/class/api_product.class.php htdocs/societe/class/api_contact.class.php htdocs/societe/class/api_thirdparty.class.php
Showing
- README-FR.md 4 additions, 4 deletionsREADME-FR.md
- README.md 4 additions, 4 deletionsREADME.md
- htdocs/commande/class/api_deprecated_commande.class.php 1 addition, 0 deletionshtdocs/commande/class/api_deprecated_commande.class.php
- htdocs/commande/orderstoinvoice.php 1 addition, 1 deletionhtdocs/commande/orderstoinvoice.php
- htdocs/compta/facture/class/api_deprecated_invoice.class.php 1 addition, 0 deletionshtdocs/compta/facture/class/api_deprecated_invoice.class.php
- htdocs/compta/facture/list.php 1 addition, 1 deletionhtdocs/compta/facture/list.php
- htdocs/contact/class/contact.class.php 24 additions, 1 deletionhtdocs/contact/class/contact.class.php
- htdocs/contact/perso.php 11 additions, 6 deletionshtdocs/contact/perso.php
- htdocs/contrat/list.php 1 addition, 1 deletionhtdocs/contrat/list.php
- htdocs/core/class/dolgraph.class.php 1 addition, 1 deletionhtdocs/core/class/dolgraph.class.php
- htdocs/core/js/timesheet.js 9 additions, 3 deletionshtdocs/core/js/timesheet.js
- htdocs/core/lib/functions.lib.php 16 additions, 3 deletionshtdocs/core/lib/functions.lib.php
- htdocs/fourn/facture/card.php 1 addition, 1 deletionhtdocs/fourn/facture/card.php
- htdocs/fourn/facture/paiement.php 3 additions, 3 deletionshtdocs/fourn/facture/paiement.php
- htdocs/product/class/api_deprecated_product.class.php 2 additions, 0 deletionshtdocs/product/class/api_deprecated_product.class.php
- htdocs/product/reassort.php 3 additions, 3 deletionshtdocs/product/reassort.php
- htdocs/product/stock/replenish.php 32 additions, 18 deletionshtdocs/product/stock/replenish.php
- htdocs/resource/class/dolresource.class.php 1 addition, 1 deletionhtdocs/resource/class/dolresource.class.php
- htdocs/resource/list.php 14 additions, 13 deletionshtdocs/resource/list.php
- htdocs/societe/class/api_deprecated_contact.class.php 3 additions, 1 deletionhtdocs/societe/class/api_deprecated_contact.class.php
Loading
Please register or sign in to comment