Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

593 Commits

Author SHA1 Message Date
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Laurent Destailleur
739c2822af Fix look and feel v8 2018-09-04 09:42:28 +02:00
Frédéric FRANCE
03a5aba8a2 move phpcs:ignore 2018-09-02 18:49:23 +02:00
Frédéric FRANCE
3e723af018 start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
Frédéric FRANCE
10200374ef Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
5604f3b0c3 Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +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
Frédéric FRANCE
a676f4f64f function Comment Missing 2018-08-31 21:54:40 +02:00
Philippe Grand
b3c84ac3bc Merge branch 'develop' into new_branch_29_08_2018 2018-08-30 12:09:40 +02:00
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
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Philippe GRAND
ccabd2b859 Uniformize 2018-08-02 14:03:50 +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
44626a3a48 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-07-10 13:57:24 +02:00
Laurent Destailleur
c33aaa076d FIX #8984 button create expense report 2018-07-09 14:35:22 +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
Laurent Destailleur
d9fc1e0b5d Fix param to avoid to create holiday or expense report in wrong entity. 2018-06-25 10:09:01 +02:00
Laurent Destailleur
00165871bd CSS 2018-06-23 15:10:44 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
ca5f27636b Merge pull request #8978 from grandoc/new_branch_17_06_2018 
clean and update code
 2018-06-18 11:16:00 +02:00
Philippe GRAND
ddbf5e59e1 clean and update code 2018-06-18 10:12:19 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Philippe GRAND
82bb1c8806 clean and update code 2018-06-05 14:29:25 +02:00
Frédéric FRANCE
f5605bdd7d loadlangs 2018-05-26 20:51:17 +02:00
Laurent Destailleur
9315d9c423 NEW Introduce permission "approve" for "leave request" like for "expense 
report"
 2018-05-10 18:56:21 +02:00
Laurent Destailleur
3374c50e2d CSS 2018-05-01 10:42:09 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00