Commit Graph

82642 Commits

Author SHA1 Message Date
Regis Houssin
45ba23da3e FIX #13028 2020-02-07 08:53:05 +01:00
Laurent Destailleur
fe0d1a81eb Fix filter on current user is stupi on the view "per user". 2020-02-06 21:16:48 +01:00
Laurent Destailleur
19847ec7ac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/CMailFile.class.php
2020-02-06 13:04:49 +01:00
Laurent Destailleur
e14612f569 FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
2020-02-06 13:02:27 +01:00
Laurent Destailleur
13442ef0df FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
2020-02-06 13:01:09 +01:00
Laurent Destailleur
857c22cb29 Fix doc 2020-02-06 10:13:10 +01:00
Laurent Destailleur
cca62dd8d3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-05 19:38:25 +01:00
Laurent Destailleur
1543028cdb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-05 19:38:02 +01:00
Laurent Destailleur
b6efd098dd Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-05 19:37:03 +01:00
Laurent Destailleur
1ef978ccc4 FIX #12966 2020-02-05 19:32:49 +01:00
Laurent Destailleur
4f3cc87077 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:38 +01:00
Laurent Destailleur
80f4e625be Fix phpcs 2020-02-05 17:07:42 +01:00
Laurent Destailleur
f3e27695e2 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:50 +01:00
Laurent Destailleur
2e0929c2e9 FIX export ledger 2020-02-05 16:08:28 +01:00
Laurent Destailleur
1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php
2020-02-05 14:38:19 +01:00
Laurent Destailleur
4d58dd05aa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-05 14:31:07 +01:00
Laurent Destailleur
9515467300
Merge pull request #13005 from RubenRuCh/11.0
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
2020-02-05 14:30:40 +01:00
Tobias Sekan
eca0016778 Fix wrong category name on user category card 2020-02-05 14:17:41 +01:00
Laurent Destailleur
c015707cbc Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
andreubisquerra
220f02805d Update image path after move image directory
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)

Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
2020-02-05 14:12:29 +01:00
Laurent Destailleur
5a81e3e181
Merge pull request #13012 from ptibogxiv/patch-299
fix url field  in edit mode societe/card.php
2020-02-05 14:09:04 +01:00
Laurent Destailleur
a36cf1f86b Fix phpunit 2020-02-05 14:08:13 +01:00
Laurent Destailleur
334c69841a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-05 13:41:30 +01:00
Laurent Destailleur
796cdad6fc
Merge pull request #13008 from hregis/10.0_mc
FIX compatibility with multicompany (avoid duplicate data)
2020-02-05 13:41:20 +01:00
Laurent Destailleur
9100b8a548 FIX SQL request and phpunit 2020-02-05 13:41:10 +01:00
Laurent Destailleur
c101c3dd55
Update holiday.class.php 2020-02-05 13:27:22 +01:00
Laurent Destailleur
d35994e5db
Update holiday.class.php 2020-02-05 13:25:51 +01:00
Laurent Destailleur
b589db813e
Merge pull request #13029 from OPEN-DSI/v10-fix-product-index-links
FIX links in products/services index
2020-02-05 13:05:35 +01:00
Laurent Destailleur
2cf970f617 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-05 12:51:54 +01:00
Laurent Destailleur
ac5b8ef0e0
Merge pull request #13030 from ptibogxiv/patch-300
new fix Count of Stripe payment mode must take test/live into account
2020-02-05 12:50:05 +01:00
Laurent Destailleur
f8daed7f56
Update company.lib.php 2020-02-05 12:49:56 +01:00
Laurent Destailleur
af22eb92d9
Merge pull request #13021 from mapiolca/patch-29
Fix Compatbility with Multicompany
2020-02-05 12:39:33 +01:00
Laurent Destailleur
63ba601906
Update box_project.php 2020-02-05 12:39:00 +01:00
Tobias Sekan
efcd4d0c63 Fix unset gender property in contact class 2020-02-05 12:34:29 +01:00
ptibogxiv
94fd2b40c7
new fix Count of Stripe payment mode must take test/live into account
fix error message for if no stripe enabled 0b891d5e0c
2020-02-05 12:04:27 +01:00
VESSILLER
c3cf9e62b3 FIX links in products/services index 2020-02-05 11:31:02 +01:00
Pierre Ardoin
81ed70ffc7
Update box_project.php 2020-02-05 09:18:39 +01:00
Pierre Ardoin
d5b74a8ca3
Update box_project.php 2020-02-05 09:06:43 +01:00
Pierre Ardoin
262d889700
Update box_project.php 2020-02-05 08:50:51 +01:00
Laurent Destailleur
0b891d5e0c FIX Count of Stripe payment mode must take test/live into account 2020-02-04 19:33:47 +01:00
Laurent Destailleur
af7a5b510d Fix phpcs 2020-02-04 14:47:30 +01:00
Laurent Destailleur
c5da131749 Fix param not defined 2020-02-04 14:40:11 +01:00
Laurent Destailleur
bb9f4c8ec3 Fix var_dump 2020-02-04 14:34:40 +01:00
AdrianDominik
4695172028 Merge remote-tracking branch 'upstream/11.0' into 11.0 2020-02-04 11:40:37 +01:00
Pierre Ardoin
d93a597a1e
Fix Compatbility with Multicompany
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
2020-02-04 09:17:02 +01:00
Laurent Destailleur
bf4fca0c7e Fix warning 2020-02-03 22:09:21 +01:00
Laurent Destailleur
c367c6f34e Avoid warning 2020-02-03 21:17:45 +01:00
Laurent Destailleur
d4ae8b81e4 Card examples 2020-02-03 20:49:21 +01:00
Laurent Destailleur
36461afea9 FIX Creation of Stripe card from backoffice must return a clean message 2020-02-03 14:55:02 +01:00
ptibogxiv
eb5ac0d9a9
fix url field in edit mode societe/card.php 2020-02-03 14:28:57 +01:00