Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

1f48e048

Commit 1f48e048 authored 8 years ago by Maxime Kohlhaas

Downloads
- Plain Diff

Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug

parents 6474591e 2dda1d7c

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/modules.php 3 additions, 3 deletions

htdocs/admin/modules.php
htdocs/compta/sociales/card.php 2 additions, 2 deletions

htdocs/compta/sociales/card.php
htdocs/compta/sociales/class/chargesociales.class.php 25 additions, 14 deletions

htdocs/compta/sociales/class/chargesociales.class.php
htdocs/core/class/html.form.class.php 1 addition, 1 deletion

htdocs/core/class/html.form.class.php
htdocs/core/lib/fichinter.lib.php 9 additions, 6 deletions

htdocs/core/lib/fichinter.lib.php
htdocs/core/lib/files.lib.php 2 additions, 2 deletions

htdocs/core/lib/files.lib.php
htdocs/fichinter/card.php 1 addition, 1 deletion

htdocs/fichinter/card.php
htdocs/fichinter/contact.php 4 additions, 1 deletion

htdocs/fichinter/contact.php
htdocs/langs/fr_FR/accountancy.lang 1 addition, 1 deletion

htdocs/langs/fr_FR/accountancy.lang
htdocs/loan/class/paymentloan.class.php 3 additions, 3 deletions

htdocs/loan/class/paymentloan.class.php
htdocs/loan/payment/payment.php 2 additions, 2 deletions

htdocs/loan/payment/payment.php
htdocs/product/class/api_products.class.php 15 additions, 0 deletions

htdocs/product/class/api_products.class.php
htdocs/product/list.php 2 additions, 2 deletions

htdocs/product/list.php
htdocs/product/stock/product.php 1 addition, 1 deletion

htdocs/product/stock/product.php

with 71 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment