Commit Graph

93319 Commits

Author SHA1 Message Date
Frédéric FRANCE
ff25003025
fix unknown variable 2021-01-05 08:59:46 +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
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
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
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
00d7bbc30d
Merge pull request #15857 from frederic34/patch-8
doxygen
2021-01-04 14:07:32 +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
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
ptibogxiv
984c355f39 update stripe-php 7.67.0 2021-01-03 23:37:44 +01:00
Maxime Kohlhaas
e5fbb963a3 Fix picto in template 2021-01-03 22:53:04 +01:00
Maxime Kohlhaas
5792995b1f Fix function call 2021-01-03 22:52:36 +01:00
ptibogxiv
9be1ce7d20
NEW better date_valid on invoice
need hour minutes and secondes for better order and search
2021-01-03 20:25:35 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Maxime Kohlhaas
e190b010d3 Fix dict contact type element list 2021-01-03 16:05:04 +01:00
Laurent Destailleur
645b7694c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/db/DoliDB.class.php
2021-01-03 15:26:31 +01:00
Laurent Destailleur
8ad5dc81de GETPOST 2021-01-03 15:13:29 +01:00
Laurent Destailleur
f462f68056 Code comment 2021-01-03 15:10:33 +01:00
Laurent Destailleur
156e08894b Missing module 2021-01-03 14:32:10 +01:00
Laurent Destailleur
3cdcaa70d8 Fix warning 2021-01-03 14:29:22 +01:00
Alexandre SPANGARO
43423650cd NEW: Accountancy - Add closure menu in auguria menu 2021-01-03 11:57:40 +01:00
Alexandre SPANGARO
a8ecea1a89 NEW: Accountancy - Add closure menu in stable version 2021-01-03 11:54:50 +01:00
Maxime Kohlhaas
96411ed491 Fix use dolGetButton in templates 2021-01-02 18:05:18 +01:00
Laurent Destailleur
a3a7069c9c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:43:42 +01:00