abb 23c0a0a64e conflict solved Merge branch 'develop' into abb-14 ...

Conflicts:
	htdocs/langs/en_US/companies.lang

2016-05-02 01:28:46 +01:00

..

antivir.class.php

…

canvas.class.php

…

ccountry.class.php

…

CMailFile.class.php

Some correction for testconnect

2016-04-18 00:47:08 +02:00

commondocgenerator.class.php

…

commoninvoice.class.php

…

commonobject.class.php

Fix problem about unit buy price fetching

2016-04-29 19:41:47 +02:00

commonobjectline.class.php

[Qual] Typo

2016-03-17 09:40:05 +01:00

commonorder.class.php

NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and

2016-04-01 18:44:23 +02:00

commonstickergenerator.class.php

…

conf.class.php

Revert "Corrected non-static usages of Form::selectarray function"

2016-03-25 15:34:37 +01:00

cookie.class.php

…

CSMSFile.class.php

…

cstate.class.php

Fix missing translation

2016-02-22 14:49:30 +01:00

ctypent.class.php

…

discount.class.php

…

doleditor.class.php

NEW: All variant of ckeditor config can be tested into the setup page of

2016-05-01 20:36:42 +02:00

dolexception.class.php

…

dolgeoip.class.php

…

dolgraph.class.php

NEW Add a parameter on graph function to show a generic graph when no

2016-04-22 12:11:57 +02:00

dolprintipp.class.php

…

dolreceiptprinter.class.php

NEW Removed unused FormOrder::selectSourcesCommande function

2016-04-16 21:33:23 +02:00

events.class.php

…

extrafields.class.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

fileupload.class.php

Move a not used function into a better place.

2016-04-09 19:42:34 +02:00

fiscalyear.class.php

…

genericobject.class.php

…

google.class.php

…

hookmanager.class.php

Scrutinizer Auto-Fixes

2016-04-09 17:32:05 +00:00

html.form.class.php

Solve warnings that appears because code is using statically a mehtod

2016-04-30 19:30:28 +02:00

html.formaccounting.class.php

FIX: Bug with category functionnality

2016-04-22 06:31:40 +02:00

html.formactions.class.php

Scrutinizer Auto-Fixes

2016-04-09 13:07:33 +00:00

html.formadmin.class.php

NEW Can select language from combo list on page to overwrite a

2016-03-29 18:05:03 +02:00

html.formbank.class.php

NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country

2016-03-19 19:39:18 +01:00

html.formbarcode.class.php

…

html.formcompany.class.php

NEW Removed unused FormOrder::selectSourcesCommande function

2016-04-16 21:33:23 +02:00

html.formcontract.class.php

…

html.formcron.class.php

…

html.formfile.class.php

Page for proposals must be called card.php (one of last architecture

2016-04-23 15:37:22 +02:00

html.formintervention.class.php

…

html.formmail.class.php

Update html.formmail.class.php

2016-04-17 12:20:45 +02:00

html.formmailing.class.php

NEW Removed unused FormOrder::selectSourcesCommande function

2016-04-16 21:33:23 +02:00

html.formmargin.class.php

…

html.formorder.class.php

NEW Removed unused FormOrder::selectSourcesCommande function

2016-04-16 21:33:23 +02:00

html.formother.class.php

</option> not present in some select list

2016-04-29 20:18:26 +02:00

html.formprojet.class.php

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

2016-04-12 15:05:18 +02:00

html.formpropal.class.php

…

html.formsms.class.php

Revert "Corrected non-static usages of Form::selectarray function"

2016-03-25 15:34:37 +01:00

html.formsocialcontrib.class.php

…

html.formsupplier_proposal.class.php

NEW Add stats and late records into dashboard for supplier proposals.

2016-03-04 16:14:23 +01:00

index.html

…

infobox.class.php

More complete dependencies

2016-03-26 12:27:34 +01:00

interfaces.class.php

…

ldap.class.php

…

link.class.php

…

menu.class.php

…

menubase.class.php

NEW Merge all admin tools (system and module admin tools) into same

2016-02-16 12:50:15 +01:00

notify.class.php

conflict solved Merge branch 'develop' into abb-14

2016-05-02 01:28:46 +01:00

openid.class.php

…

rssparser.class.php

…

smtps.class.php

Add Swift Mailer to send mails

2016-04-16 18:15:03 +02:00

stats.class.php

…

translate.class.php

Show both currency symbol and code

2016-04-30 14:09:00 +02:00

utils.class.php

NEW Introduce a predefined job to run database backup

2016-03-29 14:52:27 +02:00

vcard.class.php

…

workboardresponse.class.php

…