Commit Graph

56461 Commits

Author SHA1 Message Date
Laurent Destailleur
aca54a1ca2 Merge pull request #5664 from grandoc/develop
fix : bad name
2016-08-29 17:45:38 +02:00
Laurent Destailleur
13f61f2a63 Fix css 2016-08-29 17:36:18 +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
9c1ba67169 Fix css 2016-08-29 16:40:51 +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
Laurent Destailleur
8b959a09f2 Fix missing /form 2016-08-29 16:12:56 +02:00
Laurent Destailleur
2ba920a4cb Fix for jmobile 2016-08-29 11:33:48 +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
aspangaro
14e6e705c3 Remove the old file of ventilation module - Replace by advanced accountancy module 2016-08-29 07:44:09 +02:00
aspangaro
7cb4f85f6b Fix: Wrong language key 2016-08-29 07:30:39 +02:00
Laurent Destailleur
af070dad94 Fix sort of fields 2016-08-28 23:53:13 +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
385aca8bf2 Fix sort of list and number of records 2016-08-28 23:25:24 +02:00
Laurent Destailleur
330e494eda NEW Can filter on fields on admin translation page 2016-08-28 22:46:09 +02:00
Laurent Destailleur
8a5bafc2dd Prepare 4.0 2016-08-28 21:23:37 +02:00
Laurent Destailleur
11ddc722f1 Release 4.0 2016-08-28 20:17:53 +02:00
Laurent Destailleur
4215ec3ca9 FIX usage of sepa generation setup. 2016-08-28 20:12:25 +02:00
Laurent Destailleur
6ddd264178 Fix not used field 2016-08-28 17:45:20 +02:00
Laurent Destailleur
a9e5668ea4 Fix for jmobile 2016-08-28 16:31:22 +02:00
Laurent Destailleur
989d6e7bc8 Fix responsive design 2016-08-28 16:27:15 +02:00
Laurent Destailleur
1becfbd7b6 CSS 2016-08-28 16:26:54 +02:00
Laurent Destailleur
92ef3f0cd8 Fix responsive design 2016-08-28 16:17:23 +02:00
Laurent Destailleur
661526f822 Fix for jmobile 2016-08-28 16:00:02 +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
Laurent Destailleur
5e88de7e2c Fix field customer/prospect/supplier in list of thirdparties 2016-08-28 15:21:09 +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