Commit Graph

50047 Commits

Author SHA1 Message Date
Laurent Destailleur
24732cf454 Fix to avoid duplicate tooltip 2015-10-25 20:01:39 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
d7761ece58 FIX The thumb of user into top menu was using the image in full size.
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:54 +01:00
Laurent Destailleur
48ed8d4408 FIX The thumb of user into top menu was using the image in full size.
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f NEW Show photo of user into user list. A new function
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
2015-10-25 19:31:42 +01:00
Laurent Destailleur
1261ad43a1 NEW Can select which field to show into list of users. 2015-10-25 18:15:37 +01:00
Laurent Destailleur
1b8234d9fe Bette behaviour for blind people 2015-10-25 11:09:50 +01:00
Laurent Destailleur
c9e80fd148 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-24 21:20:40 +02:00
Laurent Destailleur
461771d488 Currency is on title only. 2015-10-24 21:20:32 +02:00
Laurent Destailleur
9d26d0fa4d Restore compatibility with old version 2015-10-24 21:13:28 +02:00
Laurent Destailleur
b88a28b660 Restore compatibility with old version 2015-10-24 19:45:41 +02:00
Laurent Destailleur
5181afd49d Disable dead code 2015-10-24 19:29:41 +02:00
Laurent Destailleur
086582a7a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-24 16:09:36 +02:00
Laurent Destailleur
3015a0388a NEW List of projects of a thirdparty are visible on a project tab 2015-10-24 16:09:26 +02:00
Laurent Destailleur
082e41b6c0 Bette translation 2015-10-24 13:58:28 +02:00
Laurent Destailleur
43c80bec7d A better responsive menu for very small screen 2015-10-24 13:52:35 +02:00
Laurent Destailleur
c007ae9361 Fix php code not executed with some php version 2015-10-24 13:16:59 +02:00
Laurent Destailleur
2cbfb69f9b Update template 2015-10-23 15:28:14 +02:00
Laurent Destailleur
016dbd39ee Fix sql phpunit regression 2015-10-23 15:24:47 +02:00
Laurent Destailleur
f3a5331095 Merge pull request #3793 from olsesacl/develop-employee
Fix: Bug: if $this->employe no exist
2015-10-23 15:14:30 +02:00
Laurent Destailleur
a01a85c3f6 FIX tag object_total_vat_x need x to be a string with unknown decimal
lenght. Now use for x the real vat real with no more decimal (x = 20 or
x = 8.5 or x = 5.99, ...)
2015-10-23 15:13:02 +02:00
Laurent Destailleur
f6d30d8b9e Fix: W3C no form into table 2015-10-23 14:40:45 +02:00
Laurent Destailleur
8d24adc97e Remove 2 other duplicated pages. There is only one page now for all list
of thirdarties (with a parameter type to have it specialized per
customer, prospect or supplier profile).
2015-10-23 13:52:51 +02:00
Sergio Sanchis Climent
2a412af00b Fix: Bug: if $this->employe no exist
Fix: if this->employee no exist default 0
2015-10-23 13:04:33 +02:00
Laurent Destailleur
90a221ef6d Fix version of module 2015-10-22 19:46:30 +02:00
Laurent Destailleur
633055fe5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 19:44:00 +02:00
Laurent Destailleur
1000fd1b21 Add field employee for hr module 2015-10-22 19:43:50 +02:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm
New : Module HRM
2015-10-22 19:15:49 +02:00
Laurent Destailleur
531ef43a27 Some minor look fixes. 2015-10-22 19:13:16 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap
New customer recap
2015-10-22 18:02:38 +02:00
Laurent Destailleur
0440e313d2 Merge pull request #3787 from atm-maxime/3.8
Fixes on invoice list and creation
2015-10-22 17:58:04 +02:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
2015-10-22 17:51:05 +02:00
Laurent Destailleur
56ef1c7338 Fix missing ) 2015-10-22 17:05:28 +02:00
Maxime Kohlhaas
ef2337a338 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
Conflicts:
	htdocs/compta/facture/list.php
2015-10-22 14:41:58 +02:00
Laurent Destailleur
77c43ebb26 FIX #3558 2015-10-22 14:08:19 +02:00
Laurent Destailleur
2615e02e1e Update doc 2015-10-22 13:18:51 +02:00
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
d55f138fb1 Merge pull request #3785 from frederic34/patch-19
FIX Error message not returne into update fournisseur.commande.class.php
2015-10-22 10:43:10 +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
43f003f6f9 Merge pull request #3783 from frederic34/patch-18
Fix lost searchstatus on next page list
2015-10-22 10:35:40 +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