Commit Graph

83408 Commits

Author SHA1 Message Date
Michael Jeanmotte
300abfd5e2 Fetch thirdparty to be sure thirdparty is accessible through an API call when we use ODT template 2020-01-29 14:44:50 +01:00
Laurent Destailleur
d255e3b77b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 14:41:41 +01:00
Laurent Destailleur
2ccfdce178 var not defined 2020-01-29 14:41:06 +01:00
Norbert Penel
33a4888341 Protocol is not anymore used in url
Since https expension, people do not specify protocol, so browsers propage the protocol used in parent page
2020-01-29 14:25:23 +01:00
Laurent Destailleur
65e8113373 Look and feel v11 2020-01-29 14:23:44 +01:00
ptibogxiv
e31a93929a FIX doc of dictionnary API 2020-01-29 14:01:48 +01:00
Laurent Destailleur
7c34d97e2d Fix messages for SPF 2020-01-29 13:10:16 +01:00
altairis
f1ea0ce5a1 better fix 2020-01-29 11:47:23 +01:00
Laurent Destailleur
1e13f6fd0f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/resource/class/dolresource.class.php
	htdocs/resource/list.php
2020-01-29 11:44:04 +01:00
Laurent Destailleur
d650258d39 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-29 11:38:17 +01:00
Laurent Destailleur
5d2130a5ae Fix SQL injection 2020-01-29 11:38:06 +01:00
altairis
3c3876eb59 FIX : default lang selection when filter 2020-01-29 11:32:24 +01:00
oscim
d224c711cf Update result.php
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 11:07:30 +01:00
Laurent Destailleur
fe7344dd99 Merge pull request #12955 from oscim/patch-14
Update result.php
2020-01-29 11:07:06 +01:00
Laurent Destailleur
2ce3ea8234 Merge pull request #12953 from andreubisquerra/develop
Wait search finished before add product with enter
2020-01-29 11:05:26 +01:00
altairis
b04bb9e392 FIX : fetching account on current entity 2020-01-29 11:05:10 +01:00
Laurent Destailleur
6cccce3174 Merge pull request #12954 from andreubisquerra/develop
NEW Minimum sell prices taking into account in TakePOS
2020-01-29 11:04:49 +01:00
Tobias Sekan
8b3eb35cd1 [NEW] Hidden option MAIN_TEMP_DIR 2020-01-29 10:55:56 +01:00
Tobias Sekan
977ee79a09 Merge pull request #7 from Dolibarr/develop
merge from develop
2020-01-29 10:52:51 +01:00
oscim
862da5b646 Update result.php
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 08:08:15 +01:00
Alexandre SPANGARO
074e55fca5 NEW: Accountancy - General ledger - Add an option to search not reconciled line 2020-01-28 22:56:26 +01:00
andreubisquerra
13ee716b78 Min. sell price updatereduction 2020-01-28 22:21:19 +01:00
andreubisquerra
691514be24 Min. sell price updateprice 2020-01-28 22:18:23 +01:00
andreubisquerra
0beb78a978 Min. sell price when updateprice 2020-01-28 22:14:13 +01:00
Laurent Destailleur
a88e1ac605 Better translation 2020-01-28 21:35:03 +01:00
Laurent Destailleur
936899e0e2 Merge pull request #12952 from ptibogxiv/patch-297
NEW: add member to validate on dashboard
2020-01-28 21:30:16 +01:00
stickler-ci
1c26139789 Fixing style errors. 2020-01-28 20:29:17 +00:00
ptibogxiv
ab0d60065d Update delais.php 2020-01-28 21:27:45 +01:00
ptibogxiv
ae1dbdd34f Update adherent.class.php 2020-01-28 21:27:11 +01:00
Laurent Destailleur
fdc1a04db3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 21:26:31 +01:00
ptibogxiv
3a4ee6417c NEW: add member to validate on dashboard 2020-01-28 21:25:32 +01:00
Laurent Destailleur
be2d6494a7 FIX #12908 2020-01-28 21:23:05 +01:00
andreubisquerra
63af8594ab Wait search finished before add product with enter 2020-01-28 21:22:25 +01:00
Laurent Destailleur
2fe333fe90 Merge pull request #12950 from andreubisquerra/develop
Default example receipt template
2020-01-28 20:41:56 +01:00
Laurent Destailleur
642cda63f1 Merge pull request #12951 from kadogo/add-fichinter-duration-information
NEW Add duration information for fichinter
2020-01-28 20:40:42 +01:00
Laurent Destailleur
e38069e41b Merge pull request #12947 from ptibogxiv/patch-296
fix lang for other payment mode available
2020-01-28 20:39:59 +01:00
Laurent Destailleur
ed8b6f346d Merge pull request #12946 from OPEN-DSI/v10-fix-categorie-full-arbo-match
FIX regex for include or exclude categories in full arbo
2020-01-28 20:39:22 +01:00
Laurent Destailleur
4730da94ab Merge pull request #12943 from OPEN-DSI/v10-fix-extrafiled-category-require
FIX require category class in extrafield
2020-01-28 20:37:35 +01:00
Laurent Destailleur
be9d27d430 Merge pull request #12944 from gti-eu/11.0
Fix mailcollector text format
2020-01-28 20:37:07 +01:00
Laurent Destailleur
b2256620c4 Update emailcollector.class.php 2020-01-28 20:36:28 +01:00
Laurent Destailleur
9ae174d8b4 Clean code 2020-01-28 19:47:21 +01:00
stickler-ci
1de640242f Fixing style errors. 2020-01-28 18:33:01 +00:00
kadogo
9313aabd5c NEW Add duration information for fichinter 2020-01-28 19:28:09 +01:00
andreubisquerra
09bcb39cff Default to Example 2020-01-28 18:59:51 +01:00
Laurent Destailleur
9acda3545e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:52:01 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/supplier/index.php
2020-01-28 17:51:32 +01:00
Laurent Destailleur
782be2ac37 FIX Invert isSellerInEEC and isBuyerInEEC 2020-01-28 17:50:08 +01:00
Laurent Destailleur
bffdc63ec6 FIX The "automatic bind" was linked EEC to export accountancy code
Conflicts:
	htdocs/accountancy/supplier/index.php
2020-01-28 17:48:34 +01:00
Laurent Destailleur
86c10a124a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:44:53 +01:00
Laurent Destailleur
e9de1e16e8 FIX The "automatic bind" was linked EEC to export accountancy code 2020-01-28 17:44:05 +01:00