Commit Graph

22973 Commits

Author SHA1 Message Date
Laurent Destailleur
6c2a17b29a Fix warning 2020-12-24 02:59:00 +01:00
Laurent Destailleur
3586da75a2 Fix warning 2020-12-24 02:52:49 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
055a2b6fec on goung 2020-12-23 23:44:38 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
1c73d38093 Fix api to download for shipments 2020-12-23 19:16:15 +01:00
Laurent Destailleur
9007e7be2a Fix sql for postgresql 2020-12-23 16:13:45 +01:00
Laurent Destailleur
70df6130b5 Fix SQL to export categories of contact
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Conflicts:
	htdocs/product/class/product.class.php
2020-12-23 15:45:33 +01:00
Laurent Destailleur
bf606ede12 Enhance remote ip detection 2020-12-23 13:27:30 +01:00
Laurent Destailleur
335eefe620 Fix link 2020-12-23 13:26:39 +01:00
Laurent Destailleur
53c6d92b0b Enhance remote ip detection 2020-12-23 13:17:40 +01:00
Florian HENRY
0c8939f46c modifié : htdocs/core/tpl/objectline_create.tpl.php
modifié :         htdocs/core/tpl/objectline_edit.tpl.php
2020-12-22 22:00:51 +01:00
Florian HENRY
311a555cc0 Merge github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2020-12-22 12:52:14 +01:00
Florian HENRY
fefc9040ab NEW : Display extrafields (for lines/det into line tr instead of ugly other tr 2020-12-22 12:52:01 +01:00
Florian Mortgat
64a62bf2c2 FIX (PR #15346 comment) use dol_mktime, not mktime 2020-12-22 09:37:30 +01:00
Laurent Destailleur
04d249cef0 Merge pull request #15792 from frederic34/notifications
simplify notications class
2020-12-21 18:14:04 +01:00
Laurent Destailleur
88837df442 Merge pull request #15790 from frederic34/fixphpcs_2020_12
fix phpcs
2020-12-21 18:10:01 +01:00
Laurent Destailleur
dfb632f2d5 Fix phpunit 2020-12-21 17:56:31 +01:00
Laurent Destailleur
4bc0b46556 css 2020-12-21 17:33:57 +01:00
Laurent Destailleur
14223d74bd Fix css 2020-12-21 15:00:29 +01:00
Laurent Destailleur
7d0e71165a Clean code 2020-12-21 14:40:27 +01:00
Gauthier PC portable 024
5116337e0b FIX : stickler feedbacks 2020-12-21 13:29:44 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Laurent Destailleur
6937ab75fa Fix test 2020-12-21 02:31:19 +01:00
Laurent Destailleur
0a19f3cf5b css 2020-12-21 02:27:05 +01:00
Laurent Destailleur
5dc6f5b89f Prepare 13.0 2020-12-21 01:33:06 +01:00
Laurent Destailleur
0a1387e673 Debug v13 2020-12-20 18:41:54 +01:00
Laurent Destailleur
7fae5ea800 Code clean 2020-12-20 18:21:34 +01:00
Laurent Destailleur
361f13154b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/card.php
	htdocs/margin/tabs/thirdpartyMargins.php
	htdocs/societe/card.php
	htdocs/societe/note.php
	htdocs/societe/notify/card.php
	htdocs/societe/societecontact.php
	htdocs/ticket/list.php
2020-12-20 14:31:54 +01:00
Laurent Destailleur
8c87050703 FIX Check of customer/vendor code fails in some cases 2020-12-20 13:54:02 +01:00
Frédéric FRANCE
b7b35f4cd4 simplify notications class 2020-12-20 11:04:21 +01:00
Laurent Destailleur
8d21eab6ab Fix buttond not working 2020-12-20 06:06:24 +01:00
Laurent Destailleur
6066a92b9d Fix API to get country 2020-12-19 22:34:33 +01:00
Laurent Destailleur
ef4a816c56 CSS 2020-12-19 15:56:21 +01:00
Laurent Destailleur
b6bb08ec2e Fix management of hreflang 2020-12-19 13:44:15 +01:00
Laurent Destailleur
fe93ee4d08 Debug website module for multilanguage 2020-12-19 13:03:40 +01:00
Laurent Destailleur
0eaf924d3b Add warning on non https website to axplain why features is broken 2020-12-18 15:08:00 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c Ajax combo at a better place (after select) 2020-12-17 21:42:10 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
e41898280d Merge pull request #15774 from aspangaro/13b3
Fix module intracommreport
2020-12-17 13:55:02 +01:00
Laurent Destailleur
075181a8d5 Look and feel v13 2020-12-17 12:25:50 +01:00
Laurent Destailleur
d0cc93c608 Fix look and feel v13 2020-12-17 12:09:12 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
Laurent Destailleur
36e0f07090 Remove warning 2020-12-17 08:52:39 +01:00