lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,315 Commits 43 Branches 150 Tags 886 MiB
92ef3f0cd8
Commit Graph

55315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
92ef3f0cd8 Fix responsive design 2016-08-28 16:17:23 +02:00
Laurent Destailleur
60bd986efa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-28 15:59:04 +02:00
Laurent Destailleur
e46bda5f9a Fix for jmobile 2016-08-28 15:58:52 +02:00
Laurent Destailleur
2e7e5151b7 Merge pull request #5463 from hregis/develop_origin 
New: Add entity field in llx_societe_remise_except and llx_societe_remise
 2016-08-28 12:23:04 +02:00
Laurent Destailleur
898a93b25d Merge pull request #5656 from defrance/patch-24 
New: Add color of type for url background
 2016-08-28 12:10:33 +02:00
BENKE Charlie
f6a7838c80 Update actioncomm.class.php 
the variable name defined on the class is type_color
 2016-08-28 07:59:47 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
72ccedba98 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-28 02:17:23 +02:00
Laurent Destailleur
0d992b2b99 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/cron/class/cronjob.class.php
	htdocs/install/pgsql/functions/functions.sql
 2016-08-28 02:17:04 +02:00
Laurent Destailleur
bc8e203019 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-28 01:58:43 +02:00
Laurent Destailleur
5d7414dcc3 Solve php regression failing travis 2016-08-28 01:58:11 +02:00
Laurent Destailleur
e7c05a778b Merge pull request #5662 from aspangaro/4.0-p43 
Fix: Presentation of Donations Area and add search
 2016-08-28 01:40:00 +02:00
Laurent Destailleur
54378bc07b Merge pull request #5657 from atm-florian/dev_trigger_order_fourn 
better trigger management on supplier order
 2016-08-28 01:35:06 +02:00
aspangaro
9f40f346cb Fix: Presentation of Donations Area and add search 2016-08-26 13:23:00 +02:00
florian HENRY
ba422615dd better trigger management on supplier order 2016-08-25 14:38:16 +02:00
Juanjo Menent
888c800502 Merge pull request #5654 from atm-ph/fix_develop_deprecated_value 
Fix deprecated value given to dol_print_date
 2016-08-25 13:47:26 +02:00
Juanjo Menent
87fb49e34b Merge pull request #5650 from defrance/patch-23 
add link between commandedet line
 2016-08-25 13:46:41 +02:00
Juanjo Menent
d9ca95acf7 Merge pull request #5649 from atm-maxime/new_textwithpicto_custom_picto 
Allow to use textwithpicto with a custom picto
 2016-08-25 13:44:25 +02:00
Juanjo Menent
874db10dbe Merge pull request #5648 from hregis/3.8_bug 
Fix: wrong "lastoutput" and "lastresult" if jobtype is "method" or "function"
 2016-08-25 13:43:06 +02:00
Juanjo Menent
9c4d60fd5d Merge pull request #5639 from atm-florian/4.0 
fix ressource module  for PGSQL and coding style
 2016-08-25 13:41:55 +02:00
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