lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,121 Commits 43 Branches 150 Tags 886 MiB
3.7.2
Commit Graph

39624 Commits

Author SHA1 Message Date
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
da8e71b2c5 Fix #3309 2015-08-20 16:05:29 +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
2faa5d725e Missing tcpdf files 2015-08-15 18:17:54 +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
cacfe454a9 Merge pull request #3382 from hregis/3.7_bug 
Fix: place the form outside the table for avoid errors
 2015-08-14 18:09:57 +02:00
Laurent Destailleur
58988d3084 3.5.8 2015-08-14 16:12:36 +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
Regis Houssin
fdf6c32fbc Fix: place the form outside the table for avoid errors 2015-08-13 12:47:04 +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
Laurent Destailleur
af2d63d7e5 Merge pull request #3368 from marcosgdf/bug-3211 
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
 2015-08-13 00:15:13 +02:00
Laurent Destailleur
dc4b429a33 Merge branch 'bug-3313' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3313

Conflicts:
	ChangeLog
 2015-08-13 00:13:36 +02:00
Laurent Destailleur
4b51fc80a6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2015-08-13 00:06:27 +02:00
Laurent Destailleur
958321b64d Merge pull request #3340 from atm-maxime/3.6 
Rowid was missing on expedition line so no origin id when creating an invoice
 2015-08-12 23:39:43 +02:00
