Commit Graph

72414 Commits

Author SHA1 Message Date
Laurent Destailleur
aad3867b9b Fix translation 2019-03-26 14:00:01 +01:00
Laurent Destailleur
29fe65ed75 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-26 12:37:21 +01:00
Laurent Destailleur
e5f54bd14c FIX Remane of project 2019-03-26 12:35:44 +01:00
Laurent Destailleur
1787b31932 FIX setup of module export 2019-03-26 12:18:28 +01:00
Laurent Destailleur
524f171168 FIX old export models was not visible 2019-03-26 12:12:16 +01:00
Laurent Destailleur
2034ac61ef Fix phpcs 2019-03-24 15:05:02 +01:00
Laurent Destailleur
b54b687464 FIX bad check on type of expense report (mandatory status not working) 2019-03-24 11:05:07 +01:00
Laurent Destailleur
79ed4bc80b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2019-03-23 22:36:04 +01:00
Laurent Destailleur
3ede626932 FIX If we build one invoice for several orders, we must put the ref of
order on the line to not lose information.

Conflicts:
	htdocs/commande/list.php
	htdocs/core/actions_massactions.inc.php
2019-03-23 22:34:10 +01:00
Laurent Destailleur
5666fbedac FIX If we build one invoice for several orders, we must put the ref of
order on the line to not lose information.
2019-03-23 22:30:52 +01:00
Laurent Destailleur
37cc5b7d35
Merge pull request #10901 from fmarcet/8.0
FIX: The minimum amount filter does not work in VAT report by customer
2019-03-22 12:27:30 +01:00
Laurent Destailleur
52d3e89276 FIX function not found 2019-03-22 12:21:31 +01:00
Ferran Marcet
f37c1b9287 FIX: The minimum amount filter does not work in the VAT report per customer 2019-03-22 09:28:50 +01:00
Laurent Destailleur
75b94d373f
Merge pull request #10897 from frederic34/patch-4
Update extrafields.class.php
2019-03-21 18:27:04 +01:00
Laurent Destailleur
55d64d441f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-21 18:26:02 +01:00
Laurent Destailleur
1075ef8cf2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-21 18:25:43 +01:00
Mathieu Pellegrin
e0d89101df #9480 Password link broken if login contains space 2019-03-21 18:25:00 +01:00
Laurent Destailleur
f7f20df323
Merge pull request #10891 from atm-greg/Add_hook_on_replenish
Add hook on replenish
2019-03-21 18:23:06 +01:00
Laurent Destailleur
2995f9c49d
Merge pull request #10890 from frederic34/patch-2
phpcs fix v9
2019-03-21 18:22:36 +01:00
Frédéric FRANCE
d10b94e72b
Update extrafields.class.php 2019-03-21 14:08:49 +01:00
Laurent Destailleur
a1fe1bb58c FIX when 2 extra fields are mandatory in 2 different entities 2019-03-21 12:33:39 +01:00
Laurent Destailleur
a7fdd34973 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-21 12:17:50 +01:00
Laurent Destailleur
032aa869e4 FIX Can't insert if there is extrafields mandatory on another entity.
FIX Can't set default value of extrafield of type varchar
2019-03-21 12:14:15 +01:00
Laurent Destailleur
4c85068a85 FIX Can't insert if there is extrafields mandatory on another entity. 2019-03-21 11:53:04 +01:00
Frédéric FRANCE
89e8889c5c
phpcs fix v9 2019-03-19 16:33:34 +01:00
Laurent Destailleur
3c1d7bfbf0 FIX counter of permissions in badge was wrong 2019-03-19 16:30:40 +01:00
Laurent Destailleur
e4e085e332 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:24 +01:00
Laurent Destailleur
dbe15d3685 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:17 +01:00
Laurent Destailleur
b11403103b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:48 +01:00
Laurent Destailleur
8664594fc8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:39 +01:00
Laurent Destailleur
a61ee00a7a
Merge pull request #10877 from ATM-Nicolas/9.0
FIX : Duplicate executeHook function
2019-03-19 12:04:46 +01:00
Laurent Destailleur
775aa5ff91
Merge pull request #10870 from hregis/8.0_mc2
FIX missing entity filter and wrong var name
2019-03-19 11:11:22 +01:00
Laurent Destailleur
41c737a213 Fix, Oops, test was inverted 2019-03-18 20:16:19 +01:00
Laurent Destailleur
aa013ff753 Fix do we really must copy notes when creating an object from another
source object? Add a hack with hidden option to be able to change this.
2019-03-18 20:09:09 +01:00
ATM-Nicolas
1cf42726ff FIX : Duplicate executeHook function 2019-03-18 15:19:39 +01:00
Laurent Destailleur
0c101f3d1b Fix translation 2019-03-18 11:21:51 +01:00
Laurent Destailleur
89087c6847
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice
Wrong vat if deposit from propal with multiple vat
2019-03-18 11:14:11 +01:00
Regis Houssin
57091f08b0 FIX missing entity filter and wrong var name 2019-03-18 10:53:43 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +01:00
Laurent Destailleur
227f5f8f92 Code is cleaner 2019-03-18 09:08:53 +01:00
Laurent Destailleur
e4ed5999eb
Merge pull request #10867 from aspangaro/9.0_various
FIX: Error with various & salary payment on project
2019-03-18 09:00:26 +01:00
Alexandre SPANGARO
350f77db2b FIX: Error with various & salary payment on project 2019-03-17 23:00:13 +01:00
Laurent Destailleur
8adc333823 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-16 19:41:50 +01:00
Laurent Destailleur
468af5380f
Merge pull request #10857 from atm-maxime/fix_creditnote_refund
Fix #9961 : deal with supplier credit note refund like with customers
2019-03-16 19:40:22 +01:00
Maxime Kohlhaas
46b39dd6a9 Fix #9961 : deal with supplier credit note refund like with customers 2019-03-16 18:13:43 +01:00
Laurent Destailleur
ae35c982af
Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit
FIX : need to round with 2 decimals to avoid movements not correctly balanced
2019-03-16 14:27:03 +01:00
Laurent Destailleur
55718cc7da
Merge pull request #10855 from atm-maxime/fix_missing_lang
Fix #9311
2019-03-16 13:43:35 +01:00
Laurent Destailleur
efeb7b0c22
Merge pull request #10854 from atm-maxime/fix_civility_third_creation
Fix #10177
2019-03-16 13:41:29 +01:00
Maxime Kohlhaas
21e2d36421 Fix #9311 2019-03-16 09:28:47 +01:00
Maxime Kohlhaas
68945c7d51 Fix #10177 2019-03-16 09:11:43 +01:00