Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,905 Commits 36 Branches 190 Tags
1e176fad8fed1d8e89c9009f5e2cf0fc2069b51d
Commit Graph

8494 Commits

Author SHA1 Message Date
Laurent Destailleur
194b92e70f Fix load of menu when 'perm' or 'enabled' is '0'. 2020-06-27 15:27:09 +02:00
Laurent Destailleur
4d01030fd9 Fix phpcs 2020-06-27 02:00:42 +02:00
Laurent Destailleur
ec5cfee150 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-27 01:57:18 +02:00
Laurent Destailleur
443558e3a2 Fix phpcs 2020-06-27 01:57:01 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Laurent Destailleur
3655f6f407 FIX #14109 2020-06-26 20:38:41 +02:00
Laurent Destailleur
6df049e05c FIX #14112 2020-06-26 20:35:06 +02:00
Laurent Destailleur
d6346522b8 Code comment 2020-06-26 19:36:15 +02:00
Laurent Destailleur
b0d46d0c4c Code comment 2020-06-26 18:56:05 +02:00
Laurent Destailleur
29ba9c82c3 Fix #14120 2020-06-26 17:17:13 +02:00
gauthier
858a751eef FIX : $_POST must be GETPOST 2020-06-26 10:51:04 +02:00
Laurent Destailleur
e2b1b853c0 Minor performance enhancements 2020-06-26 01:44:21 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into 
commoninvoice
 2020-06-24 19:59:06 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Regis Houssin
32844a8d0c FIX clean code 2020-06-22 09:26:42 +02:00
lvessiller
bf338b4d4f NEW show links for select and multi-select in category extra field 2020-06-22 08:57:52 +02:00
Laurent Destailleur
1ce5b78a6b Fix error message not reported 2020-06-22 01:02:17 +02:00
Regis Houssin
9a4f5e3d9a FIX We force "modify" for avoid some field not modify 2020-06-21 21:10:51 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Regis Houssin
03fbd72d66 FIX For better compatibility with Samba4 AD 2020-06-21 19:52:15 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
Laurent Destailleur
2de3eb8ac0 Fix CSS 2020-06-20 00:00:17 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
9ec8051a37 NEW Add param to not show links when output tags 2020-06-16 02:56:48 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00
Laurent Destailleur
1ba03566dc Fix case of delete contact not correctly implemented. 2020-06-12 02:15:02 +02:00
Laurent Destailleur
012574b487 Update html.form.class.php 2020-06-12 00:51:19 +02:00
Laurent Destailleur
d7cbd8a1d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-11 23:41:43 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
 2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/takepos/admin/setup.php
 2020-06-11 23:36:55 +02:00
Laurent Destailleur
073a4acd10 Merge pull request #14058 from indelog/showmailpj 
NEW Add show preview for mail attachement on form mail
 2020-06-11 23:09:26 +02:00
Laurent Destailleur
b36e658b20 Update html.formticket.class.php 2020-06-11 22:58:58 +02:00
Laurent Destailleur
ee611fa7a0 Fix bad definition of field for parent 2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507 Fix bad definition of field for parent 2020-06-11 18:31:26 +02:00
gauthier
58ff96af30 FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php 2020-06-10 16:48:02 +02:00
DEMAREST Maxime (Indelog)
1ac341e651 Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list 2020-06-09 15:33:10 +02:00
DEMAREST Maxime (Indelog)
e628730a3f Add show preview for mail attachement on form mail 2020-06-09 11:35:46 +02:00
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
atm-quentin
3dd7c81f54 FIX stickler 2020-06-08 15:58:20 +02:00
Laurent Destailleur
f4f0da6de2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39 Show more info to help fix corrupted data 2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1 Error message 2020-06-08 15:12:07 +02:00
atm-quentin
69db790cf5 NEW multiselect type and date to date filter 2020-06-08 14:43:14 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00