Commit Graph

81317 Commits

Author SHA1 Message Date
Laurent Destailleur
d081c9cf8a Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-26 09:36:47 +01:00
Laurent Destailleur
953ba8e323 Trans 2019-11-26 09:36:32 +01:00
Laurent Destailleur
cd6e81c46f Choice of a parameter is lost when saving 2019-11-26 09:34:42 +01:00
Laurent Destailleur
334265ee6e
Merge pull request #12510 from frederic34/patch-8
fk_user fk_usergroup are int
2019-11-26 09:21:27 +01:00
Laurent Destailleur
b370d70426
Merge pull request #12511 from erpware/develop
just fixed two small css issues
2019-11-26 09:20:40 +01:00
Laurent Destailleur
65f9d3e8f1
Merge pull request #12509 from frederic34/patch-7
do not evaluate count at each iteration
2019-11-26 09:16:58 +01:00
Laurent Destailleur
6300369433
Merge pull request #12513 from frederic34/patch-11
dol_fiche_end() returns void
2019-11-26 09:16:06 +01:00
Laurent Destailleur
82be4da4f2
Merge pull request #12514 from frederic34/patch-13
Form selectAvailabilityDelay returns void
2019-11-26 09:15:42 +01:00
Laurent Destailleur
e23364b8b9
Merge pull request #12515 from frederic34/patch-14
Update graph.php
2019-11-26 09:15:22 +01:00
Laurent Destailleur
0032b27a8e
Merge pull request #12517 from frederic34/patch-16
$out does not seem to be defined for all execution paths
2019-11-26 09:14:55 +01:00
Laurent Destailleur
cee40561df Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-26 09:13:52 +01:00
Laurent Destailleur
b0b579bdbf Fix phpcs 2019-11-26 09:13:35 +01:00
Laurent Destailleur
034267edbf
Merge pull request #12516 from frederic34/patch-15
doxygen
2019-11-26 09:11:10 +01:00
Laurent Destailleur
b44817f2bf
Merge pull request #12518 from frederic34/patch-17
doxygen
2019-11-26 09:10:47 +01:00
Laurent Destailleur
04573728f9
Merge pull request #12520 from andreubisquerra/master
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
2019-11-26 09:09:51 +01:00
Laurent Destailleur
9d2a5e6c42 Trans 2019-11-26 09:08:32 +01:00
Laurent Destailleur
b440f2b1f4 Fix a ref is not null 2019-11-26 08:53:54 +01:00
Frédéric FRANCE
1ccf0808d0
doxygen 2019-11-26 00:28:26 +01:00
Frédéric FRANCE
a142c0050e
$out does not seem to be defined for all execution paths 2019-11-26 00:24:00 +01:00
Frédéric FRANCE
77a300c9ae
doxygen 2019-11-26 00:20:40 +01:00
Frédéric FRANCE
f3f308fc1b
Update graph.php 2019-11-26 00:11:02 +01:00
Frédéric FRANCE
3edac06fae
Form selectAvailabilityDelay returns void 2019-11-26 00:06:57 +01:00
Frédéric FRANCE
18e08420f4
Update combinations.php 2019-11-26 00:01:06 +01:00
Frédéric FRANCE
2dbe3260a1
Update document.php 2019-11-25 23:59:32 +01:00
Frédéric FRANCE
aa12ec1f67
Update agenda.php 2019-11-25 23:58:53 +01:00
Frédéric FRANCE
84e1e6ccf1
Update document.php 2019-11-25 23:58:14 +01:00
Frédéric FRANCE
5d9d542cd7
Update photos.php 2019-11-25 23:57:10 +01:00
andreubisquerra
6baa1c8d4a
Fix travis 2019-11-25 23:32:40 +01:00
Daniel Seichter
7a4beb824f Merge remote-tracking branch 'upstream/develop' into develop 2019-11-25 23:14:19 +01:00
Daniel Seichter
9eafc8f550 fix small css issues 2019-11-25 23:13:31 +01:00
Laurent Destailleur
1f8361ea9e Tooltip 2019-11-25 21:02:26 +01:00
Laurent Destailleur
a8c2aa094d More examples 2019-11-25 20:30:05 +01:00
Frédéric FRANCE
d280eef1e0
Update expensereport_rules.php 2019-11-25 20:12:51 +01:00
Frédéric FRANCE
4056848483
do not evaluate count at each iteration 2019-11-25 20:07:29 +01:00
andreubisquerra
b2e995279e Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php 2019-11-25 19:29:07 +01:00
andreubisquerra
53ec106365
Merge pull request #2 from Dolibarr/develop
Update
2019-11-25 16:08:33 +01:00
Laurent Destailleur
2f3614df8a Fix lang loaded 2019-11-25 12:53:56 +01:00
Laurent Destailleur
cf67f650eb Better decoding of email topics 2019-11-25 10:12:26 +01:00
Laurent Destailleur
d34f487c65 Decode subject by emailcollector 2019-11-24 21:30:00 +01:00
Laurent Destailleur
1bace80a9b Fix the home page is not set on first page created 2019-11-24 20:59:17 +01:00
Laurent Destailleur
61f414488a Fix translation 2019-11-24 18:34:07 +01:00
Laurent Destailleur
19fb6bfd17 FIX Use PROV as temporary ID for leaves 2019-11-24 18:25:55 +01:00
Laurent Destailleur
bc5270ce76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-24 18:15:25 +01:00
Laurent Destailleur
c7aaed1264 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-24 18:14:18 +01:00
Laurent Destailleur
8656143050 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:13:02 +01:00
Laurent Destailleur
98a7a5559f Fix bad fix 2019-11-24 18:12:40 +01:00
Laurent Destailleur
f2e01834a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:11:46 +01:00
Laurent Destailleur
27e4c66dd5 Fix empty 2019-11-24 18:11:11 +01:00
Laurent Destailleur
712ae48e4e Fix default setup 2019-11-24 18:07:38 +01:00
andreubisquerra
ddaf830de2
Merge pull request #1 from Dolibarr/develop
Update
2019-11-23 12:33:26 +01:00