-
- Downloads
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts: htdocs/projet/tasks/task.php
Showing
- ChangeLog 3 additions, 2 deletionsChangeLog
- htdocs/accountancy/customer/index.php 15 additions, 20 deletionshtdocs/accountancy/customer/index.php
- htdocs/admin/commande.php 1 addition, 1 deletionhtdocs/admin/commande.php
- htdocs/admin/facture.php 1 addition, 1 deletionhtdocs/admin/facture.php
- htdocs/admin/mailman.php 2 additions, 1 deletionhtdocs/admin/mailman.php
- htdocs/admin/order_extrafields.php 1 addition, 1 deletionhtdocs/admin/order_extrafields.php
- htdocs/admin/orderdet_extrafields.php 1 addition, 1 deletionhtdocs/admin/orderdet_extrafields.php
- htdocs/admin/propal.php 2 additions, 2 deletionshtdocs/admin/propal.php
- htdocs/admin/spip.php 2 additions, 1 deletionhtdocs/admin/spip.php
- htdocs/admin/supplier_invoice.php 1 addition, 1 deletionhtdocs/admin/supplier_invoice.php
- htdocs/admin/supplier_order.php 1 addition, 1 deletionhtdocs/admin/supplier_order.php
- htdocs/admin/supplierinvoice_extrafields.php 1 addition, 1 deletionhtdocs/admin/supplierinvoice_extrafields.php
- htdocs/admin/supplierorder_extrafields.php 1 addition, 1 deletionhtdocs/admin/supplierorder_extrafields.php
- htdocs/barcode/printsheet.php 2 additions, 2 deletionshtdocs/barcode/printsheet.php
- htdocs/bookmarks/card.php 13 additions, 2 deletionshtdocs/bookmarks/card.php
- htdocs/cashdesk/include/keypad.php 3 additions, 1 deletionhtdocs/cashdesk/include/keypad.php
- htdocs/comm/admin/propal_extrafields.php 1 addition, 1 deletionhtdocs/comm/admin/propal_extrafields.php
- htdocs/comm/admin/propaldet_extrafields.php 1 addition, 1 deletionhtdocs/comm/admin/propaldet_extrafields.php
- htdocs/comm/propal.php 2 additions, 0 deletionshtdocs/comm/propal.php
- htdocs/commande/card.php 3 additions, 9 deletionshtdocs/commande/card.php
Loading
Please register or sign in to comment