Merge remote-tracking branch 'Upstream/develop' into develop-32
Conflicts: htdocs/expensereport/card.php
No related branches found
No related tags found
Showing
- ChangeLog 1 addition, 0 deletionsChangeLog
- dev/skeletons/skeleton_page.php 134 additions, 90 deletionsdev/skeletons/skeleton_page.php
- htdocs/api/admin/api.php 30 additions, 51 deletionshtdocs/api/admin/api.php
- htdocs/api/class/api.class.php 3 additions, 1 deletionhtdocs/api/class/api.class.php
- htdocs/api/class/api_access.class.php 2 additions, 2 deletionshtdocs/api/class/api_access.class.php
- htdocs/categories/categorie.php 6 additions, 0 deletionshtdocs/categories/categorie.php
- htdocs/comm/action/card.php 49 additions, 5 deletionshtdocs/comm/action/card.php
- htdocs/comm/action/class/actioncomm.class.php 61 additions, 0 deletionshtdocs/comm/action/class/actioncomm.class.php
- htdocs/comm/card.php 6 additions, 0 deletionshtdocs/comm/card.php
- htdocs/comm/list.php 17 additions, 8 deletionshtdocs/comm/list.php
- htdocs/comm/prospect/list.php 12 additions, 2 deletionshtdocs/comm/prospect/list.php
- htdocs/core/class/commondocgenerator.class.php 2 additions, 0 deletionshtdocs/core/class/commondocgenerator.class.php
- htdocs/core/class/html.formprojet.class.php 87 additions, 23 deletionshtdocs/core/class/html.formprojet.class.php
- htdocs/core/lib/pdf.lib.php 28 additions, 0 deletionshtdocs/core/lib/pdf.lib.php
- htdocs/core/modules/commande/doc/pdf_einstein.modules.php 9 additions, 11 deletionshtdocs/core/modules/commande/doc/pdf_einstein.modules.php
- htdocs/core/modules/commande/doc/pdf_proforma.modules.php 9 additions, 11 deletionshtdocs/core/modules/commande/doc/pdf_proforma.modules.php
- htdocs/core/modules/contract/doc/pdf_strato.modules.php 9 additions, 9 deletionshtdocs/core/modules/contract/doc/pdf_strato.modules.php
- htdocs/core/modules/expedition/doc/pdf_merou.modules.php 10 additions, 12 deletionshtdocs/core/modules/expedition/doc/pdf_merou.modules.php
- htdocs/core/modules/expedition/doc/pdf_rouget.modules.php 9 additions, 12 deletionshtdocs/core/modules/expedition/doc/pdf_rouget.modules.php
- htdocs/core/modules/facture/doc/pdf_crabe.modules.php 9 additions, 11 deletionshtdocs/core/modules/facture/doc/pdf_crabe.modules.php
Loading
Please register or sign in to comment