Laurent Destailleur ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang

2018-04-12 13:31:14 +02:00

..

bank

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-04-12 13:31:14 +02:00

charges

Fix: regression, restore primary key

2018-03-08 07:41:54 +01:00

deplacement

Fix scrutinizer bugs

2017-12-15 22:14:28 +01:00

facture

Remove old deprecated hook insertExtraFields. Triggers must be used for

2018-04-10 12:03:01 +02:00

journal

Clean code

2017-09-05 10:16:08 +02:00

localtax

Work on VAT reports to use option MAIN_INFO_VAT_RETURN

2018-04-07 15:47:13 +02:00

paiement

Merge pull request #8502 from ATM-Marc/NEW_create_from_list

2018-04-05 16:40:15 +02:00

payment_sc

Fix creation of tax payment

2017-10-07 21:27:18 +02:00

prelevement

NEW: generalize button to create object from list, for most of the lists

2018-03-30 16:54:38 +02:00

resultat

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-03-29 03:08:01 +02:00

salaries

NEW: generalize button to create object from list, for most of the lists

2018-03-30 16:54:38 +02:00

sociales

NEW: generalize button to create object from list, for most of the lists

2018-03-30 16:54:38 +02:00

stats

Fix SQLi reported by op7ica

2018-03-15 01:55:16 +01:00

tva

Clean code

2018-04-09 14:25:15 +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

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

index.php

fix better thirdparty link

2018-03-09 22:36:00 +01:00

paiement_charge.php

Look and feel v6

2017-10-16 20:53:23 +02:00

paiement.php

Clean code

2018-03-31 22:44:32 +02:00

recap-compta.php

FIX #8192

2018-02-15 14:47:08 +01:00