Commit Graph

100555 Commits

Author SHA1 Message Date
Laurent Destailleur
3c9d8bc931 Fix perms on API user 2021-05-17 16:17:03 +02:00
Laurent Destailleur
c54e010126 Fix perms on API user 2021-05-17 16:16:45 +02:00
Anthony Berton
9bde70feba Update user.class.php 2021-05-17 16:08:48 +02:00
Laurent Destailleur
cb9db6e3a8
Merge pull request #17630 from DorianVabre/Fix_11.0_api_user_right
Fix: user rest api rights
2021-05-17 15:58:11 +02:00
Laurent Destailleur
c0274e74ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 15:52:48 +02:00
Florian HENRY
6f3d19b7b6 dol_concatdesc better than concat operator 2021-05-17 15:12:25 +02:00
Damien BENOIT
68faa6d207
Merge pull request #22 from Dolibarr/develop
Update fork
2021-05-17 14:27:07 +02:00
Antonin MARCHAL
779c868eae fix mistake and removed hookmanager unused 2021-05-17 13:48:21 +02:00
Laurent Destailleur
bffdc8fa95
Merge pull request #17587 from FHenry/dev_fix_sale_top_menu_supplieronly
fix: when only supplier module is Active top menu should be displayed
2021-05-17 13:48:03 +02:00
Laurent Destailleur
4a488ad60a
Update eldy.lib.php 2021-05-17 13:47:48 +02:00
Antonin MARCHAL
c6aa078892 renamed LibStatut hook + removed useless hook 2021-05-17 13:46:01 +02:00
Laurent Destailleur
4e5a3a22c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 13:36:48 +02:00
Laurent Destailleur
7d82a20995 Add missing property 2021-05-17 13:36:27 +02:00
Laurent Destailleur
0121150e02
Merge pull request #17631 from fappels/14_reception
Fix: Add test to delete supplier order if reception exist
2021-05-17 13:22:34 +02:00
stickler-ci
a3aba28c95 Fixing style errors. 2021-05-17 10:06:41 +00:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Dorian Vabre
547f1dd370 Fix: user rest api rights 2021-05-17 11:54:53 +02:00
Florian HENRY
f95bd2f439 fixw that 2021-05-17 11:40:36 +02:00
Laurent Destailleur
1b25c4daa0 Fix phpcs 2021-05-17 11:29:51 +02:00
Laurent Destailleur
f25c57b1f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496 Fix colors 2021-05-17 11:26:31 +02:00
Laurent Destailleur
082ae2e627 Fix trans 2021-05-17 11:11:17 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Laurent Destailleur
5305a983c7
Merge pull request #17629 from fmarcet/11.0
Fix: Before there was no mistake
2021-05-17 10:30:46 +02:00
Laurent Destailleur
35c27b8eb8
Merge pull request #17588 from frederic34/completeTabHead
add sample completeTabHead for template modulebuilder
2021-05-17 10:29:51 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1
Fix  #17475 : Add of List-Unsubscribe in mass emailing
2021-05-17 10:23:21 +02:00
Ferran Marcet
f923c70f38 Fix: Before there was no mistake 2021-05-17 10:17:54 +02:00
Laurent Destailleur
21896370a6
Merge pull request #17528 from bb2a/phone_head_document
Add phone and address in popup Thirdparty info
2021-05-17 10:16:49 +02:00
Laurent Destailleur
261414cb7f
Update societe.class.php 2021-05-17 10:16:33 +02:00
Laurent Destailleur
1093e66d26
Update societe.class.php 2021-05-17 10:14:14 +02:00
Laurent Destailleur
d0c6afbe50
Merge pull request #17529 from Hystepik/develo#2
Fix Dolibarr#17477 : Sql error in invoices cards
2021-05-17 10:10:49 +02:00
Laurent Destailleur
a29f997fcd
Merge branch 'develop' into develo#2 2021-05-17 10:10:41 +02:00
Laurent Destailleur
296c1c2978
Merge pull request #17583 from AisukoWasTaken/develop
Fix SQL error for Panama Provinces
2021-05-17 10:09:15 +02:00
Laurent Destailleur
2637f9af63
Merge pull request #17586 from atm-quentin/FIX_missing_town_and_zip_filter
FIX missing town and zip filter in contract list sql request
2021-05-17 10:08:44 +02:00
Laurent Destailleur
0c2fe04557
Merge pull request #17590 from dolibit-ut/patch-322
Update countries_iso-3166_en.txt
2021-05-17 10:08:20 +02:00
Laurent Destailleur
ca5a2a23c9
Merge pull request #17591 from dolibit-ut/patch-323
Update vat_number_names.txt
2021-05-17 10:08:03 +02:00
Laurent Destailleur
979b66177d
Merge pull request #17589 from dolibit-ut/patch-321
Update llx_00_c_country.sql
2021-05-17 10:07:23 +02:00
Laurent Destailleur
4ea471a0e8
Merge pull request #17595 from dolibit-ut/patch-326
Update countries_iso-3166_fr.txt
2021-05-17 10:05:07 +02:00
Laurent Destailleur
31c68cc9f0
Merge pull request #17592 from dolibit-ut/patch-324
Update world_tax_rates.txt
2021-05-17 10:04:42 +02:00
Laurent Destailleur
80456db2a9
Merge pull request #17594 from dolibit-ut/patch-325
Update code_nace.txt
2021-05-17 09:56:34 +02:00
Laurent Destailleur
72eda2017a
Merge pull request #17596 from dolibit-ut/patch-327
Update address_format.txt
2021-05-17 09:56:12 +02:00
Laurent Destailleur
ce47cf4cf6
Merge pull request #17598 from dolibit-ut/patch-329
Update text.txt
2021-05-17 09:55:34 +02:00
Laurent Destailleur
6217d83846
Merge pull request #17599 from fbagnol/develop
Add soc in categories contacts list
2021-05-17 09:54:26 +02:00
Laurent Destailleur
f95f0748e3
Update viewcat.php 2021-05-17 09:54:04 +02:00
Laurent Destailleur
d3d187cc05
Merge pull request #17600 from Dolibarr/snyk-fix-53716a71864112b86bf16287ce335b0c
[Snyk] Security upgrade zapier-platform-core from 10.1.2 to 11.0.0
2021-05-17 09:48:56 +02:00
Laurent Destailleur
aa780eb00b
Merge pull request #17597 from dolibit-ut/patch-328
Update locales.txt
2021-05-17 09:47:34 +02:00
Laurent Destailleur
fd6147578a
Merge pull request #17611 from atm-maxime/fix/supplier_discount_replenish
Fix use supplier relative discount in replenish order creation
2021-05-17 09:44:39 +02:00
Laurent Destailleur
2f9a504dce Fix label 2021-05-17 09:30:09 +02:00
Laurent Destailleur
7bb71dd89f FIX #17602 2021-05-17 09:25:18 +02:00