Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +02:00
Philippe GRAND
d3ccf4e2b3
try to fix space errors
2018-08-29 11:55:52 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing
2018-08-28 08:33:02 +02:00
Philippe GRAND
87067b2bc9
Standardize and update code
2018-08-23 18:35:45 +02:00
Philippe GRAND
06da7f54a2
Update and standardize code
2018-08-22 18:48:53 +02:00
Philippe GRAND
6542dcf0bd
Update and standardize code
2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b
Update and standardize code
2018-08-22 11:48:26 +02:00
Philippe GRAND
a36061079b
Update and standardize code
2018-08-22 11:11:59 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Frédéric FRANCE
fa2de55109
test include
2018-07-26 11:50:54 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
9b46ae50f0
Fix left join on expensereport lines
2018-06-25 16:25:37 +02:00
Inovea Conseil
d5a3e63e05
Fix missing paramater for generateDocument
2018-06-15 09:47:28 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
florian HENRY
84f80795c3
fix #8474
2018-04-10 14:38:41 +02:00
Laurent Destailleur
eeb2d5a4da
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/cron/list.php
2018-04-05 13:24:36 +02:00
Sean Wang
3dd9d47089
Fix wrong approve time in expense report
...
The approve time showed was 8 hours more than the real time.
Checking database turned out that it had the wrong data(+8 hours).
After checking every timezone related settings were correct,
I found that it do twice idate() in setApproved().
Since we have idate() in $sql, we don't need the idate()
at the line 1249.
2018-03-29 14:49:06 +08:00
Laurent Destailleur
98b952b547
FIX Create payment of expense report
2018-03-27 12:09:34 +02:00
Laurent Destailleur
0c45760dd4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step5.php
htdocs/langs/en_US/holiday.lang
htdocs/public/payment/newpayment.php
htdocs/public/stripe/newpayment.php
2018-03-19 17:58:19 +01:00
Laurent Destailleur
ee3dcb724f
FIX email use the validate user instead of approver in holiday approval
...
email.
2018-03-19 17:20:44 +01:00
Laurent Destailleur
64f21b8a3c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2018-03-11 00:10:13 +01:00
Laurent Destailleur
241b5e9a93
FIX security report DIGITEMIS CYBERSECURITY & PRIVACY
2018-03-10 15:52:11 +01:00
Inovea Conseil
87b797bdec
Fix unknow field
2018-03-10 15:06:02 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
Laurent Destailleur
9c954de081
Error management
2018-02-08 14:25:44 +01:00
Laurent Destailleur
d8872a412b
Fix numbering for expense report
2018-02-07 15:52:57 +01:00
Laurent Destailleur
273e88a599
Fix send into ledger for expense report. Show accounted status.
2018-01-22 03:07:11 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
ce32da6217
Fix debugs APIs
2017-12-01 15:39:18 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
2077f7ad96
Update expensereport.class.php
2017-11-17 13:09:03 +01:00
Laurent Destailleur
acc2fcbddd
Update expensereport.class.php
2017-11-17 13:04:33 +01:00
Philippe GRAND
5615416d1a
better handle of errors
2017-11-15 11:09:18 +01:00
Laurent Destailleur
f33182acc5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-12 20:49:53 +01:00
Laurent Destailleur
36b4d50cff
FIX #7737
2017-11-12 20:41:25 +01:00
