Ferran Marcet
1c7b99d3dc
Fix: Missing include for Project class
2017-12-26 12:13:35 +01:00
Juanjo Menent
b650ba21c4
Merge remote-tracking branch 'upstream/6.0' into 6.0
2017-12-26 10:52:46 +01:00
Maxime Kohlhaas
a9c7dc48ab
New option to force e-mail recipient, helpful for test purposes
2017-12-24 17:31:31 +01:00
Laurent Destailleur
768cc19bbc
Fix protection on tpl to avoid direct url call
2017-12-24 15:07:06 +01:00
Laurent Destailleur
07f1dd7dae
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-12-24 15:03:09 +01:00
Laurent Destailleur
644e8b5a05
Fix navigation on stock
2017-12-24 15:02:15 +01:00
Laurent Destailleur
fdac3078e2
Fix permissions
2017-12-24 14:42:51 +01:00
Laurent Destailleur
b70dd36ffa
Better js comment
2017-12-24 12:16:48 +01:00
BENKE Charlene
df884e4080
Add project column on proposal list
...
if project are not enabled we don't display it
2017-12-23 18:37:08 +01:00
Laurent Destailleur
e6c7f9e69b
Debug module inventory
2017-12-22 21:29:09 +01:00
Laurent Destailleur
57272dc5fe
API to get list of available document is ok for invoice
...
order, proposal, shipment
2017-12-22 19:49:31 +01:00
Laurent Destailleur
f0c8b548f3
Fix bugs reported by scrutinizer
2017-12-22 14:24:31 +01:00
Laurent Destailleur
493669e986
Fix look and feel v7
2017-12-22 14:19:12 +01:00
Laurent Destailleur
e839c72109
Fix css
2017-12-22 14:05:49 +01:00
Laurent Destailleur
fb8326a9bb
Css use roboto but files does not exists
2017-12-22 12:56:29 +01:00
Laurent Destailleur
3b54be5dac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/product/price.php
2017-12-22 12:55:16 +01:00
Laurent Destailleur
2b056b0177
BUG Fix of old hidden feature price per quantity
2017-12-22 12:53:46 +01:00
Laurent Destailleur
ff245aa646
BUG Fix of old hidden feature price per quantity
2017-12-22 10:56:52 +01:00
Laurent Destailleur
d1cfbc2906
Code comment
2017-12-22 01:03:40 +01:00
Laurent Destailleur
207730bf63
Css
2017-12-22 00:22:33 +01:00
Laurent Destailleur
27a9a81f99
Fix link to contracts
2017-12-21 23:48:33 +01:00
KHELIFA
d069ccdb7f
Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE
...
- Fix hide payment condition for supplier proposal
2017-12-21 16:58:37 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
6a96a9765f
Transifex sync
2017-12-21 15:04:04 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
62f895e2ec
Fix: avoid infinite loop
2017-12-21 13:31:39 +01:00
Laurent Destailleur
4a5988accb
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 12:52:19 +01:00
arnaud
b1ce3fc5c8
FIX stats trad for customerinvoice
2017-12-21 12:12:50 +01:00
arnaud
4ba039d229
FIX trans unactivate on contractline
2017-12-21 12:07:29 +01:00
Marcos García
b5804d18b8
Merge branch 'develop' into bug-6980
...
# Conflicts:
# htdocs/core/class/html.formmail.class.php
2017-12-21 12:03:03 +01:00
arnaud
ae7f8c3fe4
FIX search on contact list
2017-12-21 12:01:30 +01:00
Laurent Destailleur
54d7d85d90
Sync transifex
2017-12-21 11:47:35 +01:00
Laurent Destailleur
e8a141aa63
Add uruguay languages
2017-12-21 11:37:51 +01:00
Laurent Destailleur
635917d0e6
CSS
2017-12-20 21:33:45 +01:00
Laurent Destailleur
f1305bbdd6
Fix css
2017-12-20 21:14:22 +01:00
Laurent Destailleur
d20062df73
Fix jquery css theme
2017-12-20 20:18:41 +01:00
Laurent Destailleur
9ea2fe226d
Fix look and feel v6
2017-12-20 19:30:30 +01:00
Laurent Destailleur
b03d0134a7
Filter on date extrafield timestamp and datetime disabled (not possible
...
yet)
2017-12-20 18:30:41 +01:00
AlainRnet
e308124ed6
Show total number of records by category
...
There is so much information missing in these categories and it is also not possible to sort or display other information than currently displayed.
Here is a small hack to display the total number of record(s) in the list header of each category.
2017-12-20 17:41:26 +01:00
fappels
4bc2e80ba8
Fix sending expense reports
2017-12-20 17:20:40 +01:00
Juanjo Menent
dc930dd6c5
FIX: Bad name alias showing in name of third column
2017-12-20 16:46:49 +01:00
Laurent Destailleur
3f6b3b51ca
Fix css
2017-12-20 15:09:58 +01:00
Laurent Destailleur
9d10eb57f2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/dolibarr_changes.txt
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/main.inc.php
2017-12-20 13:28:41 +01:00
Laurent Destailleur
6900771c70
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-20 13:17:39 +01:00
Laurent Destailleur
ca8ae3c723
Fix option MAIN_USE_JQUERY_JEDITABLE
2017-12-20 13:17:21 +01:00
Laurent Destailleur
b1f98b5903
Fix inline edit
2017-12-20 12:45:38 +01:00
fappels
7da1f706e5
Error in send_mail trigger is not system error
2017-12-20 12:25:30 +01:00
Regis Houssin
2821459894
Fix: avoid php warning
2017-12-20 11:36:51 +01:00
dolibarr95
a33411b8bd
Create 7.0.0-8.0.0.sql
2017-12-20 09:06:11 +01:00
