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

..

antivir.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

canvas.class.php

Fix missing test of action when using canvas

2015-02-16 02:02:11 +01:00

ccountry.class.php

Fix: Pb of object with wrong type.

2014-11-15 18:24:38 +01:00

CMailFile.class.php

Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of

2015-03-03 18:33:53 +01:00

commondocgenerator.class.php

Update commondocgenerator.class.php

2015-01-12 18:18:43 +01:00

commoninvoice.class.php

Type of supplier invoice was broken

2015-01-20 17:55:20 +01:00

commonobject.class.php

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

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

commonobjectline.class.php

Add a TODO to explain why we keep some extends into class.

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

commonorder.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

conf.class.php

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

2015-03-02 03:07:19 +01:00

cookie.class.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2014-07-14 23:36:10 +02:00

CSMSFile.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

ctypent.class.php

Fix missing fields into import of thirdparties.

2015-02-24 15:40:50 +01:00

discount.class.php

Add dol_escape_htmltag and start to adapt boxes

2015-01-22 00:23:55 +01:00

doleditor.class.php

Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not

2015-02-20 15:48:54 +01:00

dolexception.class.php

…

dolgeoip.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

dolgraph.class.php

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

dolprintipp.class.php

PHPCS

2014-12-21 02:21:12 +01:00

events.class.php

Maxi debug and enhancement of module batch.

2015-02-11 22:54:06 +01:00

extrafields.class.php

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

2015-02-28 03:11:15 +01:00

fileupload.class.php

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

2014-06-09 15:30:41 +02:00

fiscalyear.class.php

Fix: debug of accountancy module

2014-09-09 09:46:57 +02:00

genericobject.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

google.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

hookmanager.class.php

better translation and typo

2015-01-01 11:24:00 +01:00

html.form.class.php

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

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

html.formactions.class.php

[CORE] ajout des conditions pour un element de type askpricesupplier (#new_ask_price).

2015-01-28 14:44:48 +01:00

html.formadmin.class.php

Fixed: Protection to lock language setup in demo mode was not working

2014-11-29 12:11:12 +01:00

html.formaskpricesupplier.class.php

[CORE] Avancement des replace (#new_ask_price).

2015-01-27 17:43:07 +01:00

html.formbank.class.php

NEW: [T1758] Merge bank card & account card

2015-03-02 22:44:11 +01:00

html.formbarcode.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

html.formcompany.class.php

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

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

html.formcontract.class.php

Update html.formcontract.class.php

2014-11-22 15:41:18 +01:00

html.formcron.class.php

GPLv3

2014-10-30 20:41:08 +01:00

html.formfile.class.php

NEW: Add module "Supplier commercial proposals" to requests

2015-03-04 17:54:43 +01:00

html.formintervention.class.php

New: Add option AGENDA_DEFAULT_TYPE

2014-09-15 17:34:32 +02:00

html.formmail.class.php

NEW: Add module "Supplier commercial proposals" to requests

2015-03-04 17:54:43 +01:00

html.formmailing.class.php

camel case

2014-05-30 12:01:26 +02:00

html.formorder.class.php

More substitutions

2014-06-12 11:31:53 +02:00

html.formother.class.php

Minimum style

2015-03-04 02:18:20 +01:00

html.formprojet.class.php

Work on expense report module

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

html.formpropal.class.php

More substitutions

2014-06-12 11:31:53 +02:00

html.formsms.class.php

Replace <center> tags

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

html.formsocialcontrib.class.php

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

infobox.class.php

Doxygen

2014-11-23 23:22:49 +01:00

interfaces.class.php

Fix: Forging email content must use dol_concatdesc.

2014-11-02 12:32:38 +01:00

ldap.class.php

Misc Adherents PHPDoc corrections

2015-02-10 10:45:48 +01:00

link.class.php

Fix: [ bug #1533 ] Links triggers do not show trigger error message

2014-12-23 11:39:43 +01:00

menu.class.php

…

menubase.class.php

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

2015-01-18 17:13:42 +01:00

mobiledetect.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

notify.class.php

Fix: Module notifications DB Error "unknown field type" into third tab

2014-11-06 11:20:47 +01:00

openid.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

rssparser.class.php

Fix bad operator for and

2015-02-03 13:05:28 +01:00

smtps.class.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

stats.class.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

translate.class.php

Fix: Avoid to load language when we can not.

2014-11-12 10:25:56 +01:00

vcard.class.php

PHPDoc and misc fixes for several folders

2015-02-10 13:32:00 +01:00

WorkboardResponse.class.php

Renamed WorkBoardResponse to WorkboardResponse

2015-02-16 23:52:49 +01:00