Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,218 Commits 36 Branches 190 Tags
c263fccb5f8bedd828ef2fd34b64b51fb8812c06
Commit Graph

1227 Commits

Author SHA1 Message Date
Frédéric FRANCE
22bc3b879b new box replace 2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b new box replace 2021-03-02 22:00:09 +01:00
Frédéric FRANCE
742c12f9d6 rename new boxes 2021-03-02 20:58:21 +01:00
Frédéric FRANCE
6cf8a46095 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Frédéric FRANCE
8c45137b37 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +01:00
Alexandre SPANGARO
7a3dfda8ee Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 21:30:25 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Alexandre SPANGARO
ca7958f273 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 07:32:23 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00
Laurent Destailleur
4cf2d2317f FIX Status in popup of member in widget 2021-02-27 19:16:14 +01:00
Laurent Destailleur
7dace2f459 Show 3 years in graph of widget by default. 2021-02-27 18:38:32 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Alexandre SPANGARO
d9e03e1373 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 14:10:38 +01:00
Frédéric FRANCE
84a5f69834 fix propal sqls 2021-02-22 13:14:13 +01:00
Frédéric FRANCE
58f301389c fix box activity 2021-02-22 12:08:22 +01:00
Alexandre SPANGARO
22c936ba19 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:28:36 +01:00
Alexandre SPANGARO
ae4fc565e1 Widget & commonobject 2021-02-22 05:38:31 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
e3419df36e Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Frédéric FRANCE
997dee67af fix propal box 2021-02-20 17:42:51 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
4c3a96da08 FIX #16150 2021-02-10 02:57:08 +01:00
Laurent Destailleur
5966e63120 Fix css 2021-02-08 20:01:10 +01:00
Laurent Destailleur
925d81d1b3 Merge pull request #16002 from Hystepik/develop#1 
New update of funnel of prospection
 2021-02-08 18:05:48 +01:00
Frédéric FRANCE
dbe5c23ed5 Update box_produits_alerte_stock.php 2021-02-07 19:45:18 +01:00
Frédéric FRANCE
58a39a263b Update box_produits.php 2021-02-07 19:44:09 +01:00
Frédéric FRANCE
ebe7e1464a fix html 2021-02-07 19:38:46 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
1fd2f12673 Fix responsive 2021-02-02 11:16:25 +01:00
Laurent Destailleur
3b9bd3cc40 Fix responsive 2021-02-02 11:15:16 +01:00
Laurent Destailleur
218a76ee63 FIX SQL Error with postgres or mysql strict mode 2021-02-02 11:06:58 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Frédéric FRANCE
22522f5aa2 fix include 2021-01-25 17:06:25 +01:00
Frédéric FRANCE
e8c4db2188 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-19 11:36:59 +01:00
lmarcouiller
afab5a977a dolgrap.class.php with frederic34 advices 2 2021-01-19 09:43:06 +01:00
lmarcouiller
fd888be5e5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-01-19 09:05:08 +01:00
Laurent Destailleur
f95bf56c15 Fix translation 2021-01-18 15:24:50 +01:00
lmarcouiller
383281e5f3 New update of funnel of prospection 2021-01-18 11:32:02 +01:00
Frédéric FRANCE
83b7e3c678 fix unknown variable 2021-01-18 08:01:18 +01:00
Frédéric FRANCE
c8d1410e33 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 21:06:12 +01:00
Laurent Destailleur
a4109d3fd0 Merge pull request #15600 from Hystepik/develop#2 
Close #15384 : New widget stat database
 2021-01-16 18:42:50 +01:00
Frédéric FRANCE
216da52972 Merge remote-tracking branch 'upstream/develop' into patch-8 2021-01-16 14:00:05 +01:00
Frédéric FRANCE
871f762546 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 13:58:27 +01:00
Laurent Destailleur
c7c74e8ed1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2021-01-15 19:53:46 +01:00
Laurent Destailleur
ea266c1f2d Fix missing alias 2021-01-15 17:59:08 +01:00
Frédéric FRANCE
225c68d5e6 Update box_members.php 2021-01-13 22:00:40 +01:00