-
- Downloads
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts: ChangeLog htdocs/compta/bank/virement.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/card.php htdocs/societe/soc.php
No related branches found
No related tags found
Showing
- ChangeLog 11 additions, 0 deletionsChangeLog
- htdocs/cashdesk/facturation_dhtml.php 12 additions, 5 deletionshtdocs/cashdesk/facturation_dhtml.php
- htdocs/cashdesk/javascript/dhtml.js 4 additions, 3 deletionshtdocs/cashdesk/javascript/dhtml.js
- htdocs/cashdesk/tpl/facturation1.tpl.php 3 additions, 2 deletionshtdocs/cashdesk/tpl/facturation1.tpl.php
- htdocs/categories/card.php 4 additions, 0 deletionshtdocs/categories/card.php
- htdocs/categories/edit.php 3 additions, 0 deletionshtdocs/categories/edit.php
- htdocs/categories/viewcat.php 3 additions, 0 deletionshtdocs/categories/viewcat.php
- htdocs/compta/bank/virement.php 2 additions, 2 deletionshtdocs/compta/bank/virement.php
- htdocs/compta/localtax/clients.php 1 addition, 1 deletionhtdocs/compta/localtax/clients.php
- htdocs/compta/localtax/quadri_detail.php 2 additions, 2 deletionshtdocs/compta/localtax/quadri_detail.php
- htdocs/core/lib/functions.lib.php 1 addition, 1 deletionhtdocs/core/lib/functions.lib.php
- htdocs/core/lib/report.lib.php 2 additions, 2 deletionshtdocs/core/lib/report.lib.php
- htdocs/core/tpl/objectline_create.tpl.php 1 addition, 1 deletionhtdocs/core/tpl/objectline_create.tpl.php
- htdocs/core/tpl/objectline_edit.tpl.php 4 additions, 4 deletionshtdocs/core/tpl/objectline_edit.tpl.php
- htdocs/main.inc.php 1 addition, 1 deletionhtdocs/main.inc.php
- htdocs/product/card.php 8 additions, 3 deletionshtdocs/product/card.php
- htdocs/product/list.php 2 additions, 2 deletionshtdocs/product/list.php
- htdocs/product/price.php 2 additions, 3 deletionshtdocs/product/price.php
- htdocs/societe/soc.php 1 addition, 1 deletionhtdocs/societe/soc.php
Loading
Please register or sign in to comment