lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,508 Commits 43 Branches 150 Tags 886 MiB
bf2d052d62
Commit Graph

77508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
84781cabac
target _blank depend of mime 
target _blank is added in the previous line depending on mimtype
 2019-05-21 13:11:17 +02:00
Laurent Destailleur
54441a1abd Fix css 2019-05-21 12:36:18 +02:00
Laurent Destailleur
6365c7cd00 Bad cut and paste 2019-05-21 12:17:07 +02:00
Laurent Destailleur
ae3605d82d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/core/class/extrafields.class.php
 2019-05-20 15:47:06 +02:00
Laurent Destailleur
ebf252f8a3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-20 15:40:50 +02:00
Laurent Destailleur
2a2fcf6784 FIX only profid1 to 4 were editable for pdf option to show. Not 5 and 6. 2019-05-20 15:38:33 +02:00
Laurent Destailleur
321544b3fa Fix phpcs 2019-05-20 15:25:39 +02:00
Alexandre SPANGARO
d9e9cb2ea9 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-20 15:02:05 +02:00
Laurent Destailleur
ec922d3d17 Add CONTRACT_HIDE_PLANNED_DATE_ON_PDF and CONTRACT_HIDE_REAL_DATE_ON_PDF 2019-05-20 14:54:09 +02:00
Laurent Destailleur
c3732f2b7a Fix edition of margins in recurring invoices 2019-05-20 14:41:47 +02:00
Laurent Destailleur
83c369cc0f Add $array_to_check for property in invoice instead of thirdparty 2019-05-20 13:02:33 +02:00
Laurent Destailleur
91dd8a71d3 Fix syntax error 2019-05-20 12:50:00 +02:00
Laurent Destailleur
827a2e1809 Fix test if qualified for stock change at wrong place 2019-05-20 12:47:02 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
ATM-Nicolas
5def839813 FIX : Padding on create project icon 2019-05-20 11:56:26 +02:00
ATM-Nicolas
d58603bd1e Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column 2019-05-20 09:13:37 +02:00
ATM-Nicolas
6be48e6952 NEW : Amount HT invoiced column in propal list 2019-05-20 08:59:44 +02:00
Laurent Destailleur
6780befb2d Fix css 2019-05-19 21:59:03 +02:00
Laurent Destailleur
c92994f7ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-19 19:15:28 +02:00
Laurent Destailleur
e84e3ef01f Move module into external module 2019-05-19 19:15:18 +02:00
Laurent Destailleur
27ed095181 Debug BOM module 2019-05-19 16:40:25 +02:00
Laurent Destailleur
2debffe170 Debug modulebuilder for lines 2019-05-19 16:21:11 +02:00
Laurent Destailleur
2900f8828a Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 13:52:28 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
d86fc28aba Fix CSS 2019-05-19 13:01:11 +02:00
Frédéric FRANCE
a368a6a43e
Update adherent_type.class.php 2019-05-19 11:52:34 +02:00
Alexandre SPANGARO
5a05cc184b Fix Accountancy Export OpenConcerto 2019-05-19 10:48:43 +02:00
Frédéric FRANCE
a09584ae4b
The method _load_ldap_dn() cannot be called... 
The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.
 2019-05-19 09:46:47 +02:00
Frédéric FRANCE
7b317c4cbf
printObjectLines return void 2019-05-19 09:28:34 +02:00
Frédéric FRANCE
ff37fddcf1
Update myobject_agenda.php 2019-05-19 09:16:45 +02:00
Frédéric FRANCE
53a09a0dd4
Update agenda.php 2019-05-19 09:15:51 +02:00
Frédéric FRANCE
c8027ccf1a
Update agenda.php 2019-05-19 09:15:10 +02:00
Frédéric FRANCE
7d66cc1ab1
Update agenda.php 2019-05-19 09:14:29 +02:00
Frédéric FRANCE
06421c200d
Update agenda.php 2019-05-19 09:13:46 +02:00
Frédéric FRANCE
19085ed200
dol_print_object_info return void 2019-05-19 09:08:59 +02:00
Laurent Destailleur
3109f8e07a
Merge pull request #11217 from inoveaconseil/FIX11135 
FIX #11135
 2019-05-19 02:23:49 +02:00
Laurent Destailleur
4b3d0ed50c
Update user.class.php 2019-05-19 02:21:42 +02:00
Laurent Destailleur
ea5ffbb0bf
Merge pull request #11216 from atm-florian/8.0 
fix:  #11187
 2019-05-19 02:19:12 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Nicolas ZABOURI
61c17f8d0f FIX #11135 2019-05-19 02:06:37 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
florian HENRY
e4d87ab2e7 fix: #11189 2019-05-19 02:05:13 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-05-19 02:03:16 +02:00
florian HENRY
6e7fe1a6c2 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-19 01:58:38 +02:00
florian HENRY
4311a1ece8 fix: #11187 2019-05-19 01:58:20 +02:00
Laurent Destailleur
0f3ae6dc39
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type 
FIX: invoice class: bad SQL request if product type not set
 2019-05-19 01:58:13 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php 2019-05-19 01:58:01 +02:00
Laurent Destailleur
91fce6bd2b
Merge pull request #11213 from atm-florian/develop 
fix missing migration sql for ticket now stable on 10
 2019-05-19 01:56:34 +02:00
Laurent Destailleur
684cbbdddb
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey 
FIX: modulebuilder: hardcoded llx_
 2019-05-19 01:55:02 +02:00
Laurent Destailleur
234ad4c76a
Merge pull request #11214 from atm-maxime/7.0 
Fix #8344
 2019-05-19 01:53:13 +02:00