Commit Graph

87479 Commits

Author SHA1 Message Date
Tobias Sekan
289886cd29 missing update 2020-06-25 14:37:09 +02:00
Tobias Sekan
22f708b95a Add search, sort, select for leave log view 2020-06-25 14:36:42 +02:00
Tobias Sekan
33a6b37e81 Merge pull request #25 from Dolibarr/develop
merge from develop
2020-06-25 11:45:39 +02:00
Laurent Destailleur
e146d0fe21 Fix url 2020-06-25 02:51:14 +02:00
Laurent Destailleur
c32151d356 Prepare page for stock at date 2020-06-25 01:07:30 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
9c23890c26 Fix phpcs 2020-06-24 20:03:12 +02:00
Laurent Destailleur
2865d6bd15 Fix set of free product 2020-06-24 13:39:00 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
Laurent Destailleur
b6c1cdad7c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
1762e10e69 Fix return code not returned 2020-06-24 09:55:10 +02:00
Laurent Destailleur
a854d955b8 Fix rounding 2020-06-23 16:08:31 +02:00
Laurent Destailleur
0363717476 Fix PROJECT_ELEMENTS_FOR_MINUS_MARGIN 2020-06-23 16:05:00 +02:00
Laurent Destailleur
7c992eac5e Fix option PROJECT_ELEMENTS_FOR_MINUS_MARGIN 2020-06-23 15:52:17 +02:00
Laurent Destailleur
d05c60baf0 Fix css 2020-06-23 14:33:34 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
4d2cbf7006 Fix alert picto of expired services not visible
Fix CSS
2020-06-23 11:27:40 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
a8c91069b2 Fix doliwamp installer 2020-06-22 15:24:42 +02:00
Laurent Destailleur
daba55762f Fix missing filter on status enabled 2020-06-22 13:07:34 +02:00
Laurent Destailleur
84d3d633e5 Fix typo 2020-06-22 11:34:54 +02:00
Laurent Destailleur
194a094d23 Fix deletion of a thirdparty must not delete the stripe account. 2020-06-22 11:32:58 +02:00
Laurent Destailleur
4cfb9dc7c5 css 2020-06-22 04:40:04 +02:00
Laurent Destailleur
058a0d4fa7 Fix look and feel v12 2020-06-22 04:27:16 +02:00
Laurent Destailleur
d816d45331 Look and feel v13 2020-06-22 04:10:13 +02:00
Laurent Destailleur
cdd4ed5b3d Update doc 12.0.0 2020-06-22 01:20:45 +02:00
Laurent Destailleur
984e3d112d Fix packager 2020-06-22 01:10:41 +02:00
Laurent Destailleur
1ce5b78a6b Fix error message not reported 2020-06-22 01:02:17 +02:00
Laurent Destailleur
119bf45177 Fix error in packaging 2020-06-22 00:41:21 +02:00
Laurent Destailleur
8ccaa0794e Update doc 2020-06-21 22:58:52 +02:00
Laurent Destailleur
0a22773eab Update doc 2020-06-21 22:58:08 +02:00
Laurent Destailleur
0139a840ae Fix setup 2020-06-21 20:49:34 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Laurent Destailleur
502c76fcfc log 2020-06-21 20:45:35 +02:00
Laurent Destailleur
cdcc87a565 Fix lang 2020-06-21 15:25:34 +02:00
Laurent Destailleur
d84fbb7165 css 2020-06-20 18:59:13 +02:00
Laurent Destailleur
3a0f950ad0 Fix phpcs 2020-06-20 18:46:49 +02:00
Laurent Destailleur
bb3320f103 FIX #14104 2020-06-20 18:34:19 +02:00
Laurent Destailleur
fe1f88d2ac FIX #14092 #14093 2020-06-20 16:09:53 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
871ba8d08c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-20 12:28:23 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
b54c18730b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
2020-06-20 12:25:08 +02:00
Laurent Destailleur
03b540b948 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2020-06-20 12:23:04 +02:00
andreubisquerra
515d18020d Add security check 2020-06-20 12:21:14 +02:00
andreubisquerra
532fe82c6e Fix travis 2020-06-20 12:21:06 +02:00
jove@bisquerra.com
ad432e1e9b Printable QR 2020-06-20 12:20:53 +02:00
Laurent Destailleur
70039d0c41 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-20 12:19:36 +02:00
Laurent Destailleur
450c340cb1 Trans 2020-06-20 12:19:25 +02:00
Laurent Destailleur
f4d0cdcec0 Merge pull request #14083 from andreubisquerra/master
Printable QR in TakePOS
2020-06-20 12:18:59 +02:00