Laurent Destailleur 2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php

2015-07-19 12:26:31 +02:00

..

bank

Merge remote-tracking branch 'origin/3.7' into develop

2015-07-19 12:26:31 +02:00

charges

Fix: print_liste_field_titre('');

2015-06-26 06:23:29 +02:00

deplacement

Fix bad parameters of function select_date

2015-07-12 12:50:24 +02:00

facture

Merge remote-tracking branch 'origin/3.7' into develop

2015-07-19 12:26:31 +02:00

journal

Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT

2015-06-25 06:37:26 +02:00

localtax

Merge remote-tracking branch 'origin/3.7' into develop

2015-06-14 17:18:45 +02:00

paiement

Fix: #3242 [Dashboard] Checks waiting for deposit bad main menu

2015-07-17 05:39:08 +02:00

payment_sc

Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into

2014-09-23 00:02:19 +02:00

prelevement

Merge remote-tracking branch 'origin/3.7' into develop

2015-07-19 12:26:31 +02:00

resultat

NEW Forms are using the tab look, even in creation mode.

2015-05-13 17:53:25 +02:00

salaries

Uniformize code

2015-06-30 15:12:15 +02:00

sociales

Merge remote-tracking branch 'origin/3.7' into develop

2015-07-19 12:26:31 +02:00

stats

New : add stats by qty on report turnover by product (+ clean code)

2015-06-22 19:22:13 +02:00

tva

Merge pull request #3122 from ywarnier/tva2

2015-07-04 04:05:04 +02:00

ventilation

Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into

2014-09-29 16:31:35 +02:00

ajaxpayment.php

Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode

2014-07-30 15:47:19 +02:00

clients.php

Lowecased booleans to fit with PSR-2 specification.

2014-10-12 00:23:19 +02:00

facture.php

Fix bad parameters of function select_date

2015-07-12 12:50:24 +02:00

hrm.php

Merge remote-tracking branch 'Upstream/develop' into develop-42

2015-06-29 06:45:24 +02:00

index.php

Fix: wrong link

2015-05-27 07:19:10 +02:00

paiement_charge.php

Forms are using the tab look, even in creation mode

2015-06-29 21:58:38 +02:00

paiement.php

Prepare merge of merge tools and invoice list

2015-06-30 14:32:17 +02:00

recap-compta.php

Finishment of look

2015-06-20 23:33:13 +02:00