Laurent Destailleur
16ee7b461c Merge pull request #3332 from atm-gauthier/3.7_fix_display_country_name_on_vcard 
FIX : Display country name instead of country id (display country id …
 2015-08-12 23:38:36 +02:00
Juanjo Menent
e4a9ca8b45 Merge pull request #3373 from hregis/3.7_bug 
Fix: missing entity in cache files names
 2015-08-12 18:38:39 +02:00
josemariagomezroncero
e146af3118 Update llx_c_type_resource.sql 
Error create table, missing incremet type element
 2015-08-11 22:38:21 +02:00
Francis Appels
1d85529eda Fix delete not used empty stock record 
When removing all stock from warehouse are move all stock to other
warehouse, there is still an 0 stock record in in the stock table for
the source warehouse, not visible in Dolibarr.
 2015-08-11 22:01:26 +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
02f4e9f5cb Merge branch '3.7' into bug-3211 
# Conflicts:
#	ChangeLog
 2015-08-11 10:12:36 +02:00
Juanjo Menent
7d18adebb1 Merge pull request #3369 from marcosgdf/minor 
Fixed minor problem with error alert when creating user
 2015-08-10 20:35:03 +02:00
Juanjo Menent
b3f3cdda3a Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 20:16:05 +02:00
Marcos García de La Fuente
e2797ddd40 Merge branch '3.6' into bug-3342 
# Conflicts:
#	ChangeLog
 2015-08-10 17:48:18 +02:00
Marcos García de La Fuente
202d12ffef Merge branch '3.7' into bug-3211 
# Conflicts:
#	ChangeLog
 2015-08-10 17:42:38 +02:00
Juanjo Menent
9374b4f3e3 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 12:14:18 +02:00
Juanjo Menent
5f70e94905 Merge pull request #3360 from marcosgdf/bug-3286 
Fix [ bug #3286 ]: Payment types are not translated to English
 2015-08-10 11:25:20 +02:00
Marcos García de La Fuente
8a1c5450c2 Fixed minor problem with error alert when creating user 2015-08-09 18:26:12 +02:00
Marcos García de La Fuente
2f6587b48e FIX [ bug #3211 ] Error about sold to pay (Montant encours) 
Close #3211
 2015-08-09 18:08:22 +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
7cb564586e Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything 
Close #3310
 2015-08-09 13:52:02 +02:00
Marcos García de La Fuente
2f921b6431 Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate 
Close #3342
 2015-08-09 13:46:48 +02:00
Marcos García de La Fuente
a24f29ba8b Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php 
Close #3341
 2015-08-09 13:37:05 +02:00
Marcos García de La Fuente
e725d44565 Fix [ bug #3286 ]: Payment types are not translated to English 
Close #3286
 2015-08-09 13:24:23 +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
63f62a1fa2 Merge pull request #3344 from fmarcet/3.7 
FIX: Not showing task extrafields when creating from left menu
 2015-08-06 18:15:30 +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
Maxime Kohlhaas
e13515e59f Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2015-08-06 08:57:52 +02:00
fmarcet
62ad7d4d34 FIX: Not showing task extrafields when creating from left menu 2015-08-04 13:32:44 +02:00
Marcos García de La Fuente
a1f74763da Merge branch '3.5' into bug-3206 
Conflicts:
	ChangeLog
 2015-08-03 18:55:01 +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
Juanjo Menent
2a67bd1f38 Fix #3314 Display state in bank account card 2015-08-01 14:43:04 +02:00
Juanjo Menent
22b4bfd1a4 Merge pull request #3334 from GPCsolutions/3.6-3314 
Fix #3314 Display state in bank account card
 2015-08-01 14:40:42 +02:00
Maxime Kohlhaas
9e05cecc1a Fix : rowid was missing on expedition line so no origin id when creating an invoice 2015-07-31 16:31:12 +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
Raphaël Doursenaud
3b9c8a685b Fix #3314 Display state in bank account card 2015-07-29 19:29:18 +02:00
Gauthier
cc8eac67d9 FIX : Display country name instead of country id (display country id makes no sense on vcard files) 2015-07-29 12:29:33 +02:00
Laurent Destailleur
cc49b39eb6 Merge pull request #3329 from atm-gauthier/3.7_fix_add_user_on_event_in_create_mode 
FIX : When we add an user on event in create mode, we lose linked object
 2015-07-28 18:37:19 +02:00
Laurent Destailleur
c2eb47f3a1 Merge pull request #3325 from atm-ph/3.6_fix_timespent_id 
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
 2015-07-28 18:36:48 +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
aaa9d85d07 FIX : When we add an user on event in create mode, we lose linked object 2015-07-28 17:25:33 +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
Florian HENRY
d78292b9af FIX : if multicompany enabled, call to undifend method _setCookie 
instead of setCookie
 2015-07-27 22:08:33 +02:00
phf
824da6d2b0 FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE 2015-07-27 17:38:27 +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
Florian HENRY
c0412acdea FIX : #3318 2015-07-27 13:03:47 +02:00
Laurent Destailleur
96f1c25a73 Merge pull request #3287 from marcosgdf/bug-3198 
Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne
 2015-07-23 22:51:17 +02:00
Gauthier
fa26b284a9 FIX : Line break display as a block 2015-07-21 16:39:00 +02:00
Laurent Destailleur
9e35fd1bc3 Doc comments 2015-07-21 11:04:01 +02:00
Maxime Kohlhaas
646ad48bd0 Better fix for not numeric qty or discount 2015-07-21 10:50:07 +02:00
Maxime Kohlhaas
428bd14b55 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 
# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.
 2015-07-21 10:49:47 +02:00
Laurent Destailleur
84be353e13 Comments 2015-07-21 00:13:13 +02:00
Laurent Destailleur
2bebb869fb Fix bad signature of fetch. The ref_ext is missing. 2015-07-20 17:19:44 +02:00
Laurent Destailleur
f0ed7dac09 Exclude tested module 2015-07-20 12:21:15 +02:00
Marcos García de La Fuente
038f171d6c Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries 
Close #3074
 2015-07-20 12:18:30 +02:00
Marcos García de La Fuente
db54b6f596 Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne 
Created new ContratLigne::insert function

Close #3198
 2015-07-20 11:19:40 +02:00
Laurent Destailleur
dafe0a37cf Merge branch 'bug-1925' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1925

Conflicts:
	ChangeLog
 2015-07-19 15:31:02 +02:00
Laurent Destailleur
ad5612158a Fix report of all error messages 2015-07-19 15:29:18 +02:00
Marcos García de La Fuente
b64adcc065 FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly 
Patch submitted by Philippe (pheno) at https://doliforge.org/tracker/?func=detail&aid=1925&group_id=144
 2015-07-19 15:13:27 +02:00
Marcos García de La Fuente
f2313748c8 Merge branch '3.7' into bug-1634 2015-07-19 14:57:39 +02:00
Marcos García de La Fuente
1be33e1dda FIX [ bug 1634 ] Error deleting a project when it had many linked objects 
Projet::delete was throwing DB error messages directly to the user instead of logging them and showing a proper error message to the user
 2015-07-19 14:56:52 +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
Laurent Destailleur
2e2f99c351 Merge branch 'bug-3180' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3180

Conflicts:
	ChangeLog
 2015-07-19 11:28:48 +02:00
Laurent Destailleur
4100026c71 Merge branch 'bug-3268' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3268

Conflicts:
	ChangeLog
 2015-07-19 11:27:28 +02:00
Laurent Destailleur
8d7c1f8d4c Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid 2015-07-19 11:21:21 +02:00
Marcos García de La Fuente
3d6c5b09e8 Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter 
Close #3268
 2015-07-19 11:19:47 +02:00
Marcos García de La Fuente
538c8c072b Merge branch '3.5' into bug-3180 
Conflicts:
	ChangeLog
 2015-07-19 11:16:36 +02:00
Marcos García de La Fuente
d0b1652efd Merge branch '3.5' into bug-3206 
Conflicts:
	ChangeLog
 2015-07-19 11:16:10 +02:00
Marcos García de La Fuente
4649cf7210 Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information 
Close #3206
 2015-07-18 19:40:48 +02:00
Marcos García de La Fuente
b28c4df0d6 Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result 
Close #3180
 2015-07-18 17:35:36 +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
Juanjo Menent
57f5c95894 Merge pull request #3261 from atm-gauthier/3.7_fix_trad_availability 
FIX : load propal langs for availability traduction
 2015-07-17 19:20:56 +02:00
Raphaël Doursenaud
953a21b55e FIX #3262 Webservice getProductsForCategory() 
Wrong variable name was used!
 2015-07-17 18:02:44 +02:00
Gauthier
244d1839e4 FIX : load propal langs for availability traduction 2015-07-17 17:24:11 +02:00
Laurent Destailleur
1a61ab055f Merge pull request #3207 from atm-ph/fix_37_translation_category 
FIX : translation for 1 word do not work
 2015-07-16 10:26:00 +02:00
phf
bde4503abd FIX : translation for 1 word do not work if product/service module are disabled because the translation search in products.lang 2015-07-15 14:46:29 +02:00
Maxime Kohlhaas
5223934ff0 Fix #3188 SQL error if qty or discount is not a number on proposal add line 2015-07-14 12:17:50 +02:00
Maxime Kohlhaas
20bdfdb286 Fix : withdrawal rejection were taking the total amount of the invoice instead of the amount of the withdrawal 2015-07-14 11:57:47 +02:00
Regis Houssin
9e7cb70d63 Fix: missing shared parameters 2015-07-08 16:03:15 +02:00
phf
f0f4d83664 FIX translate Jabberid on contact page with edit view 2015-07-08 12:33:37 +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
Laurent Destailleur
5d588714f0 Merge pull request #3135 from atm-ph/3.6_fix_socpeople_country_display 
FIX : wrong display with contact country
 2015-07-04 04:41:20 +02:00
Laurent Destailleur
4628c15684 Merge pull request #3141 from hregis/3.7_bug 
Fix: reset the current entity
 2015-07-04 03:46:40 +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
Maxime Kohlhaas
5d14d05ce1 Fix : Social contribution payment deletion was not deleting the bank line 2015-07-03 16:38:54 +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
Regis Houssin
e58957e603 Fix: broken feature: Check the entity because He may be the same 
reference in several entities
 2015-07-03 08:18:32 +02:00
phf
c87328b362 FIX : contact country had wrong display if the country dont have translate 2015-07-02 17:00:37 +02:00
Maxime Kohlhaas
ee643ed2a7 Fix : Project list was not keeping parameters on sorts 2015-07-02 14:08:16 +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
Laurent Destailleur
461b5f0882 Merge pull request #3086 from atm-ph/3.6_fix_export_extrafield_select 
FIX : tool export extrafields
 2015-06-27 02:20:39 +02:00
Juanjo Menent
0f046776d5 FIX #3091 TotalHT amount in supplier order is bold unlike the rest of 
Dolibarr
 2015-06-26 17:54:34 +02:00
Juanjo Menent
a5b3c3476d Merge pull request #3106 from hregis/3.7_bug 
Fix: missing table
 2015-06-26 17:35:24 +02:00
Regis Houssin
7ec13c9435 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-06-26 16:56:41 +02:00
Regis Houssin
46272cf4cd Fix: for avoid error with function "complete_head_from_modules" 2015-06-26 15:26:08 +02:00
phf
582f9cd214 FIX : keep filter by category or by not enough stock if we switch page 2015-06-26 11:04:08 +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
Juanjo Menent
1d562be1f4 Merge pull request #3090 from fmarcet/3.7 
FIX: Payed invoices are showed as canceled
 2015-06-24 18:17:45 +02:00
fmarcet
c9c1247a28 FIX: Payed invoices are showed as canceled 
FIX: Bad date filter on customer order
 2015-06-24 09:01:39 +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
Regis Houssin
9c6c3ad65d Fix: wrong user right 2015-06-17 16:33:18 +02:00
fmarcet
05cb1f7ba7 Fix: Date filter on customer orders 2015-06-16 16:59:48 +02:00
Regis Houssin
3807fafc1a Fix: no error message if extrafield is require 2015-06-16 16:42:33 +02:00
Laurent Destailleur
ceb0d71f54 Merge pull request #3054 from hregis/3.7_photos 
Fix: thumb "mini" not deleted
 2015-06-16 11:38:39 +02:00
Laurent Destailleur
34468644ef Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-16 11:15:16 +02:00
Regis Houssin
5e25c69891 Fix: thumb "mini" not deleted 2015-06-16 09:28:31 +02:00
Regis Houssin
d92448a772 Fix: phpcs ? 2015-06-15 12:09:32 +02:00
Marcos García de La Fuente
2d3ab3b658 Merge remote-tracking branch 'upstream/3.5' into bug-2814-2 
Conflicts:
	ChangeLog
 2015-06-15 09:39:17 +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
fadc640335 Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2835

Conflicts:
	ChangeLog
 2015-06-14 16:07:19 +02:00
Laurent Destailleur
d0b2c492a0 Merge branch 'bug-2837' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2837

Conflicts:
	ChangeLog
 2015-06-14 16:06:14 +02:00
Laurent Destailleur
e915a54c39 Merge branch 'bug-2861' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2861

Conflicts:
	ChangeLog
 2015-06-14 16:03:44 +02:00
Laurent Destailleur
892ff3b053 Merge branch 'bug-2900' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2900

Conflicts:
	ChangeLog
 2015-06-14 15:58:16 +02:00
Laurent Destailleur
f8d2e93878 Merge pull request #3044 from hregis/3.5_bug 
Fix: select date problem with mobile device (#3039)
 2015-06-14 15:29:35 +02:00
Laurent Destailleur
b42f9a6706 Fix phpcs 2015-06-14 15:16:29 +02:00
Regis Houssin
b96ed08260 Fix: select date problem with mobile device (#3039) 2015-06-14 12:46:27 +02:00
Regis Houssin
0e79bd5c74 Fix: select date problem with mobile device (#3039) 2015-06-14 12:34:28 +02:00
Laurent Destailleur
fdced80a48 Merge pull request #3035 from marcosgdf/bug-2786 
FIX #2786 Objectline_add template shows "0" for non-vat suppliers
 2015-06-14 02:15:27 +02:00
Laurent Destailleur
aecc5d27a3 Merge pull request #3036 from hregis/3.7_bug 
Fix: broken feature: barcode search #3019
 2015-06-14 02:09:40 +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
Laurent Destailleur
f67af6dac5 Merge pull request #3026 from marcosgdf/bug-2891 
FIX Close bug #2891 Category hooks do not work
 2015-06-14 01:40:12 +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
Regis Houssin
f5168625d8 Fix: broken feature: barcode search #3019 2015-06-13 10:43:55 +02:00
Regis Houssin
296b76603a Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-06-13 09:37:55 +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
1215502927 Fix Close bug #2814 JPEG photos are not displayed in Product photos page 2015-06-13 03:11:17 +02:00
Marcos García de La Fuente
7bddca94ef Merge branch '3.7' into bug-2900 
Conflicts:
	ChangeLog
 2015-06-13 02:39:16 +02:00
Juanjo Menent
da535b08e5 Merge pull request #3027 from marcosgdf/bug-2855 
FIX Close bug #2855 Wrong translation key in localtax report page
 2015-06-12 21:30:02 +02:00
Juanjo Menent
567dece678 Merge pull request #3011 from GPCsolutions/3.7-3009 
FIX #3009: Better filtering to prevent SQL injection
 2015-06-12 21:26:14 +02:00
Juanjo Menent
10d27ea594 Merge pull request #3012 from fmarcet/3.7 
Fix: Not reading external barcode numeration module
 2015-06-12 21:24:49 +02:00
Marcos García de La Fuente
f9574fa458 FIX Close #2835 Customer prices of a product shows incorrect history order 2015-06-12 19:05:08 +02:00
Marcos García de La Fuente
2051a66cd7 FIX Close #2837 Product list table column header does not match column body 2015-06-12 18:46:05 +02:00
Marcos García de La Fuente
0335892521 FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 2015-06-12 18:31:49 +02:00
Marcos García de La Fuente
200eb7b1bb FIX Close bug #2855 Wrong translation key in localtax report page 2015-06-12 16:27:17 +02:00
Marcos García de La Fuente
300cfd2293 FIX Close bug #2891 Category hooks do not work 2015-06-12 16:10:23 +02:00
Marcos García de La Fuente
60711d35b8 FIX Close bug #2900 Courtesy title is not stored in create thirdparty form 2015-06-12 15:53:58 +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
4a726f6315 Fix css 2015-06-12 13:44:03 +02:00
fmarcet
5783c185bd Fix: Not reading external barcode numeration module 2015-06-11 10:43:12 +02:00
Raphaël Doursenaud
4ee6c1810e FIX #3009: Better filtering to prevent SQL injection 2015-06-11 10:38:29 +02:00
Raphaël Doursenaud
d89955047b FIX #3009: Better filtering to prevent SQL injection 2015-06-11 10:37:30 +02:00
Regis Houssin
14780747fc Merge remote-tracking branch 'dolibarr/3.7' into 3.7 2015-06-10 16:00:42 +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
Laurent Destailleur
3ed200766c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-08 17:38:59 +02:00
Laurent Destailleur
9e1dd42b56 Fix #2986 2015-06-08 17:38:33 +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
Regis Houssin
8d824785f0 Merge remote-tracking branch 'dolibarr/3.7' into 3.7 2015-06-08 10:03:34 +02:00
Juanjo Menent
dc3ae22379 Merge pull request #2980 from hregis/3.7_crash 
Close #2951
 2015-06-08 09:46:39 +02:00
Regis Houssin
792911b14f Revert "Fix: Drop foreign key for avoid Mysql crash" 
This reverts commit 65b049fdf5.
 2015-06-08 09:28:53 +02:00
Regis Houssin
de0dd5da60 Fix: Drop foreign key for avoid Mysql crash 2015-06-08 09:14:46 +02:00
Regis Houssin
65b049fdf5 Fix: Drop foreign key for avoid Mysql crash 2015-06-08 09:13:21 +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