Commit Graph

93340 Commits

Author SHA1 Message Date
UT from dolibit
19b8123ddf
Update check.php
$arrayphpminversionwarning = array(5, 6, 0);
2021-01-05 18:09:59 +01:00
Laurent Destailleur
a93227ac2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
2e04aa4e03 Fix warning 2021-01-05 11:29:40 +01:00
Laurent Destailleur
5e92ed0dcd Fix load lang 2021-01-05 10:44:28 +01:00
Laurent Destailleur
7dd1f28a5c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-05 10:40:10 +01:00
Laurent Destailleur
40645ea24d Fix load lang 2021-01-05 10:39:53 +01:00
Laurent Destailleur
64b4f1079d Close #15870 manually 2021-01-05 02:23:38 +01:00
Laurent Destailleur
8afe9b3aa5
Merge pull request #15876 from zuiko/patch-5
Fix #15849 on V12 branch
2021-01-05 02:03:00 +01:00
Laurent Destailleur
dc1faca816
Merge branch 'develop' into patch-5 2021-01-05 02:01:51 +01:00
Alexandre SPANGARO
9cea8b8244 FIX: Loan - Payment in not integrate in bank due to a problem with the type of payment 2021-01-05 01:56:24 +01:00
Laurent Destailleur
702d8f9f37 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into
develop

Conflicts:
	htdocs/theme/eldy/info-box.inc.php
2021-01-05 01:48:25 +01:00
Laurent Destailleur
dcda3ec4b0
Merge pull request #15872 from aspangaro/13b6
FIX: Loan - Payment in not integrate in bank due to a problem with the type of payment
2021-01-05 01:41:57 +01:00
Laurent Destailleur
7efd8add39
Merge pull request #15878 from frederic34/patch-10
doxygen
2021-01-05 01:41:02 +01:00
Laurent Destailleur
62315462e0
Merge pull request #15877 from frederic34/patch-8
doxygen
2021-01-05 01:40:45 +01:00
Frédéric FRANCE
eeaac549e2
doxygen 2021-01-05 00:11:19 +01:00
Frédéric FRANCE
c468db5a7c
doxygen 2021-01-04 23:41:20 +01:00
zuiko
0efd5934f4
Update fournisseurs.php
FIX #15849
2021-01-04 21:56:47 +01:00
zuiko
dd55f9ca91
update objectline_create.tpl.php
FIX #15849
2021-01-04 21:46:47 +01:00
Laurent Destailleur
f8fe7b5a0e FIX #15851 2021-01-04 16:38:09 +01:00
Laurent Destailleur
c58451dbb6 Code comment 2021-01-04 16:07:54 +01:00
Alexandre SPANGARO
62d91c3631 FIX: Loan - Payment in not integrate in bank due to a problem with the type of payment 2021-01-04 16:07:47 +01:00
Laurent Destailleur
07a3367f52
Merge pull request #15624 from StephaneLesage/edit-extrafield-computed-multiline
Create/Edit extra-field computed value with multi-line text area
2021-01-04 15:57:50 +01:00
Laurent Destailleur
e488f94af3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-04 15:39:48 +01:00
Laurent Destailleur
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Laurent Destailleur
243a3f9680
Merge pull request #15852 from aspangaro/14a8
NEW: Add total in agent margin & uniformize code
2021-01-04 14:09:59 +01:00
Laurent Destailleur
b3142c3250
Merge pull request #15859 from frederic34/htmlformmail_doxygen
doxygen
2021-01-04 14:08:51 +01:00
Laurent Destailleur
00cb253873
Merge pull request #15858 from frederic34/patch-10
syntax error
2021-01-04 14:07:56 +01:00
Laurent Destailleur
00d7bbc30d
Merge pull request #15857 from frederic34/patch-8
doxygen
2021-01-04 14:07:32 +01:00
Laurent Destailleur
4d09d3a576
Merge pull request #15860 from fappels/13_debug_shipments
Some debug on Shipments and reception.
2021-01-04 14:06:52 +01:00
Laurent Destailleur
485d363d79 Update doc 2021-01-04 14:03:00 +01:00
Laurent Destailleur
0b240453e9 NEW Upgrade Stripe PHP lib to 7.67.0 2021-01-04 13:56:52 +01:00
Laurent Destailleur
bc0ec86d4b
Merge pull request #15868 from ptibogxiv/13.0
update stripe-php 7.67.0
2021-01-04 13:55:20 +01:00
Laurent Destailleur
ef76c067e0 Add limit to 25000 2021-01-04 13:37:21 +01:00
Laurent Destailleur
8df5928e9c Fix selection must depends on enabled modules 2021-01-04 13:32:43 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
5c104e344c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/ticket/list.php
2021-01-04 12:17:59 +01:00
Laurent Destailleur
71e6d20cb5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-04 12:08:27 +01:00
Laurent Destailleur
66bd040d2c Fix regression 2021-01-04 12:08:14 +01:00
Laurent Destailleur
c866e2c43e
Merge pull request #15869 from aspangaro/13b6
FIX: Loan - Missing fk_bank when we add payment with schedule & amount insurance / interest is inverted
2021-01-04 12:03:33 +01:00
Laurent Destailleur
1960c712df
Merge pull request #15866 from atm-maxime/fix_contactelement
Fix dict contact type element list
2021-01-04 12:02:57 +01:00
Laurent Destailleur
bb22f2ccaf
Update admin.lib.php 2021-01-04 12:02:41 +01:00
Laurent Destailleur
f829845405
Merge pull request #15861 from atm-maxime/fix_modulebuilder_template_buttons
Fix use dolGetButton in templates
2021-01-04 11:58:13 +01:00
stickler-ci
30cd041209 Fixing style errors. 2021-01-04 10:57:18 +00:00
Laurent Destailleur
82395d578b
Update myobject_card.php 2021-01-04 11:56:56 +01:00
Laurent Destailleur
8522d52748
Merge pull request #15864 from aspangaro/14a9
NEW: Accountancy - Add closure menu
2021-01-04 11:45:32 +01:00
Laurent Destailleur
05d6b6007e
Merge pull request #15867 from ptibogxiv/patch-404
NEW better date_valid on invoice
2021-01-04 11:44:20 +01:00
Juanjo Menent
d892d8c3c7 FIX: Bad dates filtering in the ticket list causes sql error 2021-01-04 10:59:45 +01:00
Alexandre SPANGARO
8f4fc046ec FIX: Loan - amount insurance / interest is inverted 2021-01-04 06:57:56 +01:00
Alexandre SPANGARO
433ddd61a7 FIX: Loan - Missing fk_bank when we add payment with schedule 2021-01-04 06:57:10 +01:00