lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,942 Commits 43 Branches 150 Tags 886 MiB
116c6d7a6a
Commit Graph

1722 Commits

Author SHA1 Message Date
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
abc471575a Fix sql error 2016-10-22 17:00:19 +02:00
Laurent Destailleur
629af89986 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:18:28 +02:00
Laurent Destailleur
11609eab71 Update doc 2016-10-22 15:03:13 +02:00
Laurent Destailleur
6965e987f0 Keep fpdi embedded 2016-10-22 14:35:45 +02:00
Laurent Destailleur
46f2f154c2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-04 19:47:45 +02:00
Laurent Destailleur
c0ea95df3e Enhance packager 2016-10-01 19:56:06 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
7bf1d6cc9c Push file signature on server 2016-09-30 16:05:33 +02:00
Laurent Destailleur
5d26565199 Package add version into xml integrity file. 2016-09-30 15:41:08 +02:00
Laurent Destailleur
dcb18cd637 Clean and reorganize dev tools 2016-09-27 19:43:34 +02:00
Laurent Destailleur
9fe6959598 Merge pull request #5588 from GPCsolutions/develop-4608 
FIX #4608 [Debian] Don't hard depend on mysql-server
 2016-09-02 18:57:29 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
Laurent Destailleur
8a5bafc2dd Prepare 4.0 2016-08-28 21:23:37 +02:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of 
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
 2016-08-05 13:12:43 +02:00
Raphaël Doursenaud
33251fc97e
FIX #4608 [Debian] Don't hard depend on mysql-server 
Allows using a separate MySQL server and switching to MariaDB.
 2016-08-05 12:08:41 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
1b6da075f7 Fix new apache 2.4 directives 2016-07-31 02:26:06 +02:00
Laurent Destailleur
64fbff3abc Fix for 4.0 doliwamp 2016-07-31 02:18:48 +02:00
Laurent Destailleur
b630f0b710 Fix use https and not http 2016-07-30 11:30:19 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Laurent Destailleur
d7f557c7ed Remove warning 2016-07-22 18:34:50 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
bf67cf9dc2 Update documentation 2016-07-17 13:40:14 +02:00
Laurent Destailleur
1914b98375 Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-17 12:52:20 +02:00
Laurent Destailleur
9b47d7e05d Keep only us file 2016-07-17 12:46:09 +02:00
Laurent Destailleur
d345153c5e Update doc 2016-07-17 00:08:34 +02:00
Laurent Destailleur
25d9969590 Fix watch to use orig.tar.gz on package_ubuntu directory 2016-07-16 23:47:37 +02:00
Laurent Destailleur
653bfd5d43 Fix missing orig file in upload. 2016-07-16 22:19:26 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
a9b1693e09 Update doc 2016-07-16 19:55:54 +02:00
Laurent Destailleur
58caf89aab Fix for debian package 2016-07-16 19:52:42 +02:00
Laurent Destailleur
8961f1077a Detection of chrome to install correctly doliwamp when chrome is used 2016-07-09 12:19:58 +02:00
Laurent Destailleur
f47fc3c6ba Fix for apache 2.4 2016-07-08 00:20:26 +02:00
Laurent Destailleur
964001bda2 Fix for apache 2.4 2016-07-08 00:16:22 +02:00
Laurent Destailleur
e55ae1476a Fix innosetup install 2016-07-06 23:55:10 +02:00
Laurent Destailleur
d7bc30fc4e Prepare DoliWamp 4.0 2016-07-06 23:18:01 +02:00
Laurent Destailleur
16e3a3d294 Fix datadir not defined 
Fix can't use the cron script on cloud services since the admin user may
have different values.
 2016-07-06 22:49:08 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
