gauthier
|
f7e8131477
|
NEW : delay picto is currently useless because always displaied. If one day we add conf for supplier proposal in alert card, it will make sense, but not for now
|
2019-11-26 12:30:05 +01:00 |
|
Laurent Destailleur
|
5eb24ba240
|
Fix phpcs
|
2019-11-26 11:55:34 +01:00 |
|
Laurent Destailleur
|
4ef6c9cc13
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/ticket.lang
|
2019-11-26 11:54:42 +01:00 |
|
Laurent Destailleur
|
d1419f81da
|
Merge pull request #12390 from bb2a/patch-4
Use english name of subsitution variables for thirdparties
|
2019-11-26 10:26:45 +01:00 |
|
Laurent Destailleur
|
9e34e619be
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-11-26 09:51:03 +01:00 |
|
Laurent Destailleur
|
5e5c1ac574
|
Merge pull request #12512 from Mavyre/develop
NEW Added SumUp payment to TakePOS
|
2019-11-26 09:50:37 +01:00 |
|
Laurent Destailleur
|
357af16ce1
|
Update terminal.php
|
2019-11-26 09:47:56 +01:00 |
|
Laurent Destailleur
|
01ca5d8251
|
Update setup.php
|
2019-11-26 09:46:47 +01:00 |
|
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
|
c9cc503036
|
Merge pull request #12504 from hregis/10.0_mc
FIX compatibility with Multicompany
|
2019-11-26 09:22:20 +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
|
0a0fa3ec88
|
Merge pull request #12519 from aspangaro/10.0_p10
Fix Ticket - Align language type with datas for translation
|
2019-11-26 09:10:34 +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 |
|
Alexandre SPANGARO
|
6cc61fef9c
|
Fix Ticket - Deprecated <center>
|
2019-11-26 04:32:38 +01:00 |
|
Alexandre SPANGARO
|
60f19d134c
|
Fix Ticket - Align language type with datas for translation
|
2019-11-26 03:58:01 +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 |
|
stickler-ci
|
9ee0dc75f3
|
Fixing style errors.
|
2019-11-25 22:19:50 +00:00 |
|
Bastien Vidé
|
fb069d248a
|
Added SumUp payment to TakePOS
|
2019-11-25 23:15:39 +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 |
|