Commit Graph

4298 Commits

Author SHA1 Message Date
Laurent Destailleur
73e6663230 Fix help/messages for emailing to warn users. 2016-12-17 14:47:06 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
Marcos García de La Fuente
c6f96a81d1 Little correction 2016-11-09 11:30:55 +01:00
Marcos García de La Fuente
0b594eab59 FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them 2016-11-09 11:28:05 +01:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
70de814c3c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-02 19:03:31 +02:00
gauthier
18cf2f8f8b FIX : header title in commercial area 2016-08-31 10:19:40 +02:00
Laurent Destailleur
01c140ecac FIX External user must not be able to edit its discounts 2016-07-20 02:16:10 +02:00
Laurent Destailleur
f8b1d0d7ca Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-01 03:51:23 +02:00
Laurent Destailleur
6066b711af Merge pull request #5427 from atm-geoffrey/FIX_project_select_on_event
Fix #4828
2016-07-01 02:47:43 +02:00
atm-geoffrey
75bb161930 FIX #4828 2016-06-30 16:20:53 +02:00
Frédéric FRANCE
76a113257e Update index.php 2016-06-29 16:16:56 +02:00
Alexis Algoud
7e8506e25f FIX #5338 use of not initialized var $aphour, $apmin, etc 2016-06-28 13:25:47 +02:00
Laurent Destailleur
1368e6d462 Fix: error message was not enough to understand
Conflicts:
	htdocs/langs/en_US/errors.lang
2016-06-24 21:32:38 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
9c3365aefc FIX #5163 2016-06-04 00:52:55 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
Laurent Destailleur
ed148f70b3 FIX Filter on assigned to was preselected on current user on list "All
events" (instead of no filtering)
2016-05-30 18:12:27 +02:00
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/propal.php
2016-05-18 20:40:09 +02:00
Regis Houssin
c7dda59fbc Fix: doublon (merge problem?) 2016-05-18 17:33:51 +02:00
Laurent Destailleur
cb4e569a5f FIX Merge manually PR #5161 - Bad translation key 2016-05-08 10:48:55 +02:00
Laurent Destailleur
cea48a8dd6 FIX bad translation language loaded
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
2016-04-03 20:02:02 +02:00
Laurent Destailleur
ee857055be Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34 Fix regression description line not visible 2016-03-19 19:25:28 +01:00
Laurent Destailleur
4436ec954f Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-19 19:15:23 +01:00
Laurent Destailleur
f0eb8ac794 Fix regression Product ref not visible 2016-03-19 19:13:27 +01:00
Laurent Destailleur
7fa71214bc Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
2016-03-18 11:06:41 +01:00
Laurent Destailleur
1ded08abef FIX When using option Price per level, when adding a predefined product,
the vat for customer was not correctly set.
2016-03-15 21:02:45 +01:00
Laurent Destailleur
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Laurent Destailleur
2eaa21ea5c Fix minor css error (pixel size must have "px"). Compatibility with old
behaviour.
2016-02-29 10:50:52 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
93b1b4c66e FIX #4580 2016-02-21 21:02:25 +01:00
Ion Agorria
fc8f1272d2 Fix line fetch not converting dates
Conflicts:
	htdocs/comm/propal/class/propal.class.php
2016-02-20 02:34:01 +01:00
Laurent Destailleur
b70f2f329c Fix bad position of form 2016-02-19 03:59:22 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
c85b7932a9 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/class/commonobject.class.php
2016-02-15 01:18:59 +01:00
Laurent Destailleur
04b390f21c Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
2016-02-14 21:59:04 +01:00
Laurent Destailleur
13c85516ee Doc comment 2016-02-14 21:58:54 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Laurent Destailleur
6dbaba6973 Fix: previous and next arrow 2016-02-10 17:45:26 +01:00
Regis Houssin
0b25601307 Fix: wrong object name 2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf Fix: missing signature and uniformize code between card and script 2016-02-08 12:20:40 +01:00
Laurent Destailleur
c4c7ea2f22 FIX Relative discount decimals are not saved 2016-02-08 02:49:19 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
Christophe Battarel
1baf25de3c FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden
constant
2016-01-27 12:04:00 +01:00
Regis Houssin
2b7b7e014d Fix: for avoid conflict with "global $m" in memory.lib.php 2016-01-22 13:20:21 +01:00
Laurent Destailleur
f2f4c60dbd Merge pull request #4469 from aspangaro/3.9-p8
Fix: Commercial index presentation - missing $var=!$var when we have no data
2016-01-22 04:15:22 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/societe/index.php
2016-01-22 03:25:30 +01:00