Laurent Destailleur
a14fee7296
Merge pull request #3852 from hregis/develop_origin
...
FIX add Mac OS detection and show it into OS information of user popup
2015-11-02 11:26:20 +01:00
Laurent Destailleur
a161e6d47a
Continue debug of PRODUIT_MULTIPRICES option.
...
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
2015-11-02 10:09:09 +01:00
Laurent Destailleur
6fe43cbbeb
Removed dead code
2015-11-02 09:08:08 +01:00
Laurent Destailleur
3409686405
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-02 08:57:01 +01:00
Regis Houssin
0fd7ba478a
Fix: add Mac OS
2015-11-01 17:27:41 +01:00
Laurent Destailleur
6482a4ee04
Minor css fix
2015-10-30 20:04:03 +01:00
Juanjo Menent
c14349f1ea
Merge pull request #3829 from hregis/3.8_bug
...
Fix: add missing hooks
2015-10-29 16:05:35 +01:00
Regis Houssin
6373c82559
Fix: broken features !!!
2015-10-29 13:14:38 +01:00
Regis Houssin
e5b1e214bc
Fix: add missing hooks
2015-10-29 11:50:16 +01:00
fmarcet
62dc6814a3
FIX #3726 Not showing images on product card
2015-10-29 10:14:54 +01:00
Marcos García de La Fuente
eff1f73950
Merge branch 'develop' into multiprice-generator
...
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
# htdocs/product/price.php
2015-10-27 10:41:50 +01:00
Laurent Destailleur
6493438e87
NEW The clicktodial module is now able to provide link "tel:" on phone
...
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
2015-10-26 16:20:09 +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
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
3015a0388a
NEW List of projects of a thirdparty are visible on a project tab
2015-10-24 16:09:26 +02:00
Laurent Destailleur
f6d30d8b9e
Fix: W3C no form into table
2015-10-23 14:40:45 +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
cac4a85ccd
Merge pull request #3788 from atm-maxime/new_customer_recap
...
New customer recap
2015-10-22 18:02:38 +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
2615e02e1e
Update doc
2015-10-22 13:18:51 +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
BENKE Charlie
ec9955986f
Update admin.lib.php
2015-10-21 05:07:13 +02:00
BENKE Charlie
4f519b5747
Update admin.lib.php
2015-10-21 05:06:19 +02:00
Laurent Destailleur
b5e633ef42
Size too small
2015-10-20 00:52:53 +02:00
Laurent Destailleur
e70bb28be7
If firstname not define, use lastname
2015-10-20 00:47:35 +02:00
Laurent Destailleur
23d7d60d73
Better compatibility with old versions
2015-10-20 00:22:28 +02:00
Maxime Kohlhaas
158281b14c
Fix : minor typo
2015-10-19 17:13:02 +02:00
Marcos García de La Fuente
e7e152c122
NEW Level multiprice generator based on per cent variations over base price
2015-10-19 15:13:19 +02:00
Laurent Destailleur
bbbd5f5202
Fix removed var_dump
2015-10-19 14:55:01 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
aspangaro
aac88519de
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
...
Conflicts:
htdocs/user/card.php
2015-10-17 07:19:46 +02:00
Laurent Destailleur
df0c6aa5cf
Use the new card banner for members
2015-10-16 16:14:33 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/product/index.php
2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
2015-10-16 09:52:38 +02:00
Laurent Destailleur
8a32041f16
Clean CSS when option MAIN_MAXTABS_IN_CARD is set
2015-10-15 13:31:44 +02:00
Laurent Destailleur
7f75a3da9d
NEW On list of thirdparties, user can select fields to show.
...
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Laurent Destailleur
00c8b27baf
Add code comment
2015-10-14 22:04:54 +02:00
Laurent Destailleur
6520ed7a08
Use css not bold title.
...
Add missing badge (count of draft records) on draft list.
2015-10-13 14:09:14 +02:00
Laurent Destailleur
a84ec64ece
The new banner tab is available on all tabs of thirdparty.
2015-10-13 13:06:32 +02:00
Laurent Destailleur
918d9b7c18
Fix filter was lost if nothing found
2015-10-13 12:05:24 +02:00
aspangaro
0b54cc4509
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
2015-10-11 21:05:15 +02:00
Laurent Destailleur
618e5f0419
FIX no need to remove file into mail form #3573
2015-10-11 20:47:31 +02:00
Laurent Destailleur
87fad70f4a
Revert "FIX no need to remove file into mail form"
2015-10-11 20:42:49 +02:00
Laurent Destailleur
62dd936b08
Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file
...
FIX no need to remove file into mail form
2015-10-11 20:42:42 +02:00
Laurent Destailleur
9a6ac4f457
CSS enhancement
2015-10-11 16:32:46 +02:00
Laurent Destailleur
7fae9450a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-11 15:21:45 +02:00
Laurent Destailleur
bd48ad265d
The new banner tab is also on user card now
2015-10-11 15:21:21 +02:00
Laurent Destailleur
0ba6bdb7c2
CSS enhancement
2015-10-11 13:26:22 +02:00
