lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
344a87f970
dolibarr/htdocs
History
Florian HENRY 344a87f970 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
..
accountancy Merge pull request #4938 from aspangaro/4.0-p15 2016-04-03 17:38:02 +02:00
adherents FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
admin Merge branch 'develop' into develop_advtargetemailiing 2016-04-04 14:43:17 +02:00
api [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
asterisk FIX Removed hard coded parameters for asterisk setup 2015-12-13 15:21:46 +01:00
barcode Revert "Corrected non-static usages of Form::selectarray function" 2016-03-25 15:34:37 +01:00
bookmarks Revert "Corrected non-static usages of Form::selectarray function" 2016-03-25 15:34:37 +01:00
cashdesk Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
categories Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
comm Merge branch 'develop' into develop_advtargetemailiing 2016-04-03 11:29:17 +02:00
commande FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
compta Change FactureRec superclass CommonInvoice 2016-04-03 21:02:19 +02:00
conf Fix no ?> at end of php files 2016-01-02 00:32:22 +01:00
contact FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
contrat Keep empty if field value has no value. 2016-04-04 13:26:48 +02:00
core Merge branch 'develop' into develop_advtargetemailiing 2016-04-04 14:43:17 +02:00
cron Lost sort params 2016-03-29 15:31:52 +02:00
custom Prepare 3.9 2016-02-06 15:55:05 +01:00
don FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
ecm Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
expedition NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and 2016-04-01 18:44:23 +02:00
expensereport FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
exports Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
externalsite [Qual] Uniformize code 2015-12-08 11:35:08 +01:00
fichinter FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
fourn FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
ftp Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
holiday FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
hrm Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
imports Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
includes Debug Advance target emailing 2016-04-01 14:30:02 +02:00
install Merge branch 'develop' into develop_advtargetemailiing 2016-04-04 14:43:17 +02:00
langs Merge branch 'develop' into develop_advtargetemailiing 2016-04-04 14:43:17 +02:00
livraison Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
loan FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
mailmanspip
margin FIX Some records were lost into margin per product report 2016-04-01 12:28:15 +02:00
multicurrency/class New add payment with multicurrency module 2016-02-10 23:16:38 +01:00
opensurvey Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
paybox [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
paypal Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
printing Minor css enhancement 2016-02-16 22:58:24 +01:00
product FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
projet Merge pull request #4915 from defrance/patch-117 2016-04-04 00:21:57 +02:00
public better includes externel library 2016-03-18 10:56:55 +01:00
resource Merge pull request #4871 from sbechet/develop 2016-03-25 17:57:29 +01:00
societe FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
supplier_proposal FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
support Clean deprecated files 2016-02-16 00:41:30 +01:00
theme Try to remove grey background when using jquery jmobile. 2016-04-03 21:08:03 +02:00
user Minor fix in CSS 2016-04-02 16:53:55 +02:00
webservices Avoid errors with bad parameters 2016-01-27 23:09:05 +01:00
websites Add more info into log 2016-02-02 16:32:47 +01:00
.gitignore Add ignore 2016-01-08 13:06:38 +01:00
cache.manifest Clean deprecated files 2016-02-16 00:41:30 +01:00
disabled.php
document.php
favicon.ico
filefunc.inc.php Version 3.9 final 2016-03-13 20:17:49 +01:00
index.php Restore compatibility 2016-03-25 17:15:08 +01:00
main.inc.php Merge remote-tracking branch 'origin/3.9' into develop 2016-03-30 16:27:14 +02:00
master.inc.php
robots.txt
viewimage.php More robust error management on barcode module. 2016-02-08 15:49:38 +01:00