Laurent Destailleur
|
3898db3956
|
FIX #12446
|
2019-11-16 00:39:23 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Laurent Destailleur
|
7e52c70321
|
FIX Advisory ID: usd20190067
|
2019-11-14 21:16:18 +01:00 |
|
Laurent Destailleur
|
8ef9728470
|
Fix permission on file
|
2019-11-14 17:28:23 +01:00 |
|
Laurent Destailleur
|
f7ab1498a7
|
FIX Advisory ID: usd20190053
|
2019-11-14 17:00:02 +01:00 |
|
Laurent Destailleur
|
80b3e27341
|
Fix bad name of constant
|
2019-11-14 14:23:48 +01:00 |
|
Laurent Destailleur
|
7e0ae4bf0e
|
FIX The pdf templates were using the large logo making PDF too large
|
2019-11-14 14:17:22 +01:00 |
|
Laurent Destailleur
|
4fc7b8c3b1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/extrafields_list_search_title.tpl.php
|
2019-11-14 12:49:42 +01:00 |
|
Laurent Destailleur
|
a29adc94f3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/card.php
htdocs/langs/en_US/admin.lang
|
2019-11-14 12:48:33 +01:00 |
|
Laurent Destailleur
|
ee800189a6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-11-14 12:45:00 +01:00 |
|
Laurent Destailleur
|
9d963a7ca6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-11-14 12:44:32 +01:00 |
|
Laurent Destailleur
|
7d997990fa
|
Fix phpcs
|
2019-11-14 12:44:15 +01:00 |
|
Laurent Destailleur
|
0e3d90f145
|
Fix syntax error
|
2019-11-14 12:42:44 +01:00 |
|
Laurent Destailleur
|
0b947cddae
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-14 12:15:50 +01:00 |
|
Laurent Destailleur
|
d36bf43d2d
|
Fix php error
|
2019-11-14 12:15:16 +01:00 |
|
Laurent Destailleur
|
8db4eff108
|
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
Scrutinizer Auto-Fixes
|
2019-11-14 12:10:44 +01:00 |
|
Scrutinizer Auto-Fixer
|
f197196719
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:46 +00:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Laurent Destailleur
|
f5da126cff
|
Fix property not defined
|
2019-11-14 12:01:01 +01:00 |
|
Laurent Destailleur
|
411e9c87e3
|
Debug feature to set sender profiles
|
2019-11-14 11:53:28 +01:00 |
|
Laurent Destailleur
|
52787b56b2
|
Fix when limit = 0
Look and feel v11
|
2019-11-14 11:00:49 +01:00 |
|
Laurent Destailleur
|
75667833fe
|
Fix missing ->msgid
|
2019-11-14 10:01:05 +01:00 |
|
Laurent Destailleur
|
95a6d7f8f5
|
Doxyen
|
2019-11-14 09:13:15 +01:00 |
|
Laurent Destailleur
|
f87c6b82c5
|
Merge pull request #12433 from erpware/develop
Updated .gitignore and remove duplicated entries
|
2019-11-14 08:59:57 +01:00 |
|
Laurent Destailleur
|
56f2463a15
|
Merge branch 'develop' into patch-6
|
2019-11-14 08:53:53 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Laurent Destailleur
|
614faa07c1
|
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
|
2019-11-14 08:49:53 +01:00 |
|
Daniel Seichter
|
c2eba28f36
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-11-14 00:18:03 +01:00 |
|
Frédéric FRANCE
|
3ec7568559
|
FIX #12385
|
2019-11-13 20:44:21 +01:00 |
|
Frédéric FRANCE
|
6596ffac4f
|
Update conf.class.php
|
2019-11-13 20:20:35 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Scrutinizer Auto-Fixer
|
f4aaa8d9bb
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:34:37 +00:00 |
|
Laurent Destailleur
|
545c2207b2
|
Fix on exact date when we don't know the second is useless
|
2019-11-13 19:32:27 +01:00 |
|
Laurent Destailleur
|
b9900c20cc
|
Merge pull request #11035 from atm-ph/new_search_input_on_type_list
NEW show html list instead input text for extrafields typed as list
|
2019-11-13 19:26:19 +01:00 |
|
Laurent Destailleur
|
16c50c212c
|
Update paymentmodes.php
|
2019-11-13 19:16:10 +01:00 |
|
stickler-ci
|
366dfc0e5c
|
Fixing style errors.
|
2019-11-13 18:15:19 +00:00 |
|
Laurent Destailleur
|
88d2658625
|
Merge branch 'develop' into scrutinizer-patch-2
|
2019-11-13 19:14:50 +01:00 |
|
Laurent Destailleur
|
65dc46db63
|
Merge pull request #12424 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
|
2019-11-13 19:12:17 +01:00 |
|
Laurent Destailleur
|
b6fcd07bfa
|
Merge pull request #12414 from c3do/patch-4
API New link/unlink products with categories
|
2019-11-13 18:50:37 +01:00 |
|
Laurent Destailleur
|
19fba02fb3
|
Merge pull request #12410 from andreubisquerra/develop
Check if draft exists in TakePOS customer list
|
2019-11-13 18:49:03 +01:00 |
|
Laurent Destailleur
|
a14042e4b2
|
Update list.php
|
2019-11-13 18:48:39 +01:00 |
|
Laurent Destailleur
|
cc70ffd1b3
|
Update list.php
|
2019-11-13 18:47:35 +01:00 |
|
Laurent Destailleur
|
b1f257e79c
|
Merge pull request #12423 from fappels/11_fix_printsheet
Fix Printsheet product selector
|
2019-11-13 18:41:53 +01:00 |
|
Laurent Destailleur
|
43ac3dc9e8
|
Merge pull request #12416 from frederic34/patch-6
Update llx_c_action_trigger.sql
|
2019-11-13 18:41:24 +01:00 |
|
Laurent Destailleur
|
edc03a5aeb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-13 18:40:33 +01:00 |
|
Laurent Destailleur
|
d10be4f169
|
FIX #12409 FIX #12408
|
2019-11-13 18:40:24 +01:00 |
|
Laurent Destailleur
|
e35e3c8840
|
Merge pull request #12415 from ptibogxiv/patch-277
Fix php error on stripe account display
|
2019-11-13 18:36:49 +01:00 |
|