atm-greg
|
4e16f64af0
|
Fix project::delete to delete children tasks before parent tasks
|
2018-08-09 12:13:06 +02:00 |
|
Laurent Destailleur
|
e85ec19018
|
Merge pull request #9093 from atm-gauthier/FIX_filters
FIX : page must always be 0 when we search
|
2018-08-02 17:48:35 +02:00 |
|
Laurent Destailleur
|
b5a0e14ffe
|
Merge pull request #9185 from atm-john/fix_situation_total_calcul
Important: fix situation line's total
|
2018-08-02 17:45:44 +02:00 |
|
Juanjo Menent
|
2cf51fbdf1
|
Merge pull request #9173 from frederic34/patch-22
fix #8820
|
2018-08-02 11:08:47 +02:00 |
|
John BOTELLA
|
4ddca02bb9
|
fix situation line's total
|
2018-07-31 14:58:33 +02:00 |
|
Frédéric FRANCE
|
7dada7ae8e
|
fix #8820
|
2018-07-29 09:15:42 +02:00 |
|
Laurent Destailleur
|
c7f54439ff
|
Merge pull request #9145 from frederic34/patch-12
use defaut currency for supplier order
|
2018-07-24 17:32:11 +02:00 |
|
Frédéric FRANCE
|
bde30b85ad
|
use defaut currency for supplier order
|
2018-07-24 17:06:12 +02:00 |
|
Laurent Destailleur
|
3bdf7d411d
|
Merge pull request #9125 from atm-john/fix_php7_warning_mysql
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
|
2018-07-24 16:56:10 +02:00 |
|
Laurent Destailleur
|
8866b8eb1d
|
Merge pull request #9133 from frederic34/patch-12
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
|
2018-07-24 16:54:04 +02:00 |
|
Laurent Destailleur
|
e4705669ba
|
Merge pull request #9136 from frederic34/patch-17
remove % in supplier order pdf
|
2018-07-24 16:51:58 +02:00 |
|
Frédéric FRANCE
|
4341e367d2
|
remove % in supplier order pdf
|
2018-07-23 10:30:28 +02:00 |
|
Frédéric FRANCE
|
d582f72bd9
|
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
|
2018-07-22 17:27:02 +02:00 |
|
John BOTELLA
|
1e986bc39a
|
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP)
|
2018-07-20 11:51:01 +02:00 |
|
gauthier
|
80ff7fa86f
|
FIX : case when we valid form with keyboard
|
2018-07-11 15:18:30 +02:00 |
|
gauthier
|
103c7e6d06
|
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
|
2018-07-11 09:51:36 +02:00 |
|
Laurent Destailleur
|
2f668ccc79
|
Merge pull request #9076 from atm-john/fix_count_parameter_6.0
Fix count(): Parameter must be an array or an object that implements …
|
2018-07-09 17:34:10 +02:00 |
|
John BOTELLA
|
1daba56bbc
|
Fix count(): Parameter must be an array or an object that implements Countable
|
2018-07-09 10:05:53 +02:00 |
|
Laurent Destailleur
|
bc632c9ab7
|
Merge pull request #9019 from atm-gauthier/6.0_fix_getentity
FIX : getEntity project and not projet
|
2018-06-30 01:15:23 +02:00 |
|
Laurent Destailleur
|
a6c6bbe16d
|
Merge pull request #9029 from hregis/6.0_multicompany
Fix: broken feature with edit in place
|
2018-06-29 19:40:17 +02:00 |
|
Laurent Destailleur
|
3f2b3c0840
|
FIX #9032
|
2018-06-29 19:38:12 +02:00 |
|
Laurent Destailleur
|
1c7cd19c1d
|
Merge pull request #9033 from hregis/6.0_bug3
Fix: #9032 Vulnerability
|
2018-06-29 19:26:12 +02:00 |
|
Laurent Destailleur
|
c4143763be
|
Update step1.php
|
2018-06-29 19:23:17 +02:00 |
|
Regis Houssin
|
41709f07d0
|
Fix: #9032 Vulnerability
|
2018-06-29 18:18:10 +02:00 |
|
Regis Houssin
|
2d13b5b59d
|
Fix: broken feature with edit in place
|
2018-06-29 15:57:34 +02:00 |
|
gauthier
|
d8ca9f2947
|
FIX : we must see number of all shared projects
|
2018-06-27 17:26:04 +02:00 |
|
gauthier
|
86a58def3b
|
FIX : getEntity project and not projet
|
2018-06-27 17:13:50 +02:00 |
|
Laurent Destailleur
|
dab264c641
|
Merge pull request #8994 from hregis/6.0_multicompany
Fix: to avoid deleting line breaks
|
2018-06-22 15:00:26 +02:00 |
|
Regis Houssin
|
8fc2f7441c
|
Fix: to avoid deleting line breaks
|
2018-06-20 09:06:16 +02:00 |
|
Laurent Destailleur
|
5d6d43d539
|
Merge pull request #8964 from atm-gauthier/6.0_accounting_entity
FIX : need to filter on aa.entity for same accounting accounts available in several entities
|
2018-06-18 14:30:55 +02:00 |
|
gauthier
|
fed61930d5
|
FIX : clause must not be there
|
2018-06-18 11:37:15 +02:00 |
|
Laurent Destailleur
|
95dfa1f7aa
|
Merge pull request #8973 from altatof/FIX_HTML_DETECTION
Fix <br/> detection
|
2018-06-18 10:42:02 +02:00 |
|
Laurent Destailleur
|
63fb82931c
|
Update functions.lib.php
|
2018-06-18 10:41:11 +02:00 |
|
altatof
|
5d6cd381b9
|
Fix <br/> detection
|
2018-06-15 15:59:14 +02:00 |
|
gauthier
|
e9d65ea751
|
FIX : need to filter on aa.entity for same accounting accounts available in several entities
|
2018-06-14 11:56:22 +02:00 |
|
Laurent Destailleur
|
09c92b7cc8
|
Merge pull request #8936 from atm-gauthier/6.0_fix_dont_remove_all_fourn_rights
FIX : If we enable 3 steps for supplier order approbation, we must no…
|
2018-06-13 21:36:01 +02:00 |
|
Laurent Destailleur
|
c586f2ecf7
|
Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE
FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
|
2018-06-13 21:20:42 +02:00 |
|
Laurent Destailleur
|
b5cd722eb1
|
Merge pull request #8917 from atm-gauthier/6.0_fix_apply_reduc
FIX : sometimes amounts are identical but php find them different.
|
2018-06-13 20:34:59 +02:00 |
|
Laurent Destailleur
|
5fcfad5966
|
Merge pull request #8918 from atm-gauthier/6.0_fix_entity_select_prod_fourn_prices
FIX : entity test must be on product_fourn_price table and not product table
|
2018-06-13 20:08:25 +02:00 |
|
altatof
|
d42f00bca9
|
FIX : pu_ht_devise was not converted to numeric so decimals were lost
when clculating total_ht_devise
|
2018-06-13 16:35:52 +02:00 |
|
gauthier
|
baf9d4a806
|
FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def.
|
2018-06-08 17:11:59 +02:00 |
|
Laurent Destailleur
|
426eb178f2
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-06-05 18:22:28 +02:00 |
|
Laurent Destailleur
|
8785d69548
|
Do not load database handler
|
2018-06-05 18:21:56 +02:00 |
|
Laurent Destailleur
|
4c21ad4e4e
|
FIX: dol_delete_file must work in a context without db handler loaded
Conflicts:
htdocs/core/lib/files.lib.php
|
2018-06-05 18:12:14 +02:00 |
|
gauthier
|
45ecb0258b
|
FIX : entity test must be on product_fourn_price table and not product table
|
2018-06-05 12:41:38 +02:00 |
|
gauthier
|
77e7932671
|
FIX : sometimes amounts are identical but php find them different.
|
2018-06-05 11:33:58 +02:00 |
|
Laurent Destailleur
|
7eaa2011ba
|
Merge pull request #8900 from atm-florian/6.0_fixagenda
fix: when agenda is filterd with "todo" event, do not display "not applicable" event
|
2018-06-04 13:39:23 +02:00 |
|
florian HENRY
|
b996237142
|
fix: when agenda is filterd with "todo" event, do not display "not
applicable" event
|
2018-05-30 13:37:17 +02:00 |
|
Laurent Destailleur
|
60321aabd8
|
Fix regression
|
2018-05-30 11:59:23 +02:00 |
|
Laurent Destailleur
|
7590df85e6
|
Merge pull request #8887 from atm-florian/6.0
add hook on balence pages
|
2018-05-30 10:47:59 +02:00 |
|