Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
100,555 Commits 36 Branches 189 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

88737 Commits

Author SHA1 Message Date
Laurent Destailleur
c03958a867 Fix look and feel v14 2021-06-23 19:02:14 +02:00
Laurent Destailleur
743474513b Fix option SOCIETE_ASK_FOR_WAREHOUSE 2021-06-23 16:53:26 +02:00
Laurent Destailleur
4327d53c60 Fix closing linkto section when js on. 2021-06-23 14:38:24 +02:00
Laurent Destailleur
a657fe2fca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-23 13:31:40 +02:00
Laurent Destailleur
6db44e66d6 FIX #18006 2021-06-23 13:30:00 +02:00
Laurent Destailleur
293b67a693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/cashcontrol/report.php
 2021-06-23 13:08:05 +02:00
Laurent Destailleur
acce226c05 Debug cash fence feature (missing report per vat rate) 2021-06-23 13:00:50 +02:00
Laurent Destailleur
3a30d41fbf Fix missing properties 2021-06-23 11:44:10 +02:00
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +02:00
Laurent Destailleur
c46097ccd9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2021-06-23 11:39:17 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Laurent Destailleur
f24d8a31af Fix migration 2021-06-23 11:14:28 +02:00
Laurent Destailleur
eb9be15c4c Fix php8 2021-06-23 10:52:05 +02:00
Laurent Destailleur
c9d4ccd40a Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block 
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
 2021-06-23 10:48:22 +02:00
Laurent Destailleur
9c657206b3 Update linkedobjectblock.tpl.php 2021-06-23 10:47:51 +02:00
Laurent Destailleur
56212508e7 Update linkedobjectblock.tpl.php 2021-06-23 10:47:23 +02:00
Laurent Destailleur
82ee5c2825 Clean code 2021-06-23 10:42:27 +02:00
Laurent Destailleur
d57699b7d7 css 2021-06-23 10:22:51 +02:00
Laurent Destailleur
3bc1f90589 Fix rounding 2021-06-23 02:51:31 +02:00
Laurent Destailleur
5c6c708531 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-23 02:45:22 +02:00
Laurent Destailleur
40b35cc44a Fix upload file form has disappear 2021-06-23 02:45:06 +02:00
Laurent Destailleur
95680a585c Merge pull request #17997 from frederic34/patch-9 
move admin warnings on top instead bottom
 2021-06-23 02:33:00 +02:00
Laurent Destailleur
30087bd16a Merge pull request #18001 from aspangaro/14b15 
Fix Forget information in tooltip for direct download
 2021-06-23 02:31:45 +02:00
Laurent Destailleur
cf28fcc8cd CSS 2021-06-23 02:22:49 +02:00
Laurent Destailleur
62822c424c Fix php8 2021-06-23 01:34:14 +02:00
Laurent Destailleur
28d416a00d Try fix of phpunit 2021-06-23 00:58:27 +02:00
Laurent Destailleur
de7df8ad9f Fix lang 2021-06-22 19:11:58 +02:00
Laurent Destailleur
c08255657e Fix pgsql 2021-06-22 18:59:14 +02:00
Laurent Destailleur
12748640a5 Add log 2021-06-22 18:04:06 +02:00
Laurent Destailleur
ecd028d124 Clean code 2021-06-22 17:33:43 +02:00
Laurent Destailleur
bcffbe3d67 Test fix 2021-06-22 17:09:02 +02:00
Laurent Destailleur
f6eb5b76f5 css 2021-06-22 15:45:47 +02:00
Laurent Destailleur
2f6a91f506 Look and feel v14 2021-06-22 15:25:49 +02:00
Alexandre SPANGARO
f1a5d4009f Merge remote-tracking branch 'upstream/develop' into 14b15 2021-06-22 14:07:52 +02:00
Laurent Destailleur
d6e9947cd4 CSS 2021-06-22 12:30:50 +02:00
Laurent Destailleur
312968eeac Clean code 2021-06-22 11:38:02 +02:00
Laurent Destailleur
8887f71c26 Doc 2021-06-22 10:57:16 +02:00
Laurent Destailleur
05c0bc4fac css 2021-06-22 10:44:49 +02:00
Alexandre SPANGARO
23f6e183d3 Forget information in tooltip for direct download 2021-06-21 21:51:41 +02:00
Laurent Destailleur
6702a452e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-21 20:58:58 +02:00
Laurent Destailleur
6014e4407f Clean code 2021-06-21 20:50:56 +02:00
Laurent Destailleur
a0b594fbdc Debug emailcollector 2021-06-21 19:47:43 +02:00
damien clochard
05bb2c720d FIX #17996: Avoid implicit type casts for llx_adherent_type.subscription 
The llx_adherent_type.subscription column is VARCHAR so we need to
compare it with a string, not an int.
 2021-06-21 18:24:52 +02:00
Laurent Destailleur
31db1dc412 Fix management of visibility of export/import templates. 2021-06-21 15:03:45 +02:00
Laurent Destailleur
5697e86c09 Fix columns for export/import profile 2021-06-21 14:12:33 +02:00
Laurent Destailleur
ac8564dc34 Fix disable token renewal on .css.php, .js.php and .json.php 2021-06-21 13:06:40 +02:00
Laurent Destailleur
aca190d977 Fix css 2021-06-21 12:46:24 +02:00
Laurent Destailleur
9c0ab1960b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-21 12:46:15 +02:00
Laurent Destailleur
ab2e50ef49 Fix css 2021-06-21 12:46:03 +02:00
Laurent Destailleur
561e75d0f8 Merge pull request #17992 from frederic34/patch-8 
fix warnings
 2021-06-21 11:39:40 +02:00