Philippe GRAND
|
38ca6096b2
|
Standardize and update code
|
2018-09-05 10:31:12 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Philippe GRAND
|
7b47c79bc3
|
precise label comment
|
2018-09-01 14:06:58 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Philippe GRAND
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Laurent Destailleur
|
b863b5176d
|
Merge pull request #9322 from grandoc/new_branch_29_08_2018
New branch 29 08 2018
|
2018-09-01 12:11:01 +02:00 |
|
Philippe GRAND
|
9e880d3e72
|
Standardize and update code
|
2018-08-31 17:55:31 +02:00 |
|
Philippe GRAND
|
2e66c65650
|
WTF...
|
2018-08-30 12:03:20 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
cbdc669ba9
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-29 18:45:36 +02:00 |
|
Laurent Destailleur
|
ee204e2e64
|
Fix regression in php style
|
2018-08-29 15:37:35 +02:00 |
|
Philippe GRAND
|
4b7dd5ace3
|
Fix white spaces
|
2018-08-29 12:29:05 +02:00 |
|
Philippe Grand
|
b7bc34963a
|
Update paymentsalary.class.php
|
2018-08-28 10:41:05 +02:00 |
|
Philippe GRAND
|
65af8f902f
|
Update and standardize code
|
2018-08-28 09:44:54 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Philippe GRAND
|
2fa82edd39
|
Standardize and update code
|
2018-08-23 17:07:27 +02:00 |
|
Philippe GRAND
|
504b0e3d16
|
Update and standardize code
|
2018-08-22 18:34:50 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Alexandre SPANGARO
|
ee61a88540
|
Small fix
|
2018-08-01 07:46:17 +02:00 |
|
Alexandre SPANGARO
|
b0e2e69ed0
|
New : Add project on salaries
|
2018-07-31 07:45:03 +02:00 |
|
Laurent Destailleur
|
e72c2e6a11
|
Enhance sorting of field for lists on field with several sort criterias
|
2018-04-28 19:54:41 +02:00 |
|
Alexandre SPANGARO
|
5eccc6bcbc
|
NEW Add stats in salaries module
|
2018-03-15 06:23:20 +01:00 |
|
Laurent Destailleur
|
ead629708c
|
Look and feel v6
|
2017-11-17 14:57:14 +01:00 |
|
Laurent Destailleur
|
7b661685cc
|
Debug modBlockedLog module
|
2017-10-24 15:22:46 +02:00 |
|
Laurent Destailleur
|
5e34b121dd
|
Add more robust php unit to detect not escaped sql. Fix not escaped sql
|
2017-09-15 15:41:07 +02:00 |
|
Laurent Destailleur
|
bdfb0b7561
|
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
|
2017-07-26 21:22:53 +02:00 |
|
Laurent Destailleur
|
0d11fce834
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-12 15:45:30 +02:00 |
|
Laurent Destailleur
|
419c15ee8e
|
Fix escaping class
|
2017-05-12 15:28:10 +02:00 |
|
Laurent Destailleur
|
216bce608d
|
Work on v6 look and feel
|
2017-04-06 23:28:06 +02:00 |
|
Laurent Destailleur
|
62792c08eb
|
Merge pull request #3591 from GPCsolutions/inherited
[Qual] Cleanup of inherited class properties
|
2015-09-26 11:23:59 +02:00 |
|
Raphaël Doursenaud
|
67ddb6c94e
|
[Qual] Cleanup of inherited class properties
|
2015-09-24 20:12:55 +02:00 |
|
aspangaro
|
918c323f8f
|
Salaries : Add info card / add field datec / rename field user_creat to user_author
|
2015-09-23 06:37:14 +02:00 |
|
aspangaro
|
59e88590e0
|
Move my address email to new one
|
2015-07-15 20:30:33 +02:00 |
|
aspangaro
|
560150fd1c
|
Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)
|
2015-04-22 07:15:17 +02:00 |
|
Laurent Destailleur
|
56a14da5d4
|
FIXME that are not bug are replaced with TODO
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
|
2015-04-12 04:01:28 +02:00 |
|
aspangaro
|
d69f066735
|
QUAL: Traduce terms + remove <center>
|
2015-03-15 14:04:07 +01:00 |
|
Laurent Destailleur
|
dc30092290
|
Add column to store salary ref when doing payment.
|
2015-03-10 10:11:51 +01:00 |
|
frederic34
|
f4161b457b
|
Add dol_escape_htmltag and start to adapt boxes
|
2015-01-22 00:23:55 +01:00 |
|
frederic34
|
1b0dd671b3
|
Add tooltip in getNomUrl link
|
2015-01-20 21:40:33 +01:00 |
|
frederic34
|
60661ae948
|
Add some "classfortooltip"
|
2015-01-09 00:07:54 +01:00 |
|
Laurent Destailleur
|
445f696d28
|
Fix: Pb of object with wrong type.
|
2014-11-15 18:24:38 +01:00 |
|
Laurent Destailleur
|
d98bfb1d8d
|
Fix: Bugs reported by scrutinizer
|
2014-11-15 15:19:37 +01:00 |
|
aspangaro
|
0b20369dd7
|
Qual: Renamed all files & links "fiche.php" into "card.php"
|
2014-09-18 21:18:25 +02:00 |
|
Marcos García de La Fuente
|
ec661d0c6c
|
Removed index.php and replaced them with blank index.html as it is more appropriate
|
2014-07-12 23:18:57 +02:00 |
|
Juanjo Menent
|
893240ce21
|
Qual: Uniformize code. Errors
|
2014-07-12 09:48:10 +02:00 |
|
KreizIT
|
a7afb5bdae
|
Refactor: PAIEMENT_SALARY_* trigger
|
2014-07-11 14:54:32 +02:00 |
|
Marcos García de La Fuente
|
56abf1cd72
|
Removed duplicated SQL error logging
|
2014-06-13 02:28:30 +02:00 |
|
Marcos García de La Fuente
|
9fbd7806f0
|
More substitutions
|
2014-06-12 11:31:53 +02:00 |
|
Laurent Destailleur
|
76330ad04a
|
Fix: [ bug #1383 ] When add a salary payment - In bank, link "user"
doesn't work
|
2014-05-11 18:35:25 +02:00 |
|
Raphaël Doursenaud
|
f8f502d013
|
Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
|
2014-05-03 18:18:44 +02:00 |
|