Commit Graph

97214 Commits

Author SHA1 Message Date
Laurent Destailleur
653ed82bb2 Fix empty page 2021-03-31 16:23:43 +02:00
Laurent Destailleur
05d9140f8f Look and feel 2021-03-31 15:28:12 +02:00
Laurent Destailleur
213544e4a7 Fix text 2021-03-31 15:26:34 +02:00
Laurent Destailleur
3face8b1c4 Debug feature to import stock movements from a file. 2021-03-31 15:15:07 +02:00
Laurent Destailleur
fafff6d9a4 Debug feature to import stock movements from a file. 2021-03-31 15:07:18 +02:00
Laurent Destailleur
66385d4ed5
Merge pull request #17059 from Hystepik/develop#3
new mass stock transfer with an import file
2021-03-31 14:02:17 +02:00
Laurent Destailleur
b695c4a1c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-31 13:59:35 +02:00
Laurent Destailleur
14c7ce7492 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/reception/card.php
2021-03-31 13:59:21 +02:00
Laurent Destailleur
89dbd745bf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/modAccounting.class.php
2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Laurent Destailleur
ddaaabfb7a
Merge pull request #17054 from aspangaro/12p13
FIX: Accountancy - Import in general ledger
2021-03-31 13:46:04 +02:00
Laurent Destailleur
521dec7792
Merge pull request #17018 from fmarcet/11.0
FIX: Show Ref.Supplier in LinkToObjectBlock
2021-03-31 13:44:53 +02:00
Laurent Destailleur
8be7ffb519
Merge pull request #17043 from dolibit-ut/patch-198
Update card.php
2021-03-31 13:42:09 +02:00
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
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