atm-greg
|
f8fef61075
|
remove useless db begin
|
2018-08-30 09:19:44 +02:00 |
|
Laurent Destailleur
|
e317b0847a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
README.md
|
2018-08-29 18:50:00 +02:00 |
|
Laurent Destailleur
|
7af083f1ec
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-29 18:49:08 +02:00 |
|
Laurent Destailleur
|
275b9a9960
|
Merge pull request #9325 from frederic34/patch-12
Fix allow barcode with special char
|
2018-08-29 18:01:15 +02:00 |
|
Laurent Destailleur
|
46a24ff28f
|
Merge pull request #9321 from atm-gauthier/6.0_fix_default_bank_on_create_propal
FIX : $fk_account is always empty, must be $soc->fk_account
|
2018-08-29 17:56:36 +02:00 |
|
Laurent Destailleur
|
cb24fa0f08
|
Merge pull request #9310 from frederic34/patch-9
Build Badge for 6.0
|
2018-08-29 17:50:04 +02:00 |
|
Frédéric FRANCE
|
24be0b7305
|
Update viewimage.php
code may have rich content (qrcode, datamatrix,...)
|
2018-08-29 13:08:52 +02:00 |
|
gauthier
|
61a57e619f
|
FIX : $fk_account is always empty, must be $soc->fk_account
|
2018-08-28 16:54:04 +02:00 |
|
Frédéric FRANCE
|
53e476483c
|
Build Badge for 6.0
|
2018-08-28 09:38:24 +02:00 |
|
Laurent Destailleur
|
b96082a577
|
Merge pull request #9274 from frederic34/patch-17
Build badge for 5.0
|
2018-08-28 01:38:06 +02:00 |
|
Frédéric FRANCE
|
b1a3238c94
|
Build badge for 5.0
|
2018-08-21 14:22:29 +02:00 |
|
Laurent Destailleur
|
009424cd67
|
Merge pull request #9226 from atm-greg/Fix_project_delete_tasks
Fix project delete tasks
|
2018-08-21 13:11:00 +02:00 |
|
Laurent Destailleur
|
91bfa4be6c
|
Update project.class.php
|
2018-08-21 13:10:20 +02:00 |
|
Laurent Destailleur
|
3523c2b3d2
|
Update project.class.php
|
2018-08-21 13:09:06 +02:00 |
|
Laurent Destailleur
|
e88b68f131
|
Merge pull request #9246 from atm-florian/6.0
fix : ODT project substitution
|
2018-08-16 00:33:04 +02:00 |
|
florian HENRY
|
20309665e6
|
fix : ODT project substitution
|
2018-08-14 10:45:08 +02:00 |
|
atm-greg
|
ba6f7d4b0a
|
fix infinite loop
|
2018-08-14 09:32:43 +02:00 |
|
Laurent Destailleur
|
61a5be6e2a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-12 19:19:21 +02:00 |
|
Laurent Destailleur
|
b81b6b651f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-12 19:17:26 +02:00 |
|
Laurent Destailleur
|
7f797668c9
|
Merge pull request #9186 from atm-florian/6.0
fix : odt project and task extrafields management
|
2018-08-12 18:15:02 +02:00 |
|
florian HENRY
|
06189f8153
|
Merge branch '6.0' into 6.0_fhe
|
2018-08-09 18:31:59 +02:00 |
|
atm-greg
|
3d84adbd76
|
fix recurcivity
|
2018-08-09 12:21:48 +02:00 |
|
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 |
|
florian HENRY
|
ceb85cfa45
|
fix : odt project and task extrafields management
|
2018-07-31 17:29:08 +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
|
97b1589fb5
|
Merge pull request #9082 from ATM-Marc/FIX_5.0_propal_projectFromOrigin
FIX: propal: correctly preset project when creating with origin/originid
|
2018-07-10 10:42:10 +02:00 |
|
Marc de Lima Lucio
|
2ba7c07574
|
FIX: propal: correctly preset project when creating with origin/originid
|
2018-07-09 17:34:31 +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 |
|