Laurent Destailleur
|
4d58dd05aa
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-05 14:31:07 +01:00 |
|
Laurent Destailleur
|
9515467300
|
Merge pull request #13005 from RubenRuCh/11.0
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
|
2020-02-05 14:30:40 +01:00 |
|
Tobias Sekan
|
eca0016778
|
Fix wrong category name on user category card
|
2020-02-05 14:17:41 +01:00 |
|
Laurent Destailleur
|
c015707cbc
|
Fix Only dolibarr logos are in root of theme
|
2020-02-05 14:14:59 +01:00 |
|
andreubisquerra
|
220f02805d
|
Update image path after move image directory
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
Conflicts:
htdocs/core/class/dolreceiptprinter.class.php
|
2020-02-05 14:12:29 +01:00 |
|
Laurent Destailleur
|
5a81e3e181
|
Merge pull request #13012 from ptibogxiv/patch-299
fix url field in edit mode societe/card.php
|
2020-02-05 14:09:04 +01:00 |
|
Laurent Destailleur
|
2cf970f617
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-05 12:51:54 +01:00 |
|
Laurent Destailleur
|
ac5b8ef0e0
|
Merge pull request #13030 from ptibogxiv/patch-300
new fix Count of Stripe payment mode must take test/live into account
|
2020-02-05 12:50:05 +01:00 |
|
Laurent Destailleur
|
f8daed7f56
|
Update company.lib.php
|
2020-02-05 12:49:56 +01:00 |
|
Tobias Sekan
|
efcd4d0c63
|
Fix unset gender property in contact class
|
2020-02-05 12:34:29 +01:00 |
|
ptibogxiv
|
94fd2b40c7
|
new fix Count of Stripe payment mode must take test/live into account
fix error message for if no stripe enabled 0b891d5e0c
|
2020-02-05 12:04:27 +01:00 |
|
Laurent Destailleur
|
0b891d5e0c
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:47 +01:00 |
|
Laurent Destailleur
|
af7a5b510d
|
Fix phpcs
|
2020-02-04 14:47:30 +01:00 |
|
Laurent Destailleur
|
c5da131749
|
Fix param not defined
|
2020-02-04 14:40:11 +01:00 |
|
Laurent Destailleur
|
bb9f4c8ec3
|
Fix var_dump
|
2020-02-04 14:34:40 +01:00 |
|
AdrianDominik
|
4695172028
|
Merge remote-tracking branch 'upstream/11.0' into 11.0
|
2020-02-04 11:40:37 +01:00 |
|
Laurent Destailleur
|
c367c6f34e
|
Avoid warning
|
2020-02-03 21:17:45 +01:00 |
|
Laurent Destailleur
|
d4ae8b81e4
|
Card examples
|
2020-02-03 20:49:21 +01:00 |
|
Laurent Destailleur
|
36461afea9
|
FIX Creation of Stripe card from backoffice must return a clean message
|
2020-02-03 14:55:02 +01:00 |
|
ptibogxiv
|
eb5ac0d9a9
|
fix url field in edit mode societe/card.php
|
2020-02-03 14:28:57 +01:00 |
|
AdrianDominik
|
cc09257fcd
|
Withdrawing changes
|
2020-02-03 10:04:58 +01:00 |
|
AdrianDominik
|
cb657d4b3b
|
Merge remote-tracking branch 'origin/11.0' into 11.0
|
2020-02-03 09:57:37 +01:00 |
|
stickler-ci
|
ae95cc6869
|
Fixing style errors.
|
2020-02-03 09:54:35 +01:00 |
|
AdrianDominik
|
9f7b51938f
|
FIX: #12908 User login with credentials from self-subscription form fails
|
2020-02-03 09:54:35 +01:00 |
|
stickler-ci
|
5dcd5e5b87
|
Fixing style errors.
|
2020-02-03 09:54:35 +01:00 |
|
AdrianDominik
|
ed269a387f
|
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
|
2020-02-03 09:54:34 +01:00 |
|
AdrianDominik
|
ad2e10a679
|
FIX: #12908 User login with credentials from self-subscription form fails
|
2020-02-03 09:54:34 +01:00 |
|
stickler-ci
|
478f927df3
|
Fixing style errors.
|
2020-02-03 09:54:34 +01:00 |
|
AdrianDominik
|
540e82102b
|
FIX: #12908 User login with credentials from self-subscription form fails
|
2020-02-03 09:54:34 +01:00 |
|
AdrianDominik
|
283b6be828
|
Merge remote-tracking branch 'upstream/11.0' into 11.0
|
2020-02-03 09:48:32 +01:00 |
|
Laurent Destailleur
|
2cb414e17e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/includes/tecnickcom/tcpdf/tcpdf.php
|
2020-02-03 06:35:27 +01:00 |
|
Laurent Destailleur
|
2813c9d4b4
|
FIX #12973
|
2020-02-03 06:31:40 +01:00 |
|
Laurent Destailleur
|
87f84e5b17
|
FIX #12973
|
2020-02-03 06:29:40 +01:00 |
|
Laurent Destailleur
|
d8ed62ea33
|
Fix line_max for BOM
|
2020-02-03 06:28:51 +01:00 |
|
Laurent Destailleur
|
e5808e3335
|
FIX #12995
|
2020-02-03 04:48:17 +01:00 |
|
Laurent Destailleur
|
7c35e9aaa8
|
FIX #12932
|
2020-02-03 03:56:30 +01:00 |
|
Laurent Destailleur
|
1dab308e4a
|
FIX #12932
|
2020-02-03 03:55:37 +01:00 |
|
Laurent Destailleur
|
b3a50bd4b0
|
FIX #12874
|
2020-02-03 03:47:45 +01:00 |
|
Laurent Destailleur
|
a30da7860f
|
FIX #12892
|
2020-02-03 03:32:31 +01:00 |
|
Laurent Destailleur
|
5633f58477
|
FIX #12978
|
2020-02-03 03:25:41 +01:00 |
|
Laurent Destailleur
|
ccf8e81f93
|
FIX #12975
|
2020-02-03 03:10:10 +01:00 |
|
Laurent Destailleur
|
ff6bcbdcf8
|
Fix trans
|
2020-02-03 03:10:03 +01:00 |
|
Laurent Destailleur
|
5e4e02337b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-03 02:50:44 +01:00 |
|
Laurent Destailleur
|
90cde17bdb
|
FIX #12986
|
2020-02-03 02:48:05 +01:00 |
|
Laurent Destailleur
|
69a0a1410e
|
FIX #12991
|
2020-02-03 02:28:23 +01:00 |
|
Laurent Destailleur
|
a0e3c5292f
|
FIX #12992
|
2020-02-03 02:20:38 +01:00 |
|
Laurent Destailleur
|
6fda058497
|
Merge pull request #12959 from ptibogxiv/patch-298
FIX doc of dictionnary API
|
2020-02-02 20:27:42 +01:00 |
|
Laurent Destailleur
|
590f8bf738
|
Merge pull request #12988 from aspangaro/11.0_p4
FIX: FEC export have specific name
|
2020-02-02 20:24:21 +01:00 |
|
Laurent Destailleur
|
54ef0e2074
|
Merge pull request #12987 from aspangaro/10.0_p34
FIX: FEC export have specific name
|
2020-02-02 20:24:04 +01:00 |
|
Laurent Destailleur
|
b632ebb52c
|
Merge pull request #12997 from atm-john/11.0_fix_project_loan_data
11.0 fix project loan data
|
2020-02-02 20:23:22 +01:00 |
|