Commit Graph

3689 Commits

Author SHA1 Message Date
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-07 15:51:01 +01:00
Laurent Destailleur
53bac7ae0f Fix menu 2022-02-07 15:16:11 +01:00
lvessiller
241a65e2ae NEW add margin info in proposal and order list 2022-02-03 10:39:03 +01:00
Laurent Destailleur
adf8f3886b Merge 2022-01-28 18:07:56 +01:00
Laurent Destailleur
2686541156 Fix late picto 2022-01-28 17:59:58 +01:00
ptibogxiv
928075bbf6 fix error in commande.class.php 2022-01-26 20:13:10 +01:00
Laurent Destailleur
8dbadc0aa8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 14:12:06 +01:00
Laurent Destailleur
6b5c0769b8 FIX #19786 2022-01-24 14:09:53 +01:00
ptibogxiv
b89947ff7c Update commande.class.php 2022-01-20 19:58:31 +01:00
ptibogxiv
56dd41324c Update commande.class.php 2022-01-20 19:57:48 +01:00
ptibogxiv
accb0deb29 New support user_modif in order 2022-01-16 00:13:14 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
2022-01-14 10:30:39 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
19efa37e4b Fix default value #19562 2021-12-19 20:55:24 +01:00
Laurent Destailleur
bb1d5daa82 css 2021-12-12 23:47:40 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
atm-greg
db06de0ac2 add printFieldListHaving hook 2021-11-30 16:28:21 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
4189229b84 Merge pull request #19165 from Hystepik/develop#5
Fix: php 8.0 warning commercial part
2021-11-30 15:31:51 +01:00
atm-greg
71d4b3f082 add hook // Add from hooks 2021-11-29 17:02:57 +01:00
atm-greg
1dffc1c0fa add hook to uniformize printFieldListFrom hook 2021-11-29 16:54:26 +01:00
Christian Foellmann
819a76e16a remove some deprecated html attributes
https://developer.mozilla.org/en-US/docs/web/html/element/td#attr-align
2021-11-29 15:07:07 +01:00
Laurent Destailleur
ee14aa2597 Fix: Do not loose data on error when editing a line 2021-11-23 12:11:27 +01:00
lmarcouiller
d1f5cb9184 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-11-19 14:01:52 +01:00
lmarcouiller
3bcafb548a fix errors 2021-11-19 14:01:37 +01:00
Gauthier PC portable 024
23249751d5 FIX : reorder all lines when delete document line everywhere 2021-11-17 12:10:12 +01:00
Laurent Destailleur
257fe444af Merge pull request #19181 from frederic34/commandelist
fix warnings in commande list
2021-11-05 14:32:17 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Frédéric FRANCE
8db7989aa7 fix warnings in commande list 2021-10-24 14:18:43 +02:00
Lucas Marcouiller
051f6ca717 Fix: php 8.0 warning commercial part 2021-10-23 23:12:42 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
06bc357409 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 14:49:50 +02:00
Laurent Destailleur
3f60cbbedc Remove the div class="ficheaddleft" 2021-10-23 14:49:35 +02:00
Laurent Destailleur
6ec19bca9d Merge pull request #19128 from frederic34/warnfixes
fix warnings
2021-10-23 11:38:03 +02:00
Lucas Marcouiller
d1ec71197a Fix : scrutinizer errors 2021-10-23 11:10:58 +02:00
Frédéric FRANCE
9bd31d2b85 fix warnings 2021-10-23 07:13:08 +02:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
6c870bb3d1 Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
fix: scrutinizer
2021-10-21 22:52:20 +02:00
Florian HENRY
258d0c3a69 fix: scrutinizer 2021-10-21 16:05:37 +02:00
Laurent Destailleur
12d211815b Debug v15 2021-10-19 21:38:36 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00