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
3e54ee5df7
Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop
...
Fix chromephp firephp Syslog infinite loop
2018-07-24 16:53:32 +02:00
Laurent Destailleur
a1bdc6022d
Website module
2018-07-24 01:10:38 +02:00
Laurent Destailleur
174394c476
Work on website module
2018-07-23 14:08:20 +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
Laurent Destailleur
c4e207e8b7
Fix dol_string_onlythesehtmltags
2018-07-22 15:51:19 +02:00
fappels
b697307bac
Fix chromephp firephp Syslog infinite loop.
...
When chromephp/firephp not found ->trans causes infinite loop. Can
happen when files moved to other server or location.
2018-07-22 10:41:39 +02:00
Laurent Destailleur
2c7029850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2018-07-21 20:28:26 +02:00
Laurent Destailleur
1d8c42265c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2018-07-21 20:26:19 +02:00
Laurent Destailleur
a1180f79bd
Fix missing customer code and ref customer
2018-07-21 12:56:18 +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
Laurent Destailleur
8247bb683c
Debug website module
2018-07-19 21:35:21 +02:00
Maxime Kohlhaas
22d94a570a
Allow to enter a timespent with a numeric value
2018-07-19 19:04:07 +02:00
Laurent Destailleur
445db58966
FIX website in inline edit mode
2018-07-19 16:06:48 +02:00
Laurent Destailleur
e362a0e9df
FIX website in inline edit mode
2018-07-19 16:06:06 +02:00
Laurent Destailleur
efa5cdeab1
More complete list of allowed html tags
2018-07-19 15:24:48 +02:00
Laurent Destailleur
7dc552a54e
Fix alignement
2018-07-17 18:10:42 +02:00
Laurent Destailleur
26507ee712
Code comment
2018-07-17 14:02:08 +02:00
Laurent Destailleur
7fcec5f6c3
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:50:26 +02:00
Laurent Destailleur
d4a5491753
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:48:08 +02:00
Laurent Destailleur
508133b336
Clean code
2018-07-17 13:04:54 +02:00
Steve
9d3a0442c0
dolibarr-develop, php 7.2.7
...
On third party, add bank account. After spanish account has been added, on summary screen
..../htdocs/societe/paymentmodes.php
a correct account number causes the error:
Warning: A non-numeric value encountered in .......\public_html\dolibarr-develop\htdocs\core\lib\bank.lib.php on line 359
This is
`$sum += $values[$i] * substr($InumCta, $i, 1);`
Since substr returns a string it cannot be summed (I assume).
I changed it to
`$sum += $values[$i] * (int)substr($InumCta, $i, 1)`
2018-07-16 17:10:33 +02:00
Laurent Destailleur
f747cefda3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec
NEW Can enable a module, even external module, from command line
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-16 15:35:00 +02:00
Laurent Destailleur
e5f2fbf8db
Fix trans
2018-07-16 15:21:29 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
e92ab19a06
Fix var not defined
2018-07-16 11:26:23 +02:00
Laurent Destailleur
c477ca8266
Fix scrutinizer
2018-07-16 11:25:21 +02:00
Laurent Destailleur
4128cee3ee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-16 11:21:29 +02:00
Laurent Destailleur
e3d9e609d5
Fix var not defined
2018-07-16 11:20:54 +02:00
ATM-Nicolas
3c5998e697
FIX : Refactoring
2018-07-16 11:16:55 +02:00
Laurent Destailleur
d3cc2c81eb
Better detail for time elapsed
2018-07-16 11:14:39 +02:00
Laurent Destailleur
89cc048fff
FIX Init of contact in combo list when thirdparty not yet known
2018-07-16 10:46:10 +02:00
Laurent Destailleur
c94437c3cf
Fix file in wrong dir
2018-07-16 10:14:51 +02:00
Laurent Destailleur
76c6f28d85
Merge pull request #9035 from grandoc/new_branch_29_06_2018
...
update code
2018-07-16 10:09:46 +02:00
Laurent Destailleur
6bf4ef5ef4
Fix double "
...
Fix double "
2018-07-16 10:09:13 +02:00
Laurent Destailleur
e72e56ce2d
Merge pull request #9041 from grandoc/new_branch_02_07_2018
...
update description code
2018-07-16 10:03:54 +02:00
Laurent Destailleur
3710f95719
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/exports.lang
2018-07-16 10:01:23 +02:00
Laurent Destailleur
6846ff7d21
Fix problem in some vars as reported in #8955
2018-07-16 09:57:45 +02:00
ATM-Nicolas
9d60b0a8c6
Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0
2018-07-16 09:47:16 +02:00
ATM-Nicolas
de8fd3d12c
NEW : Contact substitutions keys
2018-07-16 09:33:14 +02:00
Laurent Destailleur
1e42db0641
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-15 20:16:54 +02:00
Laurent Destailleur
e92052353d
Merge pull request #9026 from inoveaconseil/FixExtrafieldResource
...
Fix extrafields resource
2018-07-15 20:13:24 +02:00
Laurent Destailleur
9b644fb92f
Merge pull request #9054 from grandoc/new_branch_05_07_2018
...
docs: complete comments
2018-07-15 20:12:21 +02:00
Laurent Destailleur
bff4ed8103
Merge pull request #9098 from atm-florian/develop
...
fix list of event of thirdparty and unformize code
2018-07-15 20:10:19 +02:00
Laurent Destailleur
a5442033ac
Code comment
2018-07-15 20:09:51 +02:00
Laurent Destailleur
ba36d1aef0
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes
...
fix sql error functions.lib.php
2018-07-15 20:00:54 +02:00
Laurent Destailleur
0ca9f6f522
Update functions.lib.php
2018-07-15 20:00:43 +02:00