Commit Graph

97167 Commits

Author SHA1 Message Date
Laurent Destailleur
6aa1229c19 FIX #yogosha5791 2021-03-31 12:44:13 +02:00
Laurent Destailleur
625ade1a53 Clean log 2021-03-31 12:41:44 +02:00
Laurent Destailleur
06e92bb262 Fix compatibility php5.6+ 2021-03-30 22:03:14 +02:00
Laurent Destailleur
6ba725eb5e Fix sql error 2021-03-30 21:04:12 +02:00
Laurent Destailleur
38f1710b43 Merge pull request #17020 from Hystepik/develop#1
Close #4951 : New module Inventory
2021-03-30 20:43:52 +02:00
Laurent Destailleur
12f14f8bd5 Merge pull request #17021 from bb2a/add_option_warehouse_affect_thirparty
ADD Option warehouse affect thirparty
2021-03-30 19:47:19 +02:00
Laurent Destailleur
48f97d77df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-30 19:35:25 +02:00
Laurent Destailleur
5debcc2d43 Merge branch 'OPEN-DSI-new-propal-signature-date-and-user' into develop 2021-03-30 19:34:49 +02:00
Laurent Destailleur
cdd3e385e7 Merge branch 'new-propal-signature-date-and-user' of
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-03-30 19:34:25 +02:00
Laurent Destailleur
0c76d830fd Merge pull request #17031 from dolibit-ut/patch-193
Update PSWebServiceLibrary.class.php
2021-03-30 19:28:50 +02:00
Laurent Destailleur
7223512d47 Merge pull request #17030 from dolibit-ut/patch-192
Update type_translation.php
2021-03-30 19:23:01 +02:00
Laurent Destailleur
e763bb5483 Update type_translation.php 2021-03-30 19:22:51 +02:00
Laurent Destailleur
bea355fa62 Merge pull request #17025 from dolibit-ut/patch-188
Update card.php
2021-03-30 19:22:26 +02:00
Laurent Destailleur
dc23d8316c Merge pull request #17024 from dolibit-ut/patch-187
Update llx_20_c_departements.sql
2021-03-30 19:22:10 +02:00
Laurent Destailleur
fd410adcf3 Update llx_20_c_departements.sql 2021-03-30 19:22:02 +02:00
Laurent Destailleur
d6e6ca16a6 Merge pull request #17027 from dolibit-ut/patch-189
Update CODE_OF_CONDUCT.md
2021-03-30 19:21:44 +02:00
Laurent Destailleur
970b84834f Merge pull request #17028 from dolibit-ut/patch-190
Update COPYING
2021-03-30 19:21:19 +02:00
Laurent Destailleur
47e9f7c458 Merge pull request #17032 from atm-gauthier/fix_develop
FIX : several fix after lists uniformization
2021-03-30 19:20:15 +02:00
Laurent Destailleur
d6b5e24d96 Update payments.php 2021-03-30 19:20:02 +02:00
Laurent Destailleur
78b8af3a4a Merge pull request #17038 from frederic34/patch-3
fix missing global mod_facture_mars.php
2021-03-30 19:18:50 +02:00
Laurent Destailleur
32287d8734 Merge pull request #17036 from dolibit-ut/patch-196
Update box_supplier_orders_awaiting_reception.php
2021-03-30 19:18:20 +02:00
Laurent Destailleur
d905d2e22d Merge pull request #17035 from dolibit-ut/patch-195
Update box_accountancy_suspense_account.php
2021-03-30 19:18:12 +02:00
Laurent Destailleur
fa83b28505 Merge pull request #17037 from dolibit-ut/patch-197
Update canvas.class.php
2021-03-30 19:17:57 +02:00
Laurent Destailleur
56b44d2e33 Merge pull request #17034 from dolibit-ut/patch-194
Update sms.php
2021-03-30 19:17:41 +02:00
Laurent Destailleur
0a28db619b Merge pull request #17022 from dolibit-ut/patch-186
Update llx_10_c_regions.sql
2021-03-30 19:17:20 +02:00
Laurent Destailleur
ab58ba80c9 Update llx_10_c_regions.sql 2021-03-30 19:17:12 +02:00
Laurent Destailleur
fb5363388e Merge pull request #17039 from frederic34/patch-4
fix sql delete invoice
2021-03-30 19:16:22 +02:00
Laurent Destailleur
fb7cfe6c50 Fix sql error 2021-03-30 19:15:20 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Frédéric FRANCE
680850f168 fix sql delete invoice 2021-03-30 18:55:37 +02:00
Frédéric FRANCE
4c874ddf15 Update mod_facture_terre.php 2021-03-30 18:35:46 +02:00
Frédéric FRANCE
a9e720eec3 Update mod_facture_mars.php 2021-03-30 18:33:52 +02:00
UT from dolibit
34077d5b8a Update canvas.class.php 2021-03-30 18:31:36 +02:00
UT from dolibit
479421d923 Update box_supplier_orders_awaiting_reception.php
https://
2021-03-30 18:30:07 +02:00
UT from dolibit
0203eab0b0 Update box_accountancy_suspense_account.php
https://
2021-03-30 18:28:07 +02:00
Laurent Destailleur
05db680826 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-30 18:17:40 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
d2290a8e13 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:53:25 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
UT from dolibit
5935d7d082 Update sms.php
href="https://www.dolistore.com/
2021-03-30 17:42:44 +02:00
Laurent Destailleur
c80a8517d4 Fix position of line for ticket group 2021-03-30 17:39:48 +02:00
Laurent Destailleur
9ad3ba1572 Fix regression in export 2021-03-30 17:28:58 +02:00
stickler-ci
4903f92172 Fixing style errors. 2021-03-30 15:26:15 +00:00
Gauthier PC portable 024
3259d70e72 FIX : several fix after lists uniformization 2021-03-30 17:23:05 +02:00
UT from dolibit
87c9b4b9fd Update PSWebServiceLibrary.class.php
https://
2021-03-30 17:21:10 +02:00
UT from dolibit
0585712014 Update type_translation.php
LICENSE 
https://
2021-03-30 17:18:49 +02:00
UT from dolibit
17d0da2764 Update COPYING
<https://fsf.org/>
2021-03-30 17:16:16 +02:00
UT from dolibit
7a43031835 Update CODE_OF_CONDUCT.md
https
2021-03-30 17:14:11 +02:00
UT from dolibit
804fbd421d Update card.php 2021-03-30 16:44:41 +02:00
Laurent Destailleur
22af7a0d10 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/localtax/class/localtax.class.php
2021-03-30 16:21:14 +02:00