Laurent Destailleur
8e19b235f1 Code comment 2016-07-06 11:06:49 +02:00
Laurent Destailleur
9249a7c736 Add entry to run stop/start doliwamp as admin 2016-07-06 11:05:23 +02:00
Laurent Destailleur
a2e26e6ba0 Upgrade apache and php for DoliWamp but not Mysql 2016-07-06 10:49:19 +02:00
Laurent Destailleur
bad758f248 Fix syntax error 2016-07-03 19:10:52 +02:00
Laurent Destailleur
f3eb564d5f Some fix for mysql5.6.17 2016-07-03 15:24:01 +02:00
Laurent Destailleur
ce3f45c2a2 Debug of doliwamp for 4.0 2016-07-03 13:14:33 +02:00
Laurent Destailleur
a57a41a07d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-29 20:09:02 +02:00
Laurent Destailleur
383641e086 Test package vcredist is available 2016-06-29 20:08:47 +02:00
Laurent Destailleur
1a3bd97a55 Prepare 4.0 doliwamp 2016-06-28 02:07:39 +02:00
Laurent Destailleur
29fa49c99d Prepare package 4.0 2016-06-28 01:50:27 +02:00
Laurent Destailleur
f9190b0940 Update doc 2016-06-08 18:32:42 +02:00
Laurent Destailleur
e5aa79364a Update cache example 2016-06-08 18:21:05 +02:00
Laurent Destailleur
6062bad917 Update doc 2016-06-02 13:29:51 +02:00
Laurent Destailleur
6feabe5049 ChangeLog of 4.0 is ready 2016-06-02 13:27:18 +02:00
Laurent Destailleur
79291b7a77 Prepare 4.0 2016-05-31 00:35:21 +02:00
Laurent Destailleur
bba3dc7dcd Make composer cleaner 2016-05-18 13:39:57 +02:00
Laurent Destailleur
e571741ef8 Add doc on composer 2016-05-18 12:58:50 +02:00
Laurent Destailleur
f7bd2d16db Prepare upgrade of doliwamp 2016-05-04 20:48:49 +02:00
Laurent Destailleur
1af8ca458d Better image 
Conflicts:
	build/exe/doliwamp/doliwamp.bmp
 2016-05-04 20:34:25 +02:00
Laurent Destailleur
8b41970b2e Prepare upgrade of doliwamp 2016-05-04 20:19:53 +02:00
Laurent Destailleur
174cead40d Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/commande/list.php
 2016-04-29 15:33:57 +02:00
Laurent Destailleur
c539cc7151 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-04-29 15:30:04 +02:00
Laurent Destailleur
f91a8934bd Merge remote-tracking branch 'origin/3.7' into 3.8 2016-04-29 15:17:11 +02:00
Laurent Destailleur
211d217f8c Merge remote-tracking branch 'origin/3.6' into 3.7 2016-04-29 15:13:27 +02:00
Laurent Destailleur
2a27fe02eb Fix detection if tag already exists 2016-04-29 15:12:58 +02:00
Laurent Destailleur
a2a5fa6f4f Update screenshots 2016-04-26 01:13:55 +02:00
Marcos García de La Fuente
257d9b2f8d NEW #4772 Removed support for Mysql deprecated driver. Please use Mysqli instead 2016-04-17 15:39:46 +02:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
Laurent Destailleur
c35d8d1b8e Fix publish on foundation server 2016-03-13 12:48:08 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
 2016-03-13 01:31:12 +01:00
Laurent Destailleur
e0809fc750 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/compta/facture.php
	htdocs/product/document.php
 2016-03-12 18:40:50 +01:00
Laurent Destailleur
eb65707da8 Fix code to publishing packages on foundation server 2016-03-12 12:50:05 +01:00
Laurent Destailleur
bc2043cb79 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-03 20:48:47 +01:00
Laurent Destailleur
19a9a02e6a Fix script is able to manage rc versions 2016-03-03 01:08:15 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
45f4c45618 Fix lintian warnings 2016-02-29 10:09:21 +01:00
Laurent Destailleur
9a0af064bf Prepare rc2 2016-02-26 19:05:02 +01:00
Laurent Destailleur
1a4413dbc3 Update how to 2016-02-23 19:51:52 +01:00
Laurent Destailleur
798a40f6c0 Update changelog 2016-02-23 13:02:53 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
1d5bd7208e Packager can publish release candidates on foundation server 2016-02-11 00:24:32 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
38e5b773ce Fix: can publish on foundation ref storage 2016-02-07 01:11:12 +01:00
Laurent Destailleur
426f6541e6 Fix: can publish on foundation ref storage 2016-02-07 01:05:53 +01:00
Laurent Destailleur
adb66eddf1 Fix generation of rpm packages 2016-02-06 18:15:54 +01:00
Laurent Destailleur
77c059f7e6 We must remove flash binary part 2016-02-06 17:24:54 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
806d3642d8 FIX Bad filter on opportunities 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2016-02-06 15:09:57 +01:00
Laurent Destailleur
3828fe7026 FIX Bad filter on opportunities 2016-02-06 15:06:37 +01:00
Laurent Destailleur
de1c6cce63 Update doc 2016-02-01 10:42:53 +01:00
Laurent Destailleur
c54ebfebb5 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-31 21:28:14 +01:00
Laurent Destailleur
605c36de65 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-31 21:27:46 +01:00
Laurent Destailleur
b93170b345 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-31 21:27:20 +01:00
Laurent Destailleur
0076512d5b Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-31 21:26:52 +01:00
Laurent Destailleur
1b23ede857 Merge remote-tracking branch 'origin/3.5' into 3.6 2016-01-31 21:26:28 +01:00
Laurent Destailleur
b11fe5f4c7 Update debian doc 2016-01-31 20:46:27 +01:00
Laurent Destailleur
d9e089256e Fix path to copyrighted files 2016-01-31 16:16:46 +01:00
Laurent Destailleur
0eae624a60 Add protection to avoid packaging external tested modules 2016-01-07 18:13:15 +01:00
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
 2016-01-02 12:27:08 +01:00
Laurent Destailleur
cfd01b6060 Fix package for 3.8.3 2015-12-27 23:50:13 +01:00
Laurent Destailleur
e536e10269 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:06:31 +01:00
Laurent Destailleur
06754068ff Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:02:19 +01:00
Laurent Destailleur
96bc2023f3 Prepare package 3.6.6 2015-12-27 18:56:15 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
 2015-12-18 21:20:12 +01:00
Laurent Destailleur
c1c0fa88c2 Fix for new travis setup 2015-12-18 20:56:27 +01:00
Laurent Destailleur
b47dc8a394 Fix to use new travis setup 2015-12-18 20:10:11 +01:00
Raphaël Doursenaud
bbe7498de6 Better Travis CI 
NEW:
Cleaned up routines for better readability of both declaration and results.
PHP versions now really covered.
    The old code forced install of PHP and didn't use Travis provided versions.
    This resulted in the process not being executed with the declared PHP version.
Dropped MySQL in favor of MariaDB.
    This is now the FLOSS community standard.
    This should help avoid problems with buggy MySQL releases.
Fast finish enabled to show results faster.
Optimized tools installation with composer.
    The right version of the tool is installed for the PHP version under test.
New PHP linter to check for syntax errors.
    Parallelized for better speed.
Apache + PHP FPM for testing webservices.
    The previous mod_php configuration was not supported on Travis.
New global DEBUG environment variable to show verbose output with configuration files content.
IRC notification on #dolibarr@freenode for community awareness.

FIXES:
Bug in scripts preventing execution with environmentalized PHP.
Wrong detection of MAIN_URL_ROOT under specific circumstances.
    $_SERVER["DOCUMENT_ROOT"] empty and $_SERVER["SCRIPT_NAME"] populated.
Relative ignore directive in coding style ruleset to avoid bypassing test.
Unit test errors without an exit status.
    This prevented the CI from properly detecting and reporting the error.

TODOS:
PostgreSQL support.
    This one is tricky since we only have a MySQL dump and the syntax is not directly compatible.
SQLite support.
    Disabled in core at the moment.
Nginx + PHP FPM support.
    Test webservices on the second most popular webserver.
