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
Florian HENRY
8a36353385
FIX : when fetch_optionnal_by_label in Extrafields with $this->db cannot
...
work because this->db is never instanciated
2015-07-06 13:18:51 +02:00
Regis Houssin
a9059247ca
Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7_bug3
2015-07-04 05:46:41 +02:00
Regis Houssin
e82f4c474b
Fix: for avoid error with main context hooks, with $langs object for
...
example.
2015-07-03 22:14:34 +02:00
Regis Houssin
4273c4aad9
Fix: data can be just a value, not an array
2015-07-03 11:35:11 +02:00
Regis Houssin
4fb5af7442
Fix: reset the current entity
2015-07-03 10:58:55 +02:00
Laurent Destailleur
9c99cae911
FIX XSS security using the onerror and missing escapement on type of
...
member page.
2015-06-28 23:32:38 +02:00
Laurent Destailleur
9d7806f1f4
Tag class as deprecated
2015-06-27 21:26:05 +02:00
Regis Houssin
5efea745a1
Fix: Public method name must not be prefixed with an underscore
2015-06-27 20:38:11 +02:00
Regis Houssin
5ac292f9ae
Fix: Private member variable must be prefixed with an underscore
2015-06-27 20:32:19 +02:00
Regis Houssin
bf9c7c8ef9
Fix: add private/public function
2015-06-27 20:26:40 +02:00
Regis Houssin
dfae24ded9
Fix: remove unused var
2015-06-27 20:20:27 +02:00
Regis Houssin
bfe7112308
Fix: change encrypt/decrypt method for avoid division by zero
2015-06-27 19:57:35 +02:00
Juanjo Menent
a3b3ce9c77
Merge pull request #3101 from FHenry/3.7
...
FIX: multicompny bug with getEntites without shared test
2015-06-25 20:50:03 +02:00
Florian HENRY
9505d3a528
fix multicompny bug with getEntites without shared test
2015-06-25 17:22:37 +02:00
Fab
3adf6b1a73
Missing space after title tag.
...
When using textwithpicto() from core/class/html.form.class.php, if you
are reading source code with firefox, you will see that a part of the
generated html is highlighted in red.
<td class="classfortooltip" title="title text"valign="top" width="14">
should be :
<td class="classfortooltip" title="title text" valign="top" width="14">
2015-06-25 08:50:48 +02:00
Laurent Destailleur
02ce0bc6af
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-06-24 18:32:56 +02:00
Laurent Destailleur
c218843cdb
FIX Save of filters into export profiles failed.
2015-06-24 18:29:29 +02:00
Francis Appels
63df278eca
Fix: issue #3085
2015-06-23 19:28:18 +02:00
phf
06962cb4e6
FIX : tool export handle the type "select" extrafields and return the value instead of id
2015-06-23 16:26:05 +02:00
Marcos García
adc1998b73
Fixed undefined variable typo
2015-06-15 09:18:58 +02:00
Laurent Destailleur
a7cec18081
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
2015-06-14 17:11:36 +02:00
Laurent Destailleur
f4da53c300
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Laurent Destailleur
1007aba6a9
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2015-06-14 17:02:11 +02:00
Laurent Destailleur
14a8a2269b
FIX End log must use same level then start log.
2015-06-14 16:59:35 +02:00
Laurent Destailleur
a9bf38b8d3
Merge pull request #3022 from marcosgdf/bug-2976
...
FIX Close bug #2976 : "Report" tab is the current tab but it is not marked as selected by the UI
2015-06-14 02:03:39 +02:00
Marcos García de La Fuente
6514f418e5
Fix [ bug 1852 ] JS error when editing a customer order line
2015-06-13 11:46:35 +02:00
Marcos García de La Fuente
ea625628ce
Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers
2015-06-13 03:39:06 +02:00
Marcos García de La Fuente
87a00d6924
FIX Close bug #2976 : "Report" tab is the current tab but it is not marked as selected by the UI
2015-06-12 15:02:05 +02:00
Laurent Destailleur
1a2bde14fb
FIX Better management error into the color conversion functions
2015-06-12 14:37:27 +02:00
Laurent Destailleur
05a653ee5f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/html.form.class.php
2015-06-08 18:21:16 +02:00
Laurent Destailleur
f9d85973aa
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-06-08 18:18:37 +02:00
Laurent Destailleur
35dd069ec9
Fix #2994
2015-06-08 18:17:13 +02:00
Raphaël Doursenaud
08c9dd358d
FIX #2983 Load gravatar avatar images securely over HTTPS
2015-06-08 15:51:41 +02:00
Laurent Destailleur
7f16eea13b
Merge pull request #2978 from hregis/3.7-bug
...
Fix: use dash instead underscore and add filter for "dol_most_recent_files" for avoid conflict
2015-06-08 10:35:00 +02:00
Laurent Destailleur
536f565d4e
Fix Return value is always utf8 encoded and without entities.
2015-06-07 02:47:28 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
1252a500ce
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
2015-06-05 16:50:46 +02:00
Laurent Destailleur
6e72d3c8cc
FIX Export of tags for contact and member
2015-06-01 21:34:21 +02:00
Alexis Algoud
dd7febe2b9
replace test by getEntity()
2015-05-29 15:10:59 +02:00
Regis Houssin
131c3fcef8
Fix: check the user status during authentication
2015-05-29 10:07:48 +02:00
Laurent Destailleur
c2decc8aea
Merge pull request #2895 from atm-ph/fix_37_balise_script
...
FIX : "script" balise with wrong syntax
2015-05-25 18:49:15 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
phf
33ad86261a
FIX : width multiselect
2015-05-25 16:42:51 +02:00
Alexis Algoud
91885c9d6f
FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)
2015-05-22 17:22:57 +02:00
Alexis Algoud
bc672c2c23
FIX event for restricted user was restricted if company null
2015-05-21 11:49:10 +02:00
Laurent Destailleur
f275145bd2
FIX We did a test on a permission to export contract when permission did
...
not exists.
2015-05-10 23:46:34 +02:00
Laurent Destailleur
afc487ef9d
Fix phpcs
2015-05-07 13:28:03 +02:00
Laurent Destailleur
cc5968fbd5
A more complete error message
2015-05-07 10:45:35 +02:00
Laurent Destailleur
36ebaf7a22
Clean code
2015-05-06 23:31:03 +02:00
Juanjo Menent
7adbf033df
Merge pull request #2759 from fmarcet/3.7
...
FIX: Bug on order and supplier invoice numeration mask when use supplier
2015-05-06 21:37:15 +02:00
Maxime Kohlhaas
72c4337f4b
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:18:31 +02:00
Juanjo Menent
ea95a461e2
Fix: Make propal pdf "azur" compatible with the two products images
...
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
2015-05-06 17:17:41 +02:00
Maxime Kohlhaas
42455f771a
Missing comments
2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
b203263e91
Fix : shipment PDF was not using generation params
2015-05-06 12:16:36 +02:00
Laurent Destailleur
467ee7b771
Fix error into export filter step
...
Conflicts:
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modContrat.class.php
htdocs/core/modules/modFournisseur.class.php
2015-05-05 12:45:38 +02:00
fmarcet
077a9c6510
FIX: Bug on order and supplier invoice numeration mask when use supplier
...
code
2015-05-04 09:22:55 +02:00
Raphaël Doursenaud
93937fe7f3
Allow exporting projects without a third party
...
FIX #2729
2015-05-01 15:58:36 +02:00
Raphaël Doursenaud
a6b0f6cfac
Allow exporting projects without a third party
...
FIX #2729
2015-05-01 15:56:39 +02:00
Raphaël Doursenaud
afc582a369
Fixed SQL table reference for members types in export
...
FIX #2712
2015-04-30 17:20:53 +02:00
Raphaël Doursenaud
f1032baaab
Allow exporting projects without a third party
...
FIX #2729
2015-04-30 11:48:32 +02:00
Laurent Destailleur
6b3c060d9c
Fix doxygen
2015-04-30 00:07:30 +02:00
Laurent Destailleur
060d8a1a38
FIX Ref/label of product on contract line was not visible, nor into
...
page, nor into PDF.
2015-04-29 19:57:01 +02:00
Laurent Destailleur
92f2c48475
Fixed #2714
2015-04-27 11:46:08 +02:00
Juanjo Menent
1ed573f98b
Fix : #2694 Bug: Warning: Invalid argument supplied for foreach() in
...
commande.class.php on line 852
2015-04-22 23:31:24 +02:00
Laurent Destailleur
7f5377d219
Fix #2695
2015-04-22 19:25:20 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Maxime Kohlhaas
7b035d3b5f
Fix : menu financial was not displayed when only supplier module is activated
2015-04-18 20:11:19 +02:00
Maxime Kohlhaas
51522decf3
Fix : price in editkeyval function was forcing a price rounding
2015-04-18 18:33:46 +02:00
Maxime Kohlhaas
3073aab48b
Fix : discount were not working anymore on supplier order and bill
2015-04-17 23:31:51 +02:00
Florian HENRY
32e067c806
Remove debug
2015-04-16 14:22:48 +02:00
Laurent Destailleur
e508b28d74
Fix doliforge bug 1707
2015-04-15 18:53:39 +02:00
Laurent Destailleur
8511f1f7ef
Fix the data-role parameter
2015-04-15 18:14:26 +02:00
Raphaël Doursenaud
54b8aa8a0b
Fixed typo in task export
...
Closes #2607 , #2609
2015-04-14 19:14:16 +02:00
Laurent Destailleur
44f10ebec2
Fix: do not add new value
2015-04-13 13:01:23 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
74a4bca42c
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-04-11 22:52:27 +02:00
Laurent Destailleur
6889162d7a
Fix: management of vat type 2, 4 and 6 is now ok.
...
Works for canada and ivory cost.
2015-04-11 22:51:53 +02:00
braito4
914b324a67
minor bug drag and drop total line in tasks list
2015-04-09 10:37:54 +02:00
Juanjo Menent
d7ba9b3312
Fix: Bad permission assignments for stock movements actions
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/stock/mouvement.php
2015-04-07 20:40:48 +02:00
Juanjo Menent
9d8cb459f1
Fix: Bad permission assignments for stock movements actions
2015-04-07 20:28:45 +02:00
Laurent Destailleur
b01369a32e
Error management
2015-04-03 15:25:24 +02:00
Laurent Destailleur
98b1d6170d
Fix style fieldrequired must be used only in create/edit mode.
2015-04-03 01:07:17 +02:00
Laurent Destailleur
761409caf6
Fix sql error
2015-04-02 15:17:07 +02:00
Laurent Destailleur
0187a9a4ee
Merge pull request #2511 from fappels/3.7
...
FIX: dispatch batch products
2015-04-02 11:24:01 +02:00
Laurent Destailleur
16a620f926
Fix: Deadlock situation (when order were canceled, no way to make
...
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
2015-04-01 16:07:22 +02:00
Laurent Destailleur
ad1e4134a9
Fix: bcc was lost if notif to bcc was also forced
2015-04-01 12:22:50 +02:00
Laurent Destailleur
1bc0f6c99f
Fix: do not show end date when it is same than start date
2015-04-01 12:02:32 +02:00
Laurent Destailleur
293495467f
Fix: Bad ref used into notification message
2015-04-01 11:30:48 +02:00
Francis Appels
bba8b206a1
FIX: dispatch batch products
...
Fix dispatching batch products and add error message.
Make DispatchProduct method backwards comp and add missing $trigger.
Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.
2015-03-31 15:48:08 +02:00
Laurent Destailleur
fd8d09c8c0
Fix avoid warning
2015-03-29 17:53:05 +02:00
Laurent Destailleur
b8bd27009e
Simplify code
2015-03-28 18:32:53 +01:00
Ion Agorria
043d11d785
check if $mc is a valid global
2015-03-28 18:22:01 +01:00
Laurent Destailleur
813cb36424
Merge pull request #2476 from fmarcet/3.7
...
Fix: Not using where on sellist
2015-03-27 00:50:48 +01:00
Laurent Destailleur
42c2c81e28
Fix detection of html was wrong with img
2015-03-26 12:05:52 +01:00
Laurent Destailleur
1ca95acbd7
Fix pb during export of agenda events
...
Conflicts:
htdocs/exports/export.php
2015-03-26 11:23:21 +01:00
Laurent Destailleur
8be08c692f
Fix some secuity tests were not done.
2015-03-25 18:10:45 +01:00
fmarcet
456b11d148
Fix: Not using where on sellist
2015-03-25 11:23:05 +01:00
Laurent Destailleur
f75c115140
Fix translation
...
Fix permission not managed into get_menudiv.php
2015-03-24 11:19:51 +01:00
Laurent Destailleur
b7a466c95f
Fix bad style for total
2015-03-23 13:50:14 +01:00
Laurent Destailleur
e269aa83b5
More comments
2015-03-23 04:16:58 +01:00
Laurent Destailleur
042556a9cf
Better comments
2015-03-23 03:50:55 +01:00
Laurent Destailleur
73266bb965
Fix error when using a log hangler that make output into the http
...
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
2015-03-21 01:22:05 +01:00
Laurent Destailleur
b8ed553365
We must keep the @, some tools use it to know it is login page.
2015-03-21 01:08:29 +01:00
Laurent Destailleur
a2676e5768
Fix: the type of notification sent was not filled
2015-03-18 21:06:55 +01:00
Laurent Destailleur
7ef11b2f38
Fix selected attribute not set correctly
2015-03-18 13:16:59 +01:00
Laurent Destailleur
c4ff66c5d7
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-03-14 13:46:18 +01:00
Laurent Destailleur
89b22be063
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
2015-03-14 13:44:26 +01:00
Laurent Destailleur
ca34575df4
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
2015-03-14 13:42:00 +01:00
Laurent Destailleur
5670e92842
Position of field into pdf baleine
2015-03-14 12:35:03 +01:00
Laurent Destailleur
d056abc4e1
No need to have this protected. Property can be read with method show()
...
and this method can be override.
2015-03-13 21:45:52 +01:00
Laurent Destailleur
bc3f9bf800
Fix: the visible version was not enough to know version of dolibarr. We
...
also need the MAIN_FEATURES_LEVEL.
2015-03-13 18:11:31 +01:00
Laurent Destailleur
a452823e1e
Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility
...
with 3.6
2015-03-13 15:20:08 +01:00
Laurent Destailleur
895b2c6e9c
Fix bad merge
2015-03-13 14:37:27 +01:00
Laurent Destailleur
c1432eb2da
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/salaries/fiche.php
htdocs/projet/element.php
2015-03-11 03:29:52 +01:00
Florian HENRY
15dfd7c08d
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-09 10:52:09 +01:00
Estephe L.
9d320e4268
Fix Anchor link for quick access when editing.
...
This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
2015-03-08 23:29:09 +01:00
Laurent Destailleur
a169b3348e
Fix show alays date fields for contract module.
...
Fix select of product were lost.
2015-03-06 14:36:22 +01:00
Florian HENRY
0d801be6a1
NEW: (Dev) DolGraph allow extended class to override $_stringtoshow
2015-03-06 06:12:47 +01:00
fmarcet
1a02f6aa80
Fix: Masks works with thirdparty type
2015-03-04 18:18:55 +01:00
Marcos García de La Fuente
41c55d1913
Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value
2015-03-04 11:55:17 +01:00
Laurent Destailleur
35733c4c08
More comments
2015-03-03 17:47:17 +01:00
Florian HENRY
d80a8bbdba
revert bug1840 to eldy solution
2015-03-02 10:13:06 +01:00
Florian HENRY
d9621a1d23
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
...
Conflicts:
htdocs/contrat/card.php
2015-03-02 10:02:54 +01:00
Laurent Destailleur
48356005c3
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-02 03:00:29 +01:00
Laurent Destailleur
3475433eaf
Fix: the bank information were visible into pdf but were not using
...
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Marcos García de La Fuente
7876238823
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
...
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
2015-03-02 01:36:27 +01:00
Laurent Destailleur
ce8cbee5d2
Merge pull request #2399 from marcosgdf/misc
...
misc
2015-03-02 00:31:27 +01:00