Commit Graph

55188 Commits

Author SHA1 Message Date
Laurent Destailleur
1e90d0a54c Fix path using https 2016-08-01 15:22:48 +02:00
Laurent Destailleur
4410057106 Fix typo 2016-08-01 15:18:52 +02:00
Laurent Destailleur
bb99209b5e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-01 15:06:22 +02:00
Laurent Destailleur
621a7d93fa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-01 15:05:57 +02:00
Laurent Destailleur
97dd1f4bbb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
2016-08-01 15:03:59 +02:00
Laurent Destailleur
58c18f438c Move changelog at correct place 2016-08-01 15:02:23 +02:00
Laurent Destailleur
803fe68061 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
2016-08-01 15:01:14 +02:00
BENKE Charlie
9a0494bd64 Update bonprelevement.class.php 2016-08-01 14:11:58 +02:00
Laurent Destailleur
e998a4b8a5 Merge pull request #5572 from fmarcet/3.8
Fix: Can't set PRODUIT_LIMIT_SIZE to value 0
2016-08-01 13:40:11 +02:00
Laurent Destailleur
417dd6465c Merge pull request #5570 from aspangaro/4.0-p36
Fix Presentation & uniformize code
2016-08-01 13:39:54 +02:00
Laurent Destailleur
e0c232548e Fix theme crazy after migration 2016-08-01 10:55:41 +02:00
Ferran Marcet
fb2444c7a3 Fix: Can't set PRODUIT_LIMIT_SIZE to value 0 2016-08-01 10:20:10 +02:00
aspangaro
8ce5fcd980 Uniformize presentation salary payment 2016-08-01 07:40:05 +02:00
aspangaro
0b7a5a4af9 Uniformize presentation donation 2016-08-01 07:34:55 +02:00
aspangaro
4a0eb496fa Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36
Conflicts:
	htdocs/societe/rib.php
2016-08-01 07:27:49 +02:00
aspangaro
4ee4de4a00 Uniformize presentation supplier invoice 2016-08-01 07:21:24 +02:00
aspangaro
3cdb2d45c2 Uniformize presentation customer invoice 2016-08-01 07:10:42 +02:00
aspangaro
26f98a2ab7 Presentation 2016-08-01 06:45:29 +02:00
aspangaro
30ec33f152 Missing key language 2016-08-01 06:45:00 +02:00
aspangaro
63220eae18 Presentation 2016-08-01 04:40:56 +02:00
Laurent Destailleur
ee7023422a Update dump 2016-07-31 23:19:01 +02:00
Laurent Destailleur
1e037a9b95 Fix pb of responsive design 2016-07-31 18:28:59 +02:00
Laurent Destailleur
20a2282efc Updated screenshots 2016-07-31 16:24:32 +02:00
Laurent Destailleur
ce3b01cf6a Update icons 2016-07-31 15:06:25 +02:00
Laurent Destailleur
5f0951dcda Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:20:40 +02:00
Laurent Destailleur
51e941b9b4 Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:07:55 +02:00
Laurent Destailleur
0f544919e0 git push origin 4.0Merge branch 'aspangaro-4.0-p36' into 4.0 2016-07-31 03:05:53 +02:00
Laurent Destailleur
33495847b7 Merge branch '4.0-p36' of https://github.com/aspangaro/dolibarr into
aspangaro-4.0-p36

Conflicts:
	htdocs/societe/rib.php
2016-07-31 03:05:34 +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
e3df4b81f8 Update demo 4.0 2016-07-30 21:13:16 +02:00
Laurent Destailleur
0414f09e48 Fix permissions 2016-07-30 21:09:30 +02:00
Laurent Destailleur
44b02f1d6c Hide module cron 2016-07-30 20:59:06 +02:00
Laurent Destailleur
b165a31c0d Fix old module to disable 2016-07-30 20:55:20 +02:00
Laurent Destailleur
8ada144f6e Fix demo 2016-07-30 20:53:00 +02:00
Laurent Destailleur
04e814d1a6 Update demo 2016-07-30 20:51:22 +02:00
Laurent Destailleur
5aa5c5259d demo is in mode stable 2016-07-30 20:39:25 +02:00
Laurent Destailleur
9191692bb2 More files for demo data 2016-07-30 20:33:01 +02:00
Laurent Destailleur
654ac318d4 Prepare dump for 4.0 demo 2016-07-30 20:26:05 +02:00
Laurent Destailleur
a87c2f9579 Fix several fixes on margin reports 2016-07-30 18:57:26 +02:00
Laurent Destailleur
246321cd8f Fix clean orphelins of leave request logs in repair tools
Fix date of supplier proposal missing.
2016-07-30 18:08:07 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank
tranfert for payements
2016-07-30 17:28:18 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Laurent Destailleur
7678940e50 Fix refresh cache value of nb of files into a dir into ECM module 2016-07-30 15:51:27 +02:00
Laurent Destailleur
a6147ee73b Miscellaneous fixes 2016-07-30 14:49:29 +02:00
Laurent Destailleur
e3f0ab9109 Fix tag was not visible 2016-07-30 14:05:39 +02:00
Laurent Destailleur
ceb6199e87 Fix default numbering module of customer code was not enabled. 2016-07-30 12:31:32 +02:00
Laurent Destailleur
b3dab8a6f7 Better translation 2016-07-30 11:56:22 +02:00
Laurent Destailleur
7a72b9bb09 Use https links 2016-07-30 11:40:55 +02:00
Laurent Destailleur
b630f0b710 Fix use https and not http 2016-07-30 11:30:19 +02:00