lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,482 Commits 43 Branches 150 Tags 886 MiB
b862e28d5b
Commit Graph

45482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphaël Doursenaud
b862e28d5b Added contributing guidelines. 
See: https://github.com/blog/1184-contributing-guidelines
 2015-01-23 15:07:51 +01:00
Laurent Destailleur
71a8f97c89 Optimize code 2015-01-23 02:11:10 +01:00
Laurent Destailleur
0ca1647e11 Fixed: Removed bad commited dir 2015-01-23 01:52:56 +01:00
Laurent Destailleur
4aa4f5f5e9 Merge remote-tracking branch 'origin_dolibarr/develop' into develop 2015-01-22 23:14:40 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +01:00
Laurent Destailleur
04afe935a5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-22 21:47:32 +01:00
Laurent Destailleur
b7cff09ce6 Fixed travis errors 2015-01-22 21:46:22 +01:00
Laurent Destailleur
eedca43cc3 New: Add option PROJECT_ADD_SUBTOTAL_LINES to group by supplier lines 
into refering project view.
 2015-01-22 21:31:00 +01:00
Laurent Destailleur
b7328caa9a Fixed: Bad date for supplier orders 2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3 Fix: select if field is null 2015-01-22 20:10:25 +01:00
Laurent Destailleur
7b8b189bac Fix: select if field is null 2015-01-22 20:09:57 +01:00
Laurent Destailleur
c4782f960c Qual: Removed not cleand function 2015-01-22 19:47:53 +01:00
Laurent Destailleur
0f7238937a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/commande/fiche.php
 2015-01-22 18:55:26 +01:00
Laurent Destailleur
639d582a44 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 18:44:21 +01:00
Laurent Destailleur
36c083e9db Fixed: Refresh was doing update 2015-01-22 18:44:02 +01:00
Laurent Destailleur
321e46e596 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-22 18:35:55 +01:00
Laurent Destailleur
5c007e53be Update sample examples 2015-01-22 18:35:02 +01:00
Laurent Destailleur
78e90493ed Merge pull request #2269 from frederic34/tooltip 
Add tooltip in getNomUrl link
 2015-01-22 13:58:20 +01:00
Laurent Destailleur
e31decb3cf Merge pull request #2271 from aspangaro/3.7 
Correct link
 2015-01-22 13:57:30 +01:00
Laurent Destailleur
4bb86717cf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 12:30:18 +01:00
Laurent Destailleur
31be2563c2 Fixed: Allow external module a chance to fix regression. 2015-01-22 12:29:55 +01:00
aspangaro
6f3d9200bf Correct link 2015-01-22 07:15:14 +01:00
frederic34
12c8d4ba1f Merge remote branch 'upstream/develop' into tooltip 2015-01-22 00:44:50 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
Emmanuel Haguet
296d947bd2 Corrections (fichier, calcul de ref) 2015-01-21 16:25:13 +01:00
Emmanuel Haguet
0b3aebeac0 renommage data.csv, User dolibarr et 2ème script 2015-01-21 15:06:32 +01:00
Laurent Destailleur
017a483eb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-21 00:06:03 +01:00
Laurent Destailleur
59ef42cd52 Merge branch 'marcosgdf-delay-emailing' into develop 2015-01-21 00:05:36 +01:00
Laurent Destailleur
449f2b9346 Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr 
into marcosgdf-delay-emailing

Conflicts:
	htdocs/comm/mailing/card.php
 2015-01-21 00:05:19 +01:00
Laurent Destailleur
da75877caa Merge pull request #2264 from frederic34/patch-2 
Use getNomUrl on every list to uniformize display
 2015-01-21 00:03:21 +01:00
Laurent Destailleur
25194c4caf Merge pull request #2268 from frederic34/patch-4 
Type of supplier invoice was broken
 2015-01-21 00:02:23 +01:00
Laurent Destailleur
9f00f5d525 Merge pull request #2265 from frederic34/patch-3 
Use css badge
 2015-01-21 00:00:32 +01:00
Laurent Destailleur
3af67b414e Merge pull request #2267 from tiaris/3.6 
add left joins on llx_c_actioncomm
 2015-01-21 00:00:00 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Frédéric FRANCE
3ab6ac601e Type of supplier invoice was broken 2015-01-20 17:55:20 +01:00
jean
b809f0aeb8 Merge remote-tracking branch 'origin/3.6' into 3.6 2015-01-20 17:31:17 +01:00
jean
5ec0b32ab0 add left joins on llx_c_actiocomm 2015-01-20 17:26:32 +01:00
Emmanuel Haguet
b93c3cc7ce Script Import Fournisseur + données au format CSV 2015-01-20 14:54:18 +01:00
Frédéric FRANCE
229f7888ca Update index.php 2015-01-19 20:38:33 +01:00
Frédéric FRANCE
fb9f53010f Update index.php 2015-01-19 20:36:38 +01:00
Frédéric FRANCE
0a41a025ae Update index.php 2015-01-19 20:35:29 +01:00
Frédéric FRANCE
2d911e1a8f Update card.php 2015-01-19 20:19:36 +01:00
Frédéric FRANCE
1fc9517200 Use css badge 2015-01-19 19:18:57 +01:00
Frédéric FRANCE
e82301e001 Update card.php 2015-01-19 19:07:34 +01:00
Frédéric FRANCE
388697b73e Use getNomUrl on every list to uniformize display 2015-01-19 18:55:55 +01:00
Laurent Destailleur
8d0c8b888d Merge pull request #2263 from frederic34/patch-1 
Use account defined in invoice for pdf doc
 2015-01-19 15:31:26 +01:00
Laurent Destailleur
67debbe37d Merge pull request #2262 from FHenry/develop 
add extrafield type, check box from table
 2015-01-19 15:30:14 +01:00
Laurent Destailleur
e14684c417 Merge pull request #2259 from marcosgdf/misc-fixes 
misc-fixes
 2015-01-19 15:28:28 +01:00
Florian HENRY
a4561ab4ad merge 2015-01-19 09:41:31 +01:00
Florian HENRY
ab50437331 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/html.form.class.php
 2015-01-19 09:38:00 +01:00