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

55333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
e2a92f304d Presentation on member card 2016-08-29 22:07:21 +02:00
Laurent Destailleur
fbdbad0d7c More space on dropdown 2016-08-29 18:04:21 +02:00
Laurent Destailleur
99246ecfba Fix css 2016-08-29 17:58:55 +02:00
Laurent Destailleur
d75804afe4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-29 17:50:41 +02:00
Laurent Destailleur
867525cc91 Fix missing migration instructions 2016-08-29 17:50:31 +02:00
Laurent Destailleur
aca54a1ca2 Merge pull request #5664 from grandoc/develop 
fix : bad name
 2016-08-29 17:45:38 +02:00
Laurent Destailleur
c49c23df3d Fix debug project categories 2016-08-29 17:30:54 +02:00
Laurent Destailleur
64351f3428 Merge pull request #5668 from atm-florian/dev_catgeory_project_issue2701 
Dev catgeory project issue 2701
 2016-08-29 17:14:56 +02:00
Laurent Destailleur
cd1a12c686 NEW Can edit a label for each price segment when using several segment 
prices for products.
 2016-08-29 16:30:31 +02:00
florian HENRY
90466f37a7 travis comment 2016-08-29 11:10:30 +02:00
florian HENRY
56f0ffee0b add category entry menu into auguria menu sql 2016-08-29 10:47:13 +02:00
florian HENRY
cd1f78cd52 continur working 2016-08-29 10:41:14 +02:00
florian HENRY
a4ce756724 Manage project category 2016-08-29 10:32:00 +02:00
Laurent Destailleur
f7c89b0044 Update doc 2016-08-28 23:52:40 +02:00
Laurent Destailleur
b8201c9f86 Fix fk_soc can be null because we can set notification for users only. 2016-08-28 23:46:12 +02:00
Laurent Destailleur
330e494eda NEW Can filter on fields on admin translation page 2016-08-28 22:46:09 +02:00
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
philippe grand
cc97abb15e fix : search by search first name was not working 2016-08-28 15:49:00 +02:00
philippe grand
52c12cbecd fix : bad name 2016-08-28 14:37:53 +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