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

56461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
ed25c0fda5 Merge pull request #5645 from grandoc/4.0 
fix : bad sort
 2016-08-25 13:38:59 +02:00
Juanjo Menent
c298bb62ba Merge pull request #5644 from grandoc/3.9 
fix : translation
 2016-08-25 13:38:18 +02:00
BENKE Charlie
223eed0cba Update index.php 2016-08-25 12:24:38 +02:00
BENKE Charlie
89e6b5a6cd add color of type for URL background 2016-08-25 12:22:17 +02:00
Regis Houssin
6e40f9e700 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/core/class/html.form.class.php

Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
 2016-08-25 10:15:26 +02:00
phf
7813f0be27 Fix deprecated value given to dol_print_date 2016-08-25 10:07:19 +02:00
florian HENRY
848d046b46 Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 2016-08-25 09:06:39 +02:00
Laurent Destailleur
b81de6b383 Fix wrapping with jmobile 2016-08-24 20:23:06 +02:00
Laurent Destailleur
8f809e403d Uniformize code 2016-08-24 19:38:34 +02:00
Laurent Destailleur
87c49366d8 Uniformize code 2016-08-23 15:43:48 +02:00
BENKE Charlie
777b9fe4d8 Update 4.0.0-5.0.0.sql 2016-08-23 11:28:10 +02:00
BENKE Charlie
4a2b7e1bba add link to commande fourn if resplenish 2016-08-23 11:25:14 +02:00
Maxime Kohlhaas
52cbdf04c3 Allow to use textwithpicto with a custom picto 2016-08-23 11:03:47 +02:00
Regis Houssin
6b3cbc918d Fix: wrong "lastoutput" and "lastresult" if jobtype is "method" or 
"function"
 2016-08-22 20:49:14 +02:00
Laurent Destailleur
e22e243bc5 NEW Can set to paid automaically social or fiscal contributions after a 
payment was recorded.
 2016-08-22 14:31:15 +02:00
florian HENRY
ab4997d26f Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 2016-08-22 14:30:08 +02:00
Laurent Destailleur
03c30c487c Uniformise code 2016-08-22 13:46:38 +02:00
Laurent Destailleur
317132fea4 CSS 2016-08-22 12:25:54 +02:00
Laurent Destailleur
0839a9fa4f Code comment 2016-08-20 00:54:49 +02:00
Laurent Destailleur
1fc5715040 Fix date of contract not used 2016-08-20 00:30:09 +02:00
Laurent Destailleur
c0d6d6d92c CSS 2016-08-20 00:22:16 +02:00
Laurent Destailleur
f06545a3fe Fix cancel button ignored 2016-08-19 17:22:53 +02:00
philippe grand
9c22d94bd3 fix : bad sort 2016-08-19 17:12:46 +02:00
philippe grand
919b73b4c4 fix : translation 2016-08-19 16:29:54 +02:00
Laurent Destailleur
83107746ad Fix no way to fix the ref of recurring invoice when an error was done 
into typing.
 2016-08-19 16:18:39 +02:00
florian HENRY
137f1c4e4f Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/resource/class/dolresource.class.php
 2016-08-18 08:49:54 +02:00
Laurent Destailleur
fead7967f2 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/resource/class/resource.class.php
 2016-08-17 16:55:39 +02:00
Laurent Destailleur
7e8b8e9462 Merge pull request #5638 from atm-florian/3.9_fix_5637 
FIX : PgSQL Module Ressource list crash #5637
 2016-08-17 16:34:40 +02:00
Laurent Destailleur
f9d707ff48 Merge pull request #5630 from atm-florian/3.9 
FIX : #5629 PgSQL Interger string stylish error
 2016-08-17 16:24:40 +02:00
Laurent Destailleur
028078a2da Merge pull request #5626 from GPCsolutions/selenium 
NEW: Installation process functional test using phpunit-selenium
 2016-08-17 16:15:00 +02:00
Laurent Destailleur
88afc4ad5a Merge pull request #5625 from aspangaro/4.0-p42 
Uniformize presentation, add button cancel everywhere
 2016-08-17 16:11:59 +02:00
Laurent Destailleur
660fcacef2 Merge pull request #5619 from fappels/4.0_fix_sql_error_insert_supplier_order_line 
Fix SQL error insert supplier order line
 2016-08-17 16:10:38 +02:00
Laurent Destailleur
58fc64982f Merge pull request #5618 from fappels/4.0_fix_eatby_sellby_check 
Fix sellby without hour check
 2016-08-17 16:10:09 +02:00
Laurent Destailleur
42e573c7fb Merge pull request #5616 from marcosgdf/phpdoc 
Little changes to PHPDoc comment block
 2016-08-17 15:59:08 +02:00
Laurent Destailleur
a968b0522b Merge pull request #5610 from ObjectifLibre/docker-ldap 
[docker image] Add ldap php module, declares useful volumes
 2016-08-17 15:55:35 +02:00
Laurent Destailleur
69e6f6a489 Merge pull request #5608 from aspangaro/4.0-p40 
Fix: Some problems on export with language
 2016-08-17 15:54:36 +02:00
Laurent Destailleur
eea175b7e7 Merge pull request #5605 from aspangaro/4.0-p39 
Uniformize presentation on opensurvey
 2016-08-17 15:51:59 +02:00
Laurent Destailleur
33ceb5d626 Merge pull request #5601 from aspangaro/4.0-p37 
Uniformize title presentation on product/service card
 2016-08-17 15:50:42 +02:00
Laurent Destailleur
45cbb845d0 Merge pull request #5598 from defrance/patch-22 
add background on popup tab
 2016-08-17 15:46:16 +02:00
Laurent Destailleur
906508ec6f Close #4666 2016-08-17 15:40:17 +02:00
florian HENRY
f7bb2483d8 fix ressource for PGSQL 2016-08-17 14:53:51 +02:00
florian HENRY
ddc480b6c9 other fix for PgSQL and style 2016-08-17 14:51:25 +02:00
florian HENRY
90c918bec6 Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 2016-08-17 14:46:25 +02:00
florian HENRY
63c5425991 another fix for Ressource module in PgSQL 2016-08-17 14:46:15 +02:00
florian HENRY
5c51cb0f29 FIX : PgSQL Module Ressource list crash #5637 2016-08-17 14:40:05 +02:00
florian HENRY
00443dae3a Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-08-17 14:30:15 +02:00
Laurent Destailleur
282c50ef34 Merge pull request #5631 from atm-florian/4.0 
FIX #5594
 2016-08-17 14:08:06 +02:00
Laurent Destailleur
0cb7440647 Merge pull request #5635 from joseplluis/patch-3 
Fix Bug: delivery date value is not hide with global ORDER_DISABLE_DELIVE…
 2016-08-17 14:05:56 +02:00
Laurent Destailleur
2afc567a53 Fix fiter on contract date 2016-08-17 11:58:55 +02:00
Laurent Destailleur
caa0dd75aa Fix responsive design on small smartphone 2016-08-17 11:47:39 +02:00