lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,981 Commits 43 Branches 150 Tags 886 MiB
876eae7c5a
Commit Graph

49981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
876eae7c5a git push origin developMerge branch 'defrance-patch-77' into develop 2015-10-22 13:13:27 +02:00
Laurent Destailleur
9cce56895c Merge branch 'patch-77' of https://github.com/defrance/dolibarr into 
defrance-patch-77

Conflicts:
	htdocs/core/lib/admin.lib.php
 2015-10-22 13:13:02 +02:00
Laurent Destailleur
3d7050e051 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 12:29:35 +02:00
Laurent Destailleur
9cbb9129c2 FIX #3772 2015-10-22 12:29:24 +02:00
Laurent Destailleur
ce681081c1 Merge pull request #3776 from frederic34/patch-15 
Set warehouse for order
 2015-10-22 12:16:40 +02:00
Laurent Destailleur
b4c2fc7101 Merge pull request #3782 from frederic34/patch-17 
Add draft suppliers orders in /comm/index
 2015-10-22 10:42:07 +02:00
Laurent Destailleur
c682065ca4 Merge pull request #3780 from frederic34/patch-16 
Fix some action has no effect in shipment
 2015-10-22 10:40:28 +02:00
Laurent Destailleur
a5912d1909 Merge pull request #3778 from grandoc/develop 
[Qual] Uniformize code
 2015-10-22 10:39:55 +02:00
Laurent Destailleur
f312ee58de Merge pull request #3779 from All-3kcis/develop-patch-10 
Correct return value
 2015-10-22 10:35:55 +02:00
Laurent Destailleur
24919b1f3d Merge pull request #3781 from jpfox/patch-1 
fix test against empty amount on book update
 2015-10-22 10:35:26 +02:00
Laurent Destailleur
40adaf716d Uniformize index names 2015-10-22 10:33:42 +02:00
Laurent Destailleur
4453ba53fd Fix migration error 2015-10-22 10:28:59 +02:00
frederic34
865e9d9738 Merge remote branch 'upstream/develop' into patch-15 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2015-10-22 10:28:06 +02:00
Laurent Destailleur
8bdbed69c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2015-10-22 10:22:54 +02:00
Laurent Destailleur
81d4148f4a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 09:50:26 +02:00
Laurent Destailleur
474692e71a Remove duplicate page fourn/list.php 2015-10-22 09:48:16 +02:00
Laurent Destailleur
7daf9d10af Work on the new selectArrayAjax widget 2015-10-21 20:50:27 +02:00
Laurent Destailleur
fd72b4a400 Work on the new selectArrayAjax widget 2015-10-21 20:43:11 +02:00
philippe grand
c9d1b72087 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-21 13:43:04 +02:00
BENKE Charlie
ef79bb3b67 Update dict.php 2015-10-21 05:23:49 +02:00
BENKE Charlie
88ca8d2ace Update dict.php 2015-10-21 05:22:33 +02:00
BENKE Charlie
ec9955986f Update admin.lib.php 2015-10-21 05:07:13 +02:00
BENKE Charlie
4f519b5747 Update admin.lib.php 2015-10-21 05:06:19 +02:00
Laurent Destailleur
9a1ec900bd NEW Add into about page, a sample text to use to promote new version 
release (visible only if version is last stable)
 2015-10-21 00:31:32 +02:00
Frédéric FRANCE
73f13045c1 Update index.php 2015-10-20 18:24:14 +02:00
Frédéric FRANCE
15733f5ed0 Update propal.lang 2015-10-20 18:23:30 +02:00
Frédéric FRANCE
be85943d13 Update orders.lang 2015-10-20 18:21:28 +02:00
Frédéric FRANCE
2989a94458 Update index.php 2015-10-20 18:19:32 +02:00
Frédéric FRANCE
4062e7474d Update index.php 2015-10-20 18:05:21 +02:00
Frédéric FRANCE
506b251f24 Update orders.lang 2015-10-20 17:02:04 +02:00
Frédéric FRANCE
d9a56ef418 Update index.php 2015-10-20 17:00:34 +02:00
Laurent Destailleur
8306d93286 NEW Add css on column of detail lines to allow module to easily 
manipulate fields.
 2015-10-20 16:08:25 +02:00
Jean-Pierre Morfin
6f37fef05e fix test against empty amount on book update 
- amount < 1 was considered as 0
- 0.00 was not considered as empty so $book->sens was always C
 2015-10-20 14:44:20 +02:00
Laurent Destailleur
f123e11c8e Doxygen 2015-10-20 12:53:32 +02:00
Laurent Destailleur
0c6441df74 FIX Using extrafield with type "Link to object" works correctly. 2015-10-20 12:40:37 +02:00
Frédéric FRANCE
2cb9dd8bf3 Update shipment.php 2015-10-20 10:33:46 +02:00
Frédéric FRANCE
f22b3cdfee Fix some action has no effect in shipment 2015-10-20 10:31:45 +02:00
Frédéric FRANCE
a0fe65266a Update shipment.php 2015-10-20 09:50:09 +02:00
All-3kcis
3cb2637f25 Correct return value 2015-10-20 09:42:02 +02:00
philippe grand
72491db6b4 [Qual] Uniformize code 2015-10-20 09:31:33 +02:00
Laurent Destailleur
0d9c0b1215 Disable of image done by css, not dol_optimize_smallscreen option 2015-10-20 02:49:34 +02:00
Laurent Destailleur
39b0e21011 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-20 02:35:15 +02:00
Laurent Destailleur
22979523db Try a fix for #3742 2015-10-20 02:34:53 +02:00
Laurent Destailleur
fa138ca526 Fix color of text 2015-10-20 02:31:24 +02:00
Laurent Destailleur
2da9ec80c8 Merge pull request #3777 from frederic34/patch-16 
Output log to fix travis
 2015-10-20 00:58:13 +02:00
Laurent Destailleur
b5e633ef42 Size too small 2015-10-20 00:52:53 +02:00
Laurent Destailleur
e70bb28be7 If firstname not define, use lastname 2015-10-20 00:47:35 +02:00
Laurent Destailleur
921faa0410 Work on theme md 2015-10-20 00:25:31 +02:00
Laurent Destailleur
23d7d60d73 Better compatibility with old versions 2015-10-20 00:22:28 +02:00
Frédéric FRANCE
fcac4c6059 Output log to fix travis 2015-10-19 23:15:13 +02:00