aspangaro
4e9d06785c
Fix #3818 & presentation
2015-10-29 06:47:42 +01:00
aspangaro
e2ba24826f
Review 3.8
2015-10-29 06:06:56 +01:00
Laurent Destailleur
4042c6d5cc
Minor fixes
2015-10-28 23:02:02 +01:00
Laurent Destailleur
f5eaeb2fb5
Some minor fixes
2015-10-28 22:51:06 +01:00
Laurent Destailleur
8e1fd5c3ed
Uniformize labels and css style
2015-10-28 22:25:15 +01:00
philippe grand
d517595f82
[Qual] Uniformize code
2015-10-28 19:28:18 +01:00
Juanjo Menent
a36559c55c
Merge pull request #3809 from aspangaro/develop-hrm
...
HRM module : continue to work
2015-10-28 16:11:17 +01:00
Laurent Destailleur
87c240252c
FIX Can export a field into task time table with export project profile
2015-10-27 22:24:18 +01:00
Laurent Destailleur
f9c9c58cba
Label must be cheque or transfer
2015-10-27 20:36:27 +01:00
Laurent Destailleur
fb28586f32
Better visible of what is possible for stock management
2015-10-27 19:18:22 +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
aspangaro
93d340e497
HRM module : continue to work
2015-10-27 07:26:57 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +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
d5e42478a9
Removed deprecated options to show or not forms. Such forms does not
...
exists anymore.
2015-10-26 12:37:36 +01:00
Laurent Destailleur
5c4ac0bf62
NEW Merge all left menu search boxes into one.
2015-10-26 12:18:22 +01:00
Maxime Kohlhaas
bd831b1f24
Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote
2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d
FIX The price per level just never correctly manage the vat. Vat is not
...
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
2015-10-25 22:50:05 +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
1b8234d9fe
Bette behaviour for blind people
2015-10-25 11:09:50 +01:00
Laurent Destailleur
082e41b6c0
Bette translation
2015-10-24 13:58:28 +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
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
ce681081c1
Merge pull request #3776 from frederic34/patch-15
...
Set warehouse for order
2015-10-22 12:16:40 +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
frederic34
865e9d9738
Merge remote branch 'upstream/develop' into patch-15
...
Conflicts:
htdocs/langs/en_US/admin.lang
2015-10-22 10:28:06 +02:00
Laurent Destailleur
fd72b4a400
Work on the new selectArrayAjax widget
2015-10-21 20:43:11 +02:00
Laurent Destailleur
9a1ec900bd
NEW Add into about page, a sample text to use to promote new version
...
release (visible only if version is last stable)
2015-10-21 00:31:32 +02:00
Frédéric FRANCE
15733f5ed0
Update propal.lang
2015-10-20 18:23:30 +02:00
Frédéric FRANCE
be85943d13
Update orders.lang
2015-10-20 18:21:28 +02:00
Frédéric FRANCE
506b251f24
Update orders.lang
2015-10-20 17:02:04 +02:00
Laurent Destailleur
0c6441df74
FIX Using extrafield with type "Link to object" works correctly.
2015-10-20 12:40:37 +02:00
Frédéric FRANCE
3e730cc9e2
Update admin.lang
2015-10-19 22:01:30 +02:00
Laurent Destailleur
7d382f7997
FIX Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES
...
into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED
for better compatibility with old versions
2015-10-19 18:17:19 +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
b9001d7ab8
NEW Prepare database to store information per files (for example to
...
define if an image ca, be used as a cover or not)
2015-10-18 22:43:19 +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
7fd6d8839a
Uniformize code and use a new generic search architecture
2015-10-17 01:40:46 +02:00
Laurent Destailleur
537a13e2f4
NEW Show which fields are used for search when doing a generic search
...
from the quick search form.
2015-10-17 00:14:36 +02:00
Laurent Destailleur
45a2156d71
Uniformize code and add more fields selectable for list of thirdparties
2015-10-16 23:03:20 +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
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
a84ec64ece
The new banner tab is available on all tabs of thirdparty.
2015-10-13 13:06:32 +02:00
aspangaro
0b54cc4509
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
2015-10-11 21:05:15 +02:00
Laurent Destailleur
6ec77e2ca0
New banner card on contact card.
2015-10-11 12:27:04 +02:00
aspangaro
8e37da55c3
Add searchform, language key and correct code
2015-10-10 08:34:15 +02:00
aspangaro
11387a5d38
Add language file
2015-10-10 06:37:43 +02:00
Laurent Destailleur
8db83a51b2
Missing translation
2015-10-07 14:30:54 +02:00
Laurent Destailleur
4b103ba8ce
Work on a better way to manage modules. All one page. Introduce a way to
...
choose order of modules family. We should also be able to introduce
filters.
2015-10-07 08:13:23 +02:00