Run dev/* checks.
    We have a nice collection of scripts we could leverage.
Check Javascript.
Check CSS.
Check SQL.
 2015-12-13 21:34:36 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
Laurent Destailleur
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Raphaël Doursenaud
4e9b339439 [Qual] Removed PHP closing tag 2015-12-09 13:28:45 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit 
These files doesn't contain executable code and may pose a security
threat.
 2015-12-09 13:28:36 +01:00
Laurent Destailleur
3df097f4bf Update doc 2015-12-06 14:06:37 +01:00
Laurent Destailleur
f814bc11a0 Clean packaging 2015-11-26 01:27:59 +01:00
Laurent Destailleur
ffeae34f51 Update doc 2015-11-22 18:41:35 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
f49fab8a7e Rename some files in english and increase fields size. 2015-11-09 16:48:30 +01:00
Laurent Destailleur
350345ecca Prepare 3.6.5 2015-11-08 15:18:26 +01:00
Laurent Destailleur
722a133b31 FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.6.5

Conflicts:
	ChangeLog

Conflicts:
	ChangeLog
 2015-11-08 15:09:57 +01:00
Laurent Destailleur
d4aeb8b3bc Abandon package APS. Was never used. 2015-11-08 14:57:26 +01:00
Laurent Destailleur
04aba8ce96 Abandon package APS. Was never used. 2015-11-08 14:56:36 +01:00
Laurent Destailleur
9b8bb114cd FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.7.2

Conflicts:
	ChangeLog
 2015-11-08 14:55:12 +01:00
Laurent Destailleur
98b887edae Update doc to generate ChangeLog 2015-11-08 12:23:40 +01:00
Laurent Destailleur
42ae4e10b3 Abandon package APS. Was never used. 2015-11-08 12:19:05 +01:00
Laurent Destailleur
972c364c37 FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.8.2
 2015-11-08 12:12:28 +01:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Regis Houssin
542ed40c9c Fix: compatibility with dolibarr versions before and after 3.7.1 2015-10-14 12:09:51 +02:00
Laurent Destailleur
df39a1054e Fix 3.8.1 2015-10-11 20:19:52 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/societe/list.php
 2015-10-04 20:57:00 +02:00
Laurent Destailleur
d54650905b FIX debian install when module mysqli is not installed. 2015-10-04 19:08:10 +02:00
Laurent Destailleur
9eab5206d4 Fix typo 2015-10-04 14:08:32 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
Laurent Destailleur
4e5ca151b5 Make process to update launchpad easier. 2015-10-03 20:39:15 +02:00
Laurent Destailleur
bea789edfe Make process to update launchpad easier. 2015-10-03 20:09:54 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
12a08ae4e1 Prepare 3.8.1 2015-09-23 10:25:06 +02:00
Laurent Destailleur
f81df66564 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
 2015-09-23 00:34:57 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
 2015-09-22 16:28:34 +02:00
Laurent Destailleur
c125ba0d66 Update ignore to secure 
Conflicts:
	htdocs/.gitignore
 2015-09-22 15:42:59 +02:00
Laurent Destailleur
75daddbbe2 Update ignore to secure 2015-09-22 15:40:49 +02:00
Laurent Destailleur
2ce43dc0d8 Update ignore to secure 2015-09-22 15:40:17 +02:00
Laurent Destailleur
27b1f2ecc6 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-17 19:52:13 +02:00
Laurent Destailleur
8bb832d06b Fix Natural english 2015-09-17 00:48:10 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Raphaël Doursenaud
cb31ab3e2b FIX Syntax error in Debian Apache configuration 
This issue prevented Apache from starting after dolibarr deb package
installation with the following error:
Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf:
order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure'
 2015-09-16 19:53:32 +02:00
Laurent Destailleur
4eedec0274 Fix tool to generate filecheck 2015-09-13 20:25:33 +02:00
Laurent Destailleur
52aee5562f Update doc 2015-09-03 18:11:26 +02:00
Laurent Destailleur
69a4e2cd95 Update doc 2015-09-03 17:27:29 +02:00
Laurent Destailleur
001f1b4c31 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-03 10:41:44 +02:00
Laurent Destailleur
2754d7dbec Update doc 2015-09-01 11:59:03 +02:00
Laurent Destailleur
5f30ad3b63 Fix no link to show if id empty 2015-08-19 18:27:12 +02:00
Laurent Destailleur
8d18507d5f Bad help 2015-08-14 15:35:25 +02:00
Juanjo Menent
cc32b9387b Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:43:11 +02:00
Regis Houssin
94ac0f5305 Fix: remove custom dir creation 2015-08-09 13:25:09 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Laurent Destailleur
f0ed7dac09 Exclude tested module 2015-07-20 12:21:15 +02:00
Laurent Destailleur
205c5aba82 Clean packages 2015-07-13 16:23:41 +02:00
Laurent Destailleur
0542e43b71 Prepare 3.8 2015-07-13 00:23:46 +02:00
Laurent Destailleur
ccd471bcd5 Update doc 2015-07-12 23:53:00 +02:00
Laurent Destailleur
66ae756c72 Prepare 3.8 2015-07-12 23:47:39 +02:00
Laurent Destailleur
1ba5afbc7d Update doc. Prepare 3.8 2015-07-12 18:56:00 +02:00
Raphaël Doursenaud
572ce7bcbb NEW: Rename install etape to step 2015-07-06 15:44:33 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
6fb53ecb97 Update doc 2015-06-28 23:33:03 +02:00
Laurent Destailleur
f8085c8ae6 Update doc 2015-06-28 12:34:21 +02:00
Laurent Destailleur
8f691138e8 NEW Can edit Background color for Top menu and Background color for 
table title line (works only with theme menu eldy).
 2015-06-26 16:21:09 +02:00
Laurent Destailleur
a6a027f5c4 Fix several pb with javascript 2015-06-20 17:24:34 +02:00
Laurent Destailleur
c023c078ae Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-17 00:07:44 +02:00
Laurent Destailleur
844ca58096 Fix: custom dir is missing 2015-06-17 00:05:41 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Laurent Destailleur
1f92f542a6 NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become 
officialy visible into setup.
 2015-06-04 13:32:21 +02:00
Laurent Destailleur
4f75ab79db Prepare 3.7.2 2015-06-01 16:32:33 +02:00
Laurent Destailleur
227f2842c2 Prepare version 3.7.1 2015-05-31 18:03:24 +02:00
Laurent Destailleur
7d9856f3d8 Update doc 2015-05-31 17:52:32 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
 2015-05-25 18:08:23 +02:00
Laurent Destailleur
fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php
 2015-05-16 17:09:42 +02:00
Laurent Destailleur
a4df49f6c8 Prepare packaging 2015-05-16 17:04:36 +02:00
Laurent Destailleur
e4aaff1de9 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2015-05-16 17:01:40 +02:00
Laurent Destailleur
5b00ba11fd Prepare packaging 2015-05-16 16:54:54 +02:00
Laurent Destailleur
cabbb9e421 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2015-05-16 16:49:03 +02:00
Laurent Destailleur
e46a8b3b54 Enhance packaging 2015-05-16 16:41:55 +02:00
Laurent Destailleur
e8fb89f89f Prepare packaging 3.7 2015-05-16 16:38:47 +02:00
Laurent Destailleur
4dcdea5219 Prepare package 3.5.7 
Removed hardcoded version from rpm spec files, so it will not be
necessary to update this files when making a new release.
 2015-05-16 16:08:05 +02:00
Laurent Destailleur
80943111cc Prepare 3.5.7 2015-05-16 15:26:34 +02:00
Laurent Destailleur
92a25e3d4c Prepare 3.7.1 2015-05-12 00:11:51 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
 2015-05-12 00:09:03 +02:00
Laurent Destailleur
c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php
 2015-05-11 23:53:38 +02:00
Laurent Destailleur
896d95cf1c Add doc to build when ony changelog change 2015-05-05 10:23:47 +02:00
Laurent Destailleur
7419319c0f Protection into packager 2015-04-29 22:39:42 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Laurent Destailleur
60a56da370 Some change into css. Tabs background are now white so main content is 
black on white (better contrast).
Fix editfieldval for date.
 2015-04-25 22:20:10 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
b5690142aa Prepare 3.6.3 2015-03-29 16:26:31 +02:00
Laurent Destailleur
3cc4358e72 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/commande/liste.php
	htdocs/product/stock/product.php
 2015-03-29 15:24:17 +02:00
Laurent Destailleur
ffe1ee0d84 Target 98 to publish of dolibarr sevrer is now working 2015-03-28 17:12:31 +01:00
Laurent Destailleur
5e33068e29 Update doc 2015-03-28 16:51:25 +01:00
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00
aspangaro
f778f47049 Add dirs 2015-03-25 21:46:08 +01:00
Laurent Destailleur
b884b28991 Include module loan 2015-03-23 23:39:14 +01:00
Laurent Destailleur
560b4541cd Update packager. 2015-03-05 22:08:16 +01:00
Laurent Destailleur
3e853b4129 Bad comment char 2015-02-24 16:17:52 +01:00
Laurent Destailleur
cae82104ca Clean tool to generate checksum file 2015-02-24 12:44:12 +01:00
frederic34
ad3e91dc9f WIP 2015-02-21 14:06:33 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
 2015-02-15 19:51:49 +01:00
Laurent Destailleur
11ae661303 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-02-14 14:01:18 +01:00
Laurent Destailleur
6189db677d Fix package .exe 2015-02-14 11:25:26 +01:00
Laurent Destailleur
6adfc6f6f4 Work on batch module. Add batch, eatby and sellby into movement table. 
Clean language files for direct print module.
 2015-02-12 15:23:31 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
16fa19be87 Doc to send unblock requests 2015-01-28 23:06:05 +01:00
aspangaro
467a274f76 Typo 2015-01-22 21:12:20 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
839f73d568 Update doc 2015-01-18 14:57:25 +01:00
Laurent Destailleur
033e77c04a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-13 15:41:45 +01:00
Laurent Destailleur
6414f415a8 Files compatible with apache 2.4 2015-01-11 15:30:34 +01:00
Laurent Destailleur
c7b311349e Files compatible with apache 2.4 2015-01-11 15:16:55 +01:00
Laurent Destailleur
9662879e52 Fixed: Permissions 2015-01-11 15:15:51 +01:00
Laurent Destailleur
8abbac564b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/main.inc.php
 2014-12-30 04:28:09 +01:00
Laurent Destailleur
3848daeab8 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/stats/facture.php
 2014-12-30 04:20:50 +01:00
Laurent Destailleur
953e736a97 Prepare version 3.6.2 2014-12-27 02:21:37 +01:00
Laurent Destailleur
71683d20cf Update doc 2014-12-06 14:05:51 +01:00
Laurent Destailleur
72c3954f36 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
 2014-12-05 21:12:35 +01:00
Laurent Destailleur
f261e1736c Update doc 2014-12-05 21:10:38 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
Laurent Destailleur
17c6f84061 Update doc 2014-12-05 19:18:53 +01:00
Laurent Destailleur
ed5b89f7f1 Update doc 2014-12-05 17:55:18 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
 2014-12-04 15:29:45 +01:00
Laurent Destailleur
a07852c699 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2014-12-04 15:22:08 +01:00
Laurent Destailleur
9e1b0d1abc Prepare 3.5.6 2014-12-04 15:09:47 +01:00
Laurent Destailleur
577671e208 Exclude editorconfig from packages 2014-12-03 12:05:31 +01:00
Laurent Destailleur
7868d286d3 Update debian tuto 2014-12-02 14:42:21 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
0559e29c92 Prepare freeze 2014-11-07 21:52:50 +01:00
Laurent Destailleur
24862d6314 Corrections launchpad 2014-10-30 22:51:06 +01:00
Laurent Destailleur
2f5c7e5f9d Prepare version 3.7 beta 2014-10-30 19:28:22 +01:00
Laurent Destailleur
87901d07de Merge pull request #1986 from jfefe/patch-7 
Update makepack-dolibarr.pl : indentation
 2014-10-30 17:47:21 +01:00
Laurent Destailleur
8821fbac76 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/product/fiche.php
	htdocs/user/class/user.class.php
 2014-10-30 11:19:29 +01:00
jfefe
a32817db9d Update makepack-dolibarr.pl : indentation 2014-10-28 23:49:54 +01:00
Laurent Destailleur
41f0920656 Fix for debian 2014-10-24 23:50:10 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
d518278166 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture/class/facture.class.php
 2014-10-03 19:17:28 +02:00
Laurent Destailleur
05fe8e45b3 Exclude module dire from package 2014-10-03 19:07:49 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00