Maxime Kohlhaas
|
916d3ce931
|
Fix : only invoice active lines of a contract
|
2019-06-02 11:00:58 +02:00 |
|
Laurent Destailleur
|
912e29a746
|
FIX #11244
|
2019-05-29 11:06:01 +02:00 |
|
Laurent Destailleur
|
3c05cfe690
|
Fix useless test
|
2019-05-29 10:50:33 +02:00 |
|
Laurent Destailleur
|
a491de01b3
|
Merge pull request #11244 from altatof/8.0
FIX : do not include tpl from disabled modules
|
2019-05-29 10:35:39 +02:00 |
|
Laurent Destailleur
|
2352463c21
|
Fix link to change validator is on validate status only
|
2019-05-28 13:23:12 +02:00 |
|
Laurent Destailleur
|
991e247e30
|
Fix edit of validator
|
2019-05-27 20:21:50 +02:00 |
|
Laurent Destailleur
|
02fc896612
|
FIX Even with permission, can't validate leave once validator defined.
|
2019-05-27 20:12:33 +02:00 |
|
Laurent Destailleur
|
7db643fff0
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-05-27 19:23:09 +02:00 |
|
Laurent Destailleur
|
93c395fe10
|
FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL
|
2019-05-27 19:22:51 +02:00 |
|
Christophe Battarel
|
83d883c36a
|
finally eldy is always right
|
2019-05-24 15:14:34 +02:00 |
|
Christophe Battarel
|
4863ddcb00
|
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0
|
2019-05-24 15:13:23 +02:00 |
|
Laurent Destailleur
|
7a0c6859bd
|
Merge pull request #11240 from ATM-Marc/FIX_8.0_crabe_situation_vat
FIX: crabe pdf: bad detailed VAT for situation invoices, in situations S2 and above
|
2019-05-24 12:57:01 +02:00 |
|
Christophe Battarel
|
545cdd0762
|
test include return on FALSE
|
2019-05-24 12:54:24 +02:00 |
|
Laurent Destailleur
|
5d6e4a444a
|
Merge pull request #11237 from ATM-Marc/FIX_8.0_situation_discount
FIX: situation invoices: block progress percentage change for discount lines
|
2019-05-24 12:53:34 +02:00 |
|
Christophe Battarel
|
abc7c2f0f8
|
test include return on TRUE
|
2019-05-24 12:33:40 +02:00 |
|
Christophe Battarel
|
aaaad71347
|
FIX : do not include disabled modules tpl
|
2019-05-24 12:10:58 +02:00 |
|
Marc de Lima Lucio
|
49385fcab3
|
FIX: situation invoices: bad detailed VAT in situations following the first one
|
2019-05-23 14:37:40 +02:00 |
|
Marc de Lima Lucio
|
54f8c98b27
|
FIX: remove isolated transaction commit
|
2019-05-22 11:12:02 +02:00 |
|
Marc de Lima Lucio
|
66dd7e30ae
|
FIX: situation invoices: block progress percentage change for discount lines
|
2019-05-22 10:46:38 +02:00 |
|
Laurent Destailleur
|
f99f1d83c2
|
Merge pull request #11229 from frederic34/patch-7
target _blank depend of mime
|
2019-05-21 22:42:36 +02:00 |
|
Laurent Destailleur
|
16f7d96ed1
|
Merge pull request #11231 from ATM-Marc/FIX_8.0_extrafields_search
FIX: extrafield list search: SQL error when field is multiselect
|
2019-05-21 22:38:14 +02:00 |
|
Laurent Destailleur
|
dcf77520ea
|
FIX Error management when MAILING_NO_USING_PHPMAIL is set
|
2019-05-21 21:16:06 +02:00 |
|
Marc de Lima Lucio
|
18a6ed17cf
|
FIX: extrafield list search: SQL error when field is multiselect
|
2019-05-21 14:49:23 +02:00 |
|
Frédéric FRANCE
|
84781cabac
|
target _blank depend of mime
target _blank is added in the previous line depending on mimtype
|
2019-05-21 13:11:17 +02:00 |
|
Laurent Destailleur
|
ea5ffbb0bf
|
Merge pull request #11216 from atm-florian/8.0
fix: #11187
|
2019-05-19 02:19:12 +02:00 |
|
florian HENRY
|
e4d87ab2e7
|
fix: #11189
|
2019-05-19 02:05:13 +02:00 |
|
Laurent Destailleur
|
7738787729
|
Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0
Conflicts:
htdocs/core/actions_sendmails.inc.php
|
2019-05-19 02:03:16 +02:00 |
|
florian HENRY
|
6e7fe1a6c2
|
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0
|
2019-05-19 01:58:38 +02:00 |
|
florian HENRY
|
4311a1ece8
|
fix: #11187
|
2019-05-19 01:58:20 +02:00 |
|
Laurent Destailleur
|
0f3ae6dc39
|
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type
FIX: invoice class: bad SQL request if product type not set
|
2019-05-19 01:58:13 +02:00 |
|
Laurent Destailleur
|
2fd3eb8bdf
|
Update facture.class.php
|
2019-05-19 01:58:01 +02:00 |
|
Laurent Destailleur
|
684cbbdddb
|
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey
FIX: modulebuilder: hardcoded llx_
|
2019-05-19 01:55:02 +02:00 |
|
Laurent Destailleur
|
234ad4c76a
|
Merge pull request #11214 from atm-maxime/7.0
Fix #8344
|
2019-05-19 01:53:13 +02:00 |
|
ATM-Marc
|
83c38570e9
|
FIX: invoice class: bad SQL request if product type not set
|
2019-05-19 01:01:21 +02:00 |
|
Maxime Kohlhaas
|
1d980342ec
|
Fix #8344
|
2019-05-19 00:05:23 +02:00 |
|
ATM-Marc
|
9b805f742b
|
FIX: modulebuilder: hardcoded llx_
|
2019-05-18 20:09:00 +02:00 |
|
Laurent Destailleur
|
d4f356c8f6
|
Merge pull request #11200 from atm-maxime/fix_project_beluga
Fix project beluga order status
|
2019-05-18 02:16:50 +02:00 |
|
Maxime Kohlhaas
|
095fd2769a
|
Fix project beluga order status
|
2019-05-18 01:11:34 +02:00 |
|
Laurent Destailleur
|
ba88d89ff5
|
Merge pull request #11195 from ATM-Marc/FIX_7.0_presend_file_overwrite
FIX: mail presend: can overwrite a file previously uploaded (Issue #11056)
|
2019-05-18 00:52:29 +02:00 |
|
Laurent Destailleur
|
590ee589c1
|
Merge pull request #11192 from atm-maxime/fix_usertab_hr
Fix : display hr tab on user if rights to read all
|
2019-05-18 00:48:06 +02:00 |
|
ATM-Marc
|
b85ed3e0b7
|
FIX: mail presend: can overwrite a file previously uploaded
|
2019-05-18 00:11:15 +02:00 |
|
Maxime Kohlhaas
|
2a2f0557cf
|
Fix : display hr tab on user if rights to read all
|
2019-05-17 17:07:38 +02:00 |
|
Laurent Destailleur
|
e2408fb54d
|
Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display
fix useless calculation
|
2019-05-13 20:20:01 +02:00 |
|
atm-greg
|
644f247910
|
fix useless calculation
|
2019-05-13 12:02:46 +02:00 |
|
Laurent Destailleur
|
1626c9fb6e
|
Merge pull request #11145 from atm-gauthier/8.0_fix_filename_with_two_spaces
FIX : use dol_sanitizeFileName() function to remove double spaces in …
|
2019-05-13 12:01:05 +02:00 |
|
Laurent Destailleur
|
c67d79a4e2
|
Update files.lib.php
|
2019-05-13 12:00:13 +02:00 |
|
Juanjo Menent
|
072a455ca4
|
Prepare 8.0.6
|
2019-05-11 22:55:42 +02:00 |
|
Juanjo Menent
|
7041c3246e
|
Prepare 8.0.5
|
2019-05-11 22:35:56 +02:00 |
|
Juanjo Menent
|
40229c9d96
|
Merge pull request #11166 from simnandez/8.0
Merge branch '7.0' into 8.0
|
2019-05-11 18:06:20 +02:00 |
|
Juanjo Menent
|
f4ca6916cd
|
Merge remote-tracking branch 'upstream/7.0' into 8.0
# Conflicts:
# htdocs/contrat/services_list.php
# htdocs/expensereport/list.php
# htdocs/projet/list.php
|
2019-05-11 17:31:23 +02:00 |
|