Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,180 Commits 36 Branches 190 Tags
815206cb15d8881e80c8eb2aaba905e77950e92e
Commit Graph

17547 Commits

Author SHA1 Message Date
Pierre Ardoin
815206cb15 Add Project Title in header of pdf 
Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
 2020-02-10 08:59:22 +01:00
Laurent Destailleur
6badf724cf FIX Mail smtps truncated if content has a line with single . 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-09 16:38:19 +01:00
Laurent Destailleur
b01e1e7724 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:30:16 +01:00
Laurent Destailleur
4b6276ff92 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160 Fix #13046 - Bad parenthesis on test 2020-02-08 15:28:40 +01:00
Laurent Destailleur
5fac824824 Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing 
FIX advanced target emailing sql and ergonomy
 2020-02-08 14:59:00 +01:00
Laurent Destailleur
387db16217 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:03:10 +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
atm-arnaud
bd6d49f04a FIX advanced target emailing sql and ergonomy 2020-02-06 12:08:50 +01:00
Laurent Destailleur
63ba601906 Update box_project.php 2020-02-05 12:39:00 +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
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
7c35e9aaa8 FIX #12932 2020-02-03 03:56:30 +01:00
altairis
3c3876eb59 FIX : default lang selection when filter 2020-01-29 11:32:24 +01:00
VESSILLER
7cdd334995 FIX require category class in extrafield 2020-01-28 11:37:23 +01:00
gauthier
4222639702 FIX : Extrafield position in export field list must respect "pos" field 2020-01-24 15:32:59 +01:00
Laurent Destailleur
8030558117 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:34:40 +01:00
Laurent Destailleur
42769e2e7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
 2020-01-23 12:07:17 +01:00
Laurent Destailleur
cbe396b97c Update functions2.lib.php 2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082 Update functions2.lib.php 2020-01-23 12:02:29 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
28d0b85b84 Fix phpcs 2020-01-22 14:56:19 +01:00
Laurent Destailleur
2caa4e9fa6 Merge pull request #12885 from leninrivas/10.0 
FIX Missing Linked objects Fichinter Ref. in PDF formats
 2020-01-22 14:17:25 +01:00
Laurent Destailleur
e96ef17737 Merge pull request #12903 from atm-john/10.0_fix_dom_and_missing_param 
FIX dom and missing param
 2020-01-22 13:45:06 +01:00
Laurent Destailleur
443e4e2223 Update html.form.class.php 2020-01-22 13:44:42 +01:00
John Botella
d6766af35d Fix dom and missing param 2020-01-21 14:17:53 +01:00
atm-ph
3cdb84b192 Fix note started with <s> balise 2020-01-16 09:50:57 +01:00
Laurent Destailleur
0a1a07aa22 Merge pull request #12839 from atm-gauthier/10.0_fix_importSocieteWithExtrafields 
FIX : We want to be able to import data for extrafields of entity 0 too
 2020-01-15 13:12:56 +01:00
Laurent Destailleur
0442105bd4 Fix Generation of zip of module 2020-01-15 11:55:27 +01:00
gauthier
5455130a03 FIX : We want to be able to import data for extrafields of entity 0 too 2020-01-13 16:15:22 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
 2020-01-10 13:51:29 +01:00
Dev2a
57c954f2e8 Fix Check array of action after kooks 2020-01-07 21:41:36 +01:00
Laurent Destailleur
4c6c8e172f Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class 
Revert "FIX class Facture undefined in displaying margin information"
 2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04 FIX #12760 #12763 #12755 #12765 #12751 2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae Revert "FIX class Facture undefined in displaying margin information" 2019-12-31 17:26:02 +01:00
Laurent Destailleur
6e90e81be1 Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class 
FIX class Facture undefined in displaying margin information
 2019-12-30 22:00:28 +01:00
Laurent Destailleur
aa390b8c3c Merge pull request #12771 from tuxgasy/10.0_Fix_double_value_on_update_object 
Fix decimal value on update object
 2019-12-30 21:50:53 +01:00
TuxGasy
c9cc6cbbea Fix decimal value on update object 2019-12-29 23:15:49 +01:00
Marc de Lima Lucio
c8dfc3d9fc FIX: error 500 when getting margin info for objects other than invoices 2019-12-24 16:09:29 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
VESSILLER
720146c45f FIX class Facture undefined in displaying margin information 2019-12-23 15:37:12 +01:00
Laurent Destailleur
93cece6a3a Merge pull request #12738 from mapiolca/patch-16 
#FIX Error Margin with Situation Invoice
 2019-12-23 13:43:18 +01:00
Regis Houssin
8321fe6ad2 FIX missing nl2br conversion 2019-12-22 09:13:34 +01:00
Pierre Ardoin
538921f479 #FIX Error Margin with Situation Invoice 
Fix an issue that show a negative margin when $line->situation_percent is not 100%

Now, the margin price take progress into account.
 2019-12-19 10:35:38 +01:00