Commit Graph

97383 Commits

Author SHA1 Message Date
Laurent Destailleur
addb9fd7e0
Merge pull request #17051 from frederic34/patch-3
use same code from actioncom card
2021-03-31 13:41:48 +02:00
Laurent Destailleur
2bc6bde8cb
Merge pull request #17049 from FHenry/13_fix_receptionfourn
fix : test on reception must be done on lineToTest if checked
2021-03-31 13:41:19 +02:00
Laurent Destailleur
7641f7258b
Merge pull request #17044 from aspangaro/14a27
FIX: Add a sub table to manage accountancy on product/company
2021-03-31 13:39:17 +02:00
Laurent Destailleur
23b49c2138
Merge pull request #17045 from dolibit-ut/patch-200
Update linphone.sh
2021-03-31 13:38:03 +02:00
Laurent Destailleur
c6905151b9
Merge pull request #17046 from dolibit-ut/patch-201
Update README.md
2021-03-31 13:37:49 +02:00
Laurent Destailleur
998752a3d7
Merge pull request #17047 from dolibit-ut/patch-202
Update ChangeLog
2021-03-31 13:37:30 +02:00
Laurent Destailleur
050617bd52
Merge pull request #17048 from dolibit-ut/patch-199
Update ekiga.sh
2021-03-31 13:37:10 +02:00
Laurent Destailleur
9b244671f9
Merge pull request #17057 from atm-gauthier/fix_uniformisation_payment_salary
FIX : last uniformizations
2021-03-31 13:36:54 +02:00
Laurent Destailleur
6060dedb52
Merge pull request #17056 from OPEN-DSI/new-propal-signature-date-langs-en
NEW translate in "en_US" to complete PR 16980
2021-03-31 13:10:36 +02:00
Laurent Destailleur
e4b01b7ffc FIX #yogosha5791 2021-03-31 13:01:49 +02:00
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
Hystepik
69c47f1d39
Merge branch 'develop' into develop#3 2021-03-31 12:21:28 +02:00
lmarcouiller
633b8f1431 Close #16761 : Info template import 2021-03-31 12:18:31 +02:00
lmarcouiller
bd092cc84d Close #16761 : new mass stock transfer 2021-03-31 12:04:37 +02:00
Gauthier PC portable 024
96ea23f0fa Merge branch 'fix_uniformisation_payment_salary' of github.com:atm-gauthier/dolibarr into fix_uniformisation_payment_salary 2021-03-31 10:34:36 +02:00
Gauthier PC portable 024
c27c52331a FIX : default value 2021-03-31 10:34:21 +02:00
stickler-ci
508dc33749 Fixing style errors. 2021-03-31 08:16:02 +00:00
Gauthier PC portable 024
19265179ca FIX : last uniformizations 2021-03-31 10:11:51 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
lvessiller
4e1b84af45 NEW translate in "en_US" to complete PR 16980 2021-03-31 08:27:27 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Alexandre SPANGARO
9b65529fc7 NEW: Accountancy - Add FEC import 2021-03-31 04:59:12 +02:00
Alexandre SPANGARO
5723dbb836 FIX: Add a sub table to manage accountancy on product/company 2021-03-31 04:52:24 +02:00
Alexandre SPANGARO
8ac5d91f20 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-31 04:35:48 +02:00
Frédéric FRANCE
d13435cc84
use same code from actioncom card 2021-03-31 00:46:47 +02:00
Florian HENRY
cd37d3440a fix : test on reception must be done on lineToTest if checked 2021-03-30 23:04:29 +02:00
Florian HENRY
0f6dae313d fix : test on reception must be done on lineToTest if checked 2021-03-30 23:02:53 +02:00
UT from dolibit
6845967f56
Update ChangeLog 2021-03-30 22:45:03 +02:00
UT from dolibit
3ffc7a466f
Update README.md 2021-03-30 22:33:06 +02:00
UT from dolibit
0c2230cb03
Update linphone.sh 2021-03-30 22:28:31 +02:00
UT from dolibit
dd4c941f47
Update ekiga.sh 2021-03-30 22:27:33 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
UT from dolibit
ba84a36282
Update card.php
$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
2021-03-30 22:12:13 +02:00
Alexandre SPANGARO
4e30481fa2 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-30 22:05:03 +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