lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,268 Commits 43 Branches 150 Tags 886 MiB
68d70e9eba
Commit Graph

56268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
68d70e9eba Merge pull request #5904 from atm-florian/dev_consomption_thirdparty_withmorefigures 
NEW : Consumption view on thirdparty add total line and total HT by element
 2016-10-26 10:45:21 +02:00
florian HENRY
c37cc5b6d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_consomption_thirdparty_withmorefigures 2016-10-26 10:44:15 +02:00
Laurent Destailleur
bf0345da42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-26 10:42:46 +02:00
Laurent Destailleur
11c4f49a15 FIX #5924 2016-10-26 10:42:34 +02:00
Laurent Destailleur
b04230e38c Merge pull request #5916 from aspangaro/5.0-p30 
War against colspan - Supplier payment card
 2016-10-26 10:41:19 +02:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
99d24b8e62 Update doc 2016-10-26 10:36:22 +02:00
Laurent Destailleur
709e4b0499 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-26 10:26:43 +02:00
Laurent Destailleur
201288280d Merge pull request #5920 from simnandez/develop 
Fix: Use undeclared variable
 2016-10-26 10:22:52 +02:00
Laurent Destailleur
854e75513b Fix bad alias 2016-10-25 21:44:10 +02:00
Laurent Destailleur
43bf372cf7 Fix doxygen 2016-10-25 21:15:25 +02:00
Laurent Destailleur
b999b0bb82 Fix dead code 2016-10-25 21:04:49 +02:00
Laurent Destailleur
4a3251407f Fix missing cache dir 2016-10-25 20:46:21 +02:00
Laurent Destailleur
01dd8fee48 Minor enhancement 2016-10-25 20:36:22 +02:00
Laurent Destailleur
9fd692d846 Fix phpcs 2016-10-25 19:28:58 +02:00
Laurent Destailleur
7c5ca155cb Fix error 2016-10-25 19:21:08 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
Laurent Destailleur
5d655d47fe Enhance css 2016-10-25 12:36:14 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
Juanjo Menent
94a884cea8 Fix: Use undeclared variable 2016-10-25 09:45:53 +02:00
Juanjo Menent
94d1e6180e Merge remote-tracking branch 'upstream/develop' into develop 2016-10-25 09:44:54 +02:00
florian HENRY
237d04e3c0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_consomption_thirdparty_withmorefigures 2016-10-25 09:44:03 +02:00
Laurent Destailleur
384abd8462 Uniformize look and feel 2016-10-25 02:56:46 +02:00
Laurent Destailleur
7b3793c775 Fix W3C on FTP setup page 2016-10-25 02:33:40 +02:00
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +02:00
Laurent Destailleur
eb37c72513 Uniformise code 2016-10-24 20:56:48 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Juanjo Menent
9ab25d4472 Fix: Use undeclared variable 2016-10-24 18:51:46 +02:00
Laurent Destailleur
36c2b5afcd Responsive 2016-10-24 18:43:17 +02:00
Laurent Destailleur
6bd219b117 Fix column task ref/label 2016-10-24 17:47:31 +02:00
Laurent Destailleur
bc2342e9a4 Fix bad link 2016-10-24 17:37:39 +02:00
Laurent Destailleur
f1421a2ee4 Rename constant with english name 2016-10-24 13:10:35 +02:00
Laurent Destailleur
0ae5a3799c Fix html 2016-10-24 12:42:37 +02:00
Laurent Destailleur
8222f7a78b Fix translation 2016-10-24 12:24:46 +02:00
Laurent Destailleur
3b05d00163 Better responsive design 2016-10-24 12:06:33 +02:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
florian HENRY
201e084186 style 2016-10-24 09:07:21 +02:00
florian HENRY
5dcf3033ec Merge branch 'develop' into dev_consomption_thirdparty_withmorefigures 2016-10-24 08:53:51 +02:00
florian HENRY
4c4e404dae Add unit PRice 2016-10-24 08:53:39 +02:00
aspangaro
845c770d01 War against colspan - Supplier payment card 2016-10-24 05:53:59 +02:00
Laurent Destailleur
39bc78909b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d Save information of vat code into database 2016-10-24 03:23:40 +02:00
Laurent Destailleur
c976044d70 Merge pull request #5910 from aspangaro/5.0-p28 
Better presentation for member edit card
 2016-10-24 03:20:24 +02:00
Laurent Destailleur
09ef693c5f Merge pull request #5908 from openthink-laurent/add-file-scheme-allowed-uris-schemes-links 
NEW Add file:// scheme to allowed URIs schemes for links
 2016-10-24 03:19:53 +02:00
Laurent Destailleur
4e23f1adf1 Merge pull request #5902 from aspangaro/5.0-p25 
Better presentation of invoice payment page
 2016-10-24 02:43:44 +02:00
Laurent Destailleur
9560ec54cc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:10:17 +02:00
Laurent Destailleur
18fad2088a git push origin developMerge branch 'atm-florian-dev_resource_extrafields' into develop 2016-10-24 02:05:56 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00