Laurent Destailleur 7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into ...

atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

2015-03-04 23:03:29 +01:00

..

bank

Some fix after merging bank account number form

2015-03-04 21:59:03 +01:00

charges

Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors

2014-12-25 12:08:10 +01:00

deplacement

Work on expense report module

2015-02-21 15:18:05 +01:00

dons

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

2015-02-19 00:01:26 +01:00

facture

Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into

2015-03-04 23:03:29 +01:00

journal

Invoices: added situation (or interim) invoices support

2015-01-06 17:12:13 +01:00

localtax

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

2015-02-19 00:01:26 +01:00

paiement

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

2015-02-19 00:01:26 +01:00

payment_sc

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

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

prelevement

Merge pull request #2405 from frederic34/patch-5

2015-03-02 00:31:50 +01:00

resultat

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

2015-02-19 00:01:26 +01:00

salaries

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

2015-02-19 00:01:26 +01:00

sociales

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

2015-02-26 13:36:07 +01:00

stats

Invoices: added situation (or interim) invoices support

2015-01-06 17:12:13 +01:00

tva

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

2015-02-19 00:01:26 +01: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

Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into

2015-03-04 23:03:29 +01:00

hrm.php

Fix: all home area pages has the search box first.

2015-03-02 00:43:17 +01:00

index.php

Tooltip everywhere

2015-01-30 16:40:33 +01:00

paiement_charge.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

paiement.php

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

2015-02-19 00:01:26 +01:00

recap-compta.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00