Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
f2a9db5fe3 Typo 2022-06-27 22:45:09 +02:00
Laurent Destailleur
0e0c9888a2 Typo 2022-06-27 22:43:29 +02:00
Laurent Destailleur
748c714b1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-27 22:36:31 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Laurent Destailleur
1d354aa844
Merge pull request #21380 from cfoellmann/PR/fix-fetch-propal-conds
fix fetching mode_reglement default from soc/comm on propal creation
2022-06-27 17:34:54 +02:00
Laurent Destailleur
3e0bc05edd
Update card.php 2022-06-27 17:34:25 +02:00
Laurent Destailleur
79ca774de3
Merge pull request #21393 from Dolibarr/dependabot/github_actions/actions/checkout-3
Bump actions/checkout from 2 to 3
2022-06-27 17:32:55 +02:00
Christian Foellmann
236f6ad23b fix fetching mode_reglement default from soc/comm on propal creation 2022-06-27 13:11:31 +02:00
Christian Foellmann
4335e67249 remove old commented code 2022-06-27 12:59:06 +02:00
stickler-ci
23d948cec4 Fixing style errors. 2022-06-27 10:56:08 +00:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
35187e2e2f
Merge pull request #21291 from Quatadah/dolicloud-qnasdami-scrutinizer-015
BUG FIX : Temporary transformation (from string to array) so it can be traversable
2022-06-27 12:24:40 +02:00
Laurent Destailleur
252215402f
Merge pull request #21260 from Quatadah/dolicloud-qnasdami-scrutinizer-009
BUG FIX : changing function name to existing one (2)
2022-06-27 12:23:53 +02:00
Laurent Destailleur
7c4a6a6624
Merge pull request #21389 from bb2a/FIX---php-V8-expedition-card
FIX - php V8 expedition card
2022-06-27 12:23:08 +02:00
Laurent Destailleur
cf34d07d5d
Update card.php 2022-06-27 12:22:46 +02:00
Laurent Destailleur
0d25e3d236
Merge pull request #21392 from bb2a/FIX---php-V8-order-liste
FIX - php V8 order liste
2022-06-27 12:20:31 +02:00
Laurent Destailleur
3eec5f0e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-27 12:16:17 +02:00
Laurent Destailleur
11e11c99b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-27 12:12:07 +02:00
Laurent Destailleur
bbd2f05e3a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-06-27 12:11:40 +02:00
Laurent Destailleur
6e5cbd9f08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-27 12:09:42 +02:00
Laurent Destailleur
b29393c6c6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-27 12:09:19 +02:00
Laurent Destailleur
3a664521c7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-27 12:08:53 +02:00
Laurent Destailleur
bcfb4c8ba3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-27 12:08:46 +02:00
Laurent Destailleur
69cbe48a75 doc 2022-06-27 12:07:34 +02:00
Laurent Destailleur
fb1a548a1e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-27 12:05:44 +02:00
dependabot[bot]
9464fe0abc
Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-27 09:52:41 +00:00
Laurent Destailleur
9372b69eb4 clean code 2022-06-27 11:52:33 +02:00
Laurent Destailleur
bc81f372ac
Merge pull request #21362 from bb2a/FIX---Cancel-order
FIX - Right close order
2022-06-27 11:46:55 +02:00
Laurent Destailleur
bec187b9b4
Merge pull request #21370 from atm-lena/develop_FIX_TransferCorrectionStock_Extrafields
FIX : don't display product's extrafields for transer / correction stock
2022-06-27 11:45:31 +02:00
Laurent Destailleur
fdb5eedd12
Merge pull request #21366 from turrisxyz/Dependabot-GitHub-Actions
chore: Included githubactions in the dependabot config
2022-06-27 11:43:46 +02:00
Laurent Destailleur
c94c9487f8
Merge pull request #21367 from frederic34/patch-4
Delete target.class.php.back
2022-06-27 11:39:47 +02:00
Laurent Destailleur
a1f974f356
Merge pull request #21374 from aspangaro/17p2
Look & Feel v16 - Align amount to right on card
2022-06-27 11:39:31 +02:00
Laurent Destailleur
917b295810
Merge pull request #21375 from aspangaro/16p5-php8
PHP8 warning & typo on key
2022-06-27 11:38:28 +02:00
Laurent Destailleur
d6aa53168c
Merge pull request #21379 from cfoellmann/PR/fix-disable-product-accounting
fix PRODUCT_DISABLE_ACCOUNTING
2022-06-27 11:33:42 +02:00
Laurent Destailleur
7254c7d631
Merge pull request #21381 from cfoellmann/PR/fix-soc-link
set the target for SOC links on proposals and invoices to the customer tab
2022-06-27 11:30:37 +02:00
Laurent Destailleur
2284a2051e
Merge pull request #21383 from daraelmin/patch-2
Fix css class declared in wrong param
2022-06-27 11:30:00 +02:00
Laurent Destailleur
80ccdd1c5c
Merge pull request #21384 from aspangaro/17p5-PCNLux
NEW Add chart of accounts PCN2020 for Luxemburg
2022-06-27 11:29:20 +02:00
BB2A Anthony Berton
2208d39b39 FIX - php V8 order liste 2022-06-27 11:29:15 +02:00
Laurent Destailleur
446b087b7e
Merge pull request #21386 from cfoellmann/PR/fix-prodsrv-list
fix PRODUCT_DISABLE_ACCOUNTING + STOCK_SUPPORT_SERVICES
2022-06-27 11:27:46 +02:00
Laurent Destailleur
149fc6ed83
Update list.php 2022-06-27 11:26:57 +02:00
Laurent Destailleur
d2ed38ee1b
Merge pull request #21387 from ptibogxiv/patch-22
Fix REST API for categories
2022-06-27 11:24:04 +02:00
Anthony Berton
bc375ad007
Merge branch 'develop' into FIX---php-V8-expedition-card 2022-06-27 11:19:22 +02:00
Anthony Berton
bcdbcf5070
Update card.php 2022-06-27 11:18:38 +02:00
Anthony Berton
3a8f479db7
Update card.php 2022-06-27 11:16:50 +02:00
Laurent Destailleur
7ca7dcc8fc
Merge pull request #21390 from bb2a/FIX---php-V8-composition-card
FIX - php V8 composition card
2022-06-27 11:12:06 +02:00
Laurent Destailleur
834d129634
Update product.class.php 2022-06-27 11:11:43 +02:00
Laurent Destailleur
62523cb526
Merge pull request #21391 from bb2a/FIX---php-V8-product-batch
FIX - php V8 product batch
2022-06-27 11:11:13 +02:00
Laurent Destailleur
7e94eaac07 Debug v16 2022-06-27 10:53:03 +02:00
Laurent Destailleur
f09638972c Debug v16 2022-06-27 10:45:04 +02:00
Laurent Destailleur
4e46c3f7a2 Clean code 2022-06-27 10:17:14 +02:00