Marcos García de La Fuente
|
0955432de3
|
Merge branch '3.7' into bug-iban-whitespaces-37
# Conflicts:
# ChangeLog
|
2015-09-03 12:02:23 +02:00 |
|
Laurent Destailleur
|
d64a87d980
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/index.php
|
2015-09-03 10:44:40 +02:00 |
|
Laurent Destailleur
|
001f1b4c31
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/filefunc.inc.php
|
2015-09-03 10:41:44 +02:00 |
|
Marcos García de La Fuente
|
9ec349f410
|
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
Close #3432
|
2015-09-01 10:56:55 +02:00 |
|
Raphaël Doursenaud
|
3b493ab0ed
|
Fix #2863 Sensible defaults for ChromePHP path
Use the provided ChromePHP class by default
|
2015-08-31 21:08:37 +02:00 |
|
Raphaël Doursenaud
|
51d5bff15d
|
Fix #3442 Remove useless syslog
Not having the permission to read the box is not an error.
Furthermore, no other boxes have this behavior.
|
2015-08-31 19:41:42 +02:00 |
|
Laurent Destailleur
|
fb70fbdc06
|
Merge pull request #3428 from marcosgdf/bug-3426
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
|
2015-08-31 00:53:04 +02:00 |
|
Marcos García de La Fuente
|
b953d2c466
|
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
Close #3426
|
2015-08-29 19:42:51 +02:00 |
|
Laurent Destailleur
|
c8f12dc5f2
|
Fix PUT method for already formated strings
|
2015-08-29 15:12:31 +02:00 |
|
philippe grand
|
6952084be3
|
it's a mess
|
2015-08-27 17:23:23 +02:00 |
|
philippe grand
|
e9f631d2e3
|
fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'
|
2015-08-27 14:49:12 +02:00 |
|
philippe grand
|
db7defb7c3
|
Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'"
This reverts commit 2527ae263b.
|
2015-08-27 14:43:48 +02:00 |
|
philippe grand
|
2527ae263b
|
fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'
|
2015-08-27 14:28:12 +02:00 |
|
Laurent Destailleur
|
edf05e8d94
|
Merge pull request #3404 from hregis/3.7_bug
Fix: disable hook for avoid errors when object langs is disable
|
2015-08-26 11:24:50 +02:00 |
|
Laurent Destailleur
|
feed3f714c
|
Fix to avoid warning
|
2015-08-24 11:17:11 +02:00 |
|
Regis Houssin
|
7b7fc44b46
|
Fix: disable hook for avoid errors when object langs is disable
|
2015-08-22 09:24:46 +02:00 |
|
Laurent Destailleur
|
1b409538a8
|
Fix #3400
Conflicts:
htdocs/core/lib/date.lib.php
|
2015-08-20 15:51:28 +02:00 |
|
Laurent Destailleur
|
c3fb14855b
|
Try a better fix to replace PR #3297
|
2015-08-20 14:34:48 +02:00 |
|
Laurent Destailleur
|
5ed3d80103
|
Merge pull request #3385 from marcosgdf/bug-3321
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
|
2015-08-14 18:10:28 +02:00 |
|
Laurent Destailleur
|
343f4086bc
|
Remove dead code
|
2015-08-14 15:12:40 +02:00 |
|
Marcos García de La Fuente
|
b3a7b44046
|
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
Close #3321
|
2015-08-14 12:29:32 +02:00 |
|
Laurent Destailleur
|
c73fe965d2
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
|
2015-08-13 03:58:32 +02:00 |
|
Laurent Destailleur
|
1595765ec8
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2015-08-13 03:18:02 +02:00 |
|
Regis Houssin
|
ebe4969723
|
Fix: missing entity in cache files names
|
2015-08-11 10:22:06 +02:00 |
|
Marcos García de La Fuente
|
f3ef4fed93
|
Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
Close #3313
|
2015-08-09 13:58:03 +02:00 |
|
Marcos García de La Fuente
|
cccc543065
|
Fix: [ bug #3288 ] Tasks box is not properly drawn
Close #3288
|
2015-08-09 13:16:55 +02:00 |
|
Juanjo Menent
|
12b83fd3e8
|
Fix #3304
|
2015-08-07 12:45:27 +02:00 |
|
Juanjo Menent
|
46a9381f0b
|
Merge pull request #3335 from GPCsolutions/3.7-3322
Fix #3322 Use title for alt if no alt is provided
|
2015-08-06 18:12:25 +02:00 |
|
Raphaël Doursenaud
|
2cf9d9f583
|
Fix #3322 Use title for alt if no alt is provided
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
|
2015-08-03 10:30:10 +02:00 |
|
Laurent Destailleur
|
13dee1876a
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/resultat/clientfourn.php
|
2015-07-30 15:07:22 +02:00 |
|
Laurent Destailleur
|
6adc3ba604
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
|
2015-07-30 14:54:33 +02:00 |
|
Laurent Destailleur
|
bd4a31c45d
|
Merge pull request #3320 from fmarcet/3.7
Fix: Not showing delivery date on rouget pdf (expedition)
|
2015-07-28 18:34:19 +02:00 |
|
Laurent Destailleur
|
c42e952ce9
|
Merge pull request #3319 from FHenry/3.7
FIX : #3318
|
2015-07-28 18:30:19 +02:00 |
|
Laurent Destailleur
|
a3b379476b
|
Merge pull request #3308 from atm-gauthier/3.7_fix_display_extraf_text_line_break
FIX : Line break display as a block
|
2015-07-28 18:19:07 +02:00 |
|
Gauthier
|
556d01ff8a
|
FIX : Line break display as a block
|
2015-07-28 15:14:54 +02:00 |
|
Florian HENRY
|
517e9094da
|
FIX : Avoid warning strict mode when hosting server do not have
php5_curl installed
|
2015-07-27 22:34:30 +02:00 |
|
fmarcet
|
6676114501
|
Fix: Not showing product supplier reference when page break
|
2015-07-27 16:31:40 +02:00 |
|
fmarcet
|
e130af8033
|
Fix: Not showing delivery date on rouget pdf (expedition)
|
2015-07-27 13:11:07 +02:00 |
|
Gauthier
|
fa26b284a9
|
FIX : Line break display as a block
|
2015-07-21 16:39:00 +02:00 |
|
Laurent Destailleur
|
84be353e13
|
Comments
|
2015-07-21 00:13:13 +02:00 |
|
Marcos García de La Fuente
|
8505e91469
|
Fix: [ bug 1791 ] Margin menu not available if any Finance module is not enabled
|
2015-07-19 13:46:25 +02:00 |
|
Laurent Destailleur
|
2bb1945a2f
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
|
2015-07-19 12:04:30 +02:00 |
|
Laurent Destailleur
|
fbc0b5b313
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/contact/vcard.php
htdocs/societe/consumption.php
|
2015-07-19 11:38:44 +02:00 |
|
Marcos García de La Fuente
|
7185cfeb84
|
Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names
|
2015-07-18 14:48:59 +02:00 |
|
Marcos García de La Fuente
|
e9d1e6265d
|
Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics
Close #2696
|
2015-07-18 14:25:05 +02:00 |
|
Gauthier
|
244d1839e4
|
FIX : load propal langs for availability traduction
|
2015-07-17 17:24:11 +02:00 |
|
Regis Houssin
|
9e7cb70d63
|
Fix: missing shared parameters
|
2015-07-08 16:03:15 +02:00 |
|
Marcos García de La Fuente
|
cba902c5ae
|
Fix: [ bug #3055 ] Product image thumbnails were not deleted after deleting the image
Close #3055
|
2015-07-07 09:40:23 +02:00 |
|
Florian HENRY
|
b6850e36c9
|
fix previous commit
|
2015-07-06 16:59:03 +02:00 |
|
Florian HENRY
|
ec89f00103
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-07-06 13:19:35 +02:00 |
|