Commit Graph

91166 Commits

Author SHA1 Message Date
Laurent Destailleur
cea61d3b52 Fix var 2020-10-31 12:44:14 +01:00
Laurent Destailleur
8d6fa350b9 Clean code 2020-10-31 12:41:26 +01:00
Laurent Destailleur
df7218b6a4 Fix for multicompany 2020-10-31 12:39:14 +01:00
Laurent Destailleur
b42361022d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-31 12:13:56 +01:00
Laurent Destailleur
fcb3245295 Fix for #15016 2020-10-31 12:11:41 +01:00
Laurent Destailleur
ee444f38f7
Merge pull request #15226 from frederic34/patch-6
fix update api_boms.class.php
2020-10-31 11:58:12 +01:00
Laurent Destailleur
9b9ee2c4e4
Merge pull request #15229 from frederic34/patch-13
fix undefined variable
2020-10-31 11:57:50 +01:00
Laurent Destailleur
b029ae5b6f
Merge pull request #15230 from frederic34/patch-14
fix undefined variable
2020-10-31 11:57:38 +01:00
Laurent Destailleur
bdfc723750
Merge pull request #15228 from frederic34/patch-10
fix undefined variable
2020-10-31 11:54:03 +01:00
Laurent Destailleur
fb1013229e
Merge pull request #15227 from frederic34/patch-8
fix undefined variable
2020-10-31 11:53:50 +01:00
Frédéric FRANCE
a64e676dad
fix undefined variable 2020-10-31 09:40:15 +01:00
Frédéric FRANCE
21a933f15c
fix undefined variable 2020-10-31 09:37:56 +01:00
Frédéric FRANCE
c6433ef58b
fix undefined variable 2020-10-31 09:32:00 +01:00
Frédéric FRANCE
f1beca0471
fix undefined variable 2020-10-31 09:27:58 +01:00
Frédéric FRANCE
9b10de3a8c
Update api_boms.class.php
public function update(User $user, $notrigger = false)
2020-10-31 09:22:02 +01:00
Laurent Destailleur
f7172a9a3c css 2020-10-31 04:50:26 +01:00
Laurent Destailleur
f53483f983 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-31 04:26:23 +01:00
Laurent Destailleur
fe3c00188e
Merge pull request #15225 from frederic34/patch-8
typo
2020-10-31 04:25:23 +01:00
Laurent Destailleur
e42dee3c8e
Merge pull request #15224 from frederic34/apiclean
doxygen
2020-10-31 04:24:53 +01:00
Laurent Destailleur
e35e4e6ee0
Merge pull request #15223 from frederic34/patch-6
doxygen
2020-10-31 04:24:12 +01:00
Laurent Destailleur
0a9c7fc577 Look and feel v13 2020-10-31 04:19:22 +01:00
Laurent Destailleur
44f532e1da Fix look and feel v13 2020-10-31 03:50:16 +01:00
Frédéric FRANCE
460af58134
typo 2020-10-30 22:09:15 +01:00
Laurent Destailleur
aafac6f989 Fix box of events 2020-10-30 18:58:40 +01:00
Laurent Destailleur
23d0d4635a Trans 2020-10-30 18:16:19 +01:00
Laurent Destailleur
4dbac98d8c
Merge pull request #15197 from aspangaro/14a2
NEW: Accountancy - Add a ledger for subaccount
2020-10-30 18:12:11 +01:00
Frédéric FRANCE
bdfc164130
Merge remote-tracking branch 'upstream/develop' into apiclean 2020-10-30 18:02:58 +01:00
Frédéric FRANCE
8190711342
doxygen 2020-10-30 18:01:01 +01:00
Laurent Destailleur
3cefb5f336
Update listbyaccount.php 2020-10-30 17:59:33 +01:00
Frédéric FRANCE
406cb5a2c9
Update api_boms.class.php 2020-10-30 17:49:16 +01:00
Laurent Destailleur
1ffb7eb2f4
Merge pull request #15222 from frederic34/patch-6
doxygen
2020-10-30 17:43:05 +01:00
Frédéric FRANCE
28adc985b0
Update api_setup.class.php 2020-10-30 17:31:57 +01:00
Frédéric FRANCE
b431d99996
Update api_memberstypes.class.php 2020-10-30 16:10:23 +01:00
Frédéric FRANCE
782e062ec7
Update api_thirdparties.class.php 2020-10-30 15:24:29 +01:00
Frédéric FRANCE
a317d71413
Update api_users.class.php 2020-10-30 15:23:05 +01:00
Frédéric FRANCE
38c2fea849
Update api_members.class.php 2020-10-30 15:21:28 +01:00
Laurent Destailleur
2614a951cd
Merge pull request #15220 from frederic34/patch-6
doxygen
2020-10-30 14:35:38 +01:00
Laurent Destailleur
64b9afc509 Fix bad column name 2020-10-30 14:33:16 +01:00
Laurent Destailleur
e5c683ebb7 Comment 2020-10-30 14:29:41 +01:00
Laurent Destailleur
cb3e204281 Fix use of dolibarr_main_distrib 2020-10-30 13:06:55 +01:00
Laurent Destailleur
2668efa132 Fix missing global 2020-10-30 12:44:29 +01:00
Frédéric FRANCE
412077ab51
doxygen 2020-10-30 08:24:02 +01:00
Laurent Destailleur
d4daf8b9ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/security2.lib.php
2020-10-30 05:59:45 +01:00
Laurent Destailleur
5504e3b236 Fix phpcs 2020-10-30 05:58:40 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
b3333da5c1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/main.inc.php
2020-10-30 04:39:41 +01:00
Laurent Destailleur
1a02504792 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/security2.lib.php
2020-10-30 04:26:09 +01:00
Laurent Destailleur
f51b02026c Fix regression 2020-10-30 04:24:06 +01:00
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
2020-10-30 04:21:07 +01:00
Laurent Destailleur
f5a156ee06 Fix regression 2020-10-30 04:17:02 +01:00