Commit Graph

72480 Commits

Author SHA1 Message Date
Laurent Destailleur
26fbd6e2ec Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:16 +02:00
Laurent Destailleur
cb1489e2fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:10 +02:00
Laurent Destailleur
9b77cc4db8 Translation of currency 2019-04-02 19:33:14 +02:00
Laurent Destailleur
2302c5ef1f Merge pull request #10943 from OPEN-DSI/v9-fix-fichinter-list-project-contract
Fix project and contract fields in fichinter list
2019-03-31 19:08:03 +02:00
Laurent Destailleur
24fef25fd8 Update list.php 2019-03-31 19:07:25 +02:00
Laurent Destailleur
b3f81d2c1a Update list.php 2019-03-31 19:06:44 +02:00
Laurent Destailleur
48ce60dd17 Update list.php 2019-03-31 19:04:28 +02:00
Laurent Destailleur
2f51221660 Merge pull request #10933 from atm-greg/Add_final_hooks_on_replenish
Add all missing hooks on replenish
2019-03-31 18:50:34 +02:00
Laurent Destailleur
f671b8bce7 Merge pull request #10945 from aspangaro/7_p1
FIX: Don't show accountingjournal:getNomUrl without data
2019-03-31 18:49:50 +02:00
Laurent Destailleur
143cbba09b Update card.php 2019-03-31 18:49:38 +02:00
Laurent Destailleur
5dfc1c0897 Merge pull request #10921 from atm-greg/Fix_hook_in_margins_heads
FIX missing hook completeTabsHead in margins module
2019-03-31 18:21:48 +02:00
Alexandre SPANGARO
5588fe5b81 FIX: Don't show journal:getNomUrl without data
ErrorBadValueForParamNotAString
2019-03-30 09:42:13 +01:00
Lionel VESSILLER
59c41105a2 Fix project and contract fields in fichinter list 2019-03-29 17:03:23 +01:00
atm-greg
957fae1081 missing params 2019-03-28 11:07:27 +01:00
atm-greg
11343e986c add all missing hooks on replenish 2019-03-28 10:47:32 +01:00
atm-greg
83d7750274 FIX missing hook completeTabsHead in margins module 2019-03-27 09:33:51 +01:00
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