Commit Graph

3905 Commits

Author SHA1 Message Date
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Regis Houssin
f5fe366525 FIX broken feature, wrong fk_parent_line 2022-09-16 15:03:53 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Regis Houssin
a3a973466f FIX broken feature, wrong fk_parent_line after cloning object 2022-09-13 15:16:17 +02:00
Laurent Destailleur
209bf00b69 Trans 2022-09-13 00:12:57 +02:00
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Laurent Destailleur
aa9036a0f5 Clean code 2022-09-08 15:05:51 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Laurent Destailleur
760c6e581e Merge pull request #22060 from grandoc/new_branch_03_09_2022
Update code
2022-09-03 11:44:36 +02:00
Philippe GRAND
7997776cbb Update code 2022-09-03 11:12:52 +02:00
Philippe GRAND
4a8f61838d Update code 2022-09-03 11:11:38 +02:00
Philippe GRAND
120fb10738 Update code 2022-09-03 11:09:59 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Laurent Destailleur
027e597776 Merge branch 'develop' into productbatch 2022-09-02 10:11:47 +02:00
stickler-ci
9a7ad0a7dc Fixing style errors. 2022-09-01 19:17:42 +00:00
UT from dolibit
33e112eda7 Update list.php 2022-09-01 21:06:30 +02:00
Philippe GRAND
9ba54b502d update code 2022-09-01 09:41:59 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
81c13bcc4c update code 2022-08-31 22:03:33 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Philippe GRAND
52fed85676 update code 2022-08-31 21:59:06 +02:00
Philippe GRAND
b04125f9f9 update code 2022-08-31 21:58:38 +02:00
Philippe GRAND
1b7934062f update code 2022-08-31 21:57:27 +02:00
Philippe GRAND
18fba7a8e7 update code 2022-08-31 21:56:58 +02:00
Philippe GRAND
c86617c7b1 update code 2022-08-31 21:56:30 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Philippe GRAND
f26b1cccdc update code 2022-08-31 21:55:54 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-08-30 19:38:35 +02:00
UT from dolibit
2b59e9261b Update index.php 2022-08-29 18:58:51 +02:00
Laurent Destailleur
5acd2b0702 Merge pull request #21917 from dolibit-ut/patch-444
Update card.php
2022-08-29 00:54:53 +02:00
UT from dolibit
c6c5ddd485 Update commande.class.php 2022-08-27 13:55:27 +02:00
stickler-ci
2ee2dfeea2 Fixing style errors. 2022-08-27 10:26:09 +00:00
UT from dolibit
765b8053cf Update card.php 2022-08-27 12:21:01 +02:00
Laurent Destailleur
bfb01ae928 Clean code 2022-08-26 18:24:42 +02:00
Laurent Destailleur
af69270a0e NEW Can enter the unit price including the vat 2022-08-26 17:39:41 +02:00
UT from dolibit
1efca018d9 Update list.php 2022-08-24 23:13:27 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
72c010622b FIX empty with hasRight and add phpunit to avoid this in future 2022-08-14 16:38:20 +02:00
Laurent Destailleur
24b1085639 Clean code. Prepare for inputing prices with taxes 2022-08-13 19:30:26 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
2022-08-10 13:16:02 +02:00
Regis Houssin
b20144c3d0 FIX php8 compatibility 2022-08-08 11:39:43 +02:00