Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 06:51:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,321 Commits 36 Branches 190 Tags
16b69a069e64efb66d952f55ffa9b0f8db85f54d
Commit Graph

8329 Commits

Author SHA1 Message Date
Laurent Destailleur
86ff60f161 Fix break line and set of opportunity fields 2020-05-15 15:50:50 +02:00
Laurent Destailleur
0091a48f42 Merge pull request #13787 from simicar29/dev-multiplemassaction 
Enable multiple mass actions on a single page - dev branch
 2020-05-15 14:37:33 +02:00
Laurent Destailleur
5933aba38c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-15 11:55:31 +00:00
Laurent Destailleur
02b40ae8f6 Fix scrutinizer 2020-05-15 13:54:05 +02:00
Frédéric FRANCE
9afe335e4e Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-14 18:45:52 +02:00
Laurent Destailleur
1bf677f537 Can set status of a websitepage 2020-05-14 18:14:55 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:30:36 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
Frédéric FRANCE
7e5a07a863 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-12 07:57:32 +02:00
Laurent Destailleur
ed68b73ef5 Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search 
NEW Add invoice stat graph and categ search
 2020-05-12 03:31:09 +02:00
Laurent Destailleur
632ca40b1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 03:04:59 +02:00
Laurent Destailleur
75cd7d7e72 Code comment 2020-05-12 03:04:48 +02:00
Frédéric FRANCE
097de7b3cd Only add empty select if no multiselect 2020-05-11 18:34:54 +02:00
Frédéric FRANCE
3e5489f7f6 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-11 18:17:27 +02:00
Laurent Destailleur
a8dcd2d09b Clean code 2020-05-11 11:53:13 +02:00
Laurent Destailleur
c511af69fe Debug look and feel v12 2020-05-10 21:07:49 +02:00
Laurent Destailleur
796f97c671 Support tag $capture in input of files 2020-05-10 15:08:01 +02:00
Frédéric FRANCE
bd7a2d23a0 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-08 21:29:12 +02:00
Frédéric FRANCE
8f9ee3250d clean 2020-05-07 23:28:32 +02:00
Frédéric FRANCE
7e7a10f8d2 clean 2020-05-07 22:55:21 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with 
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
 2020-05-07 22:52:32 +02:00
Frédéric FRANCE
6d5e83ad66 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-07 16:16:10 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
 2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
 2020-05-07 11:59:13 +02:00
Laurent Destailleur
d4400cf80f FIX links into emails of notifications 2020-05-07 11:39:32 +02:00
Frédéric FRANCE
574a4d4ce8 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-06 10:54:59 +02:00
atm-quentin
b6aa766c72 FIX stickler 2020-05-06 09:37:17 +02:00
Laurent Destailleur
30fede216c Fix Add '_pw' var as var sensibles. 2020-05-06 04:03:07 +02:00
Frédéric FRANCE
93cac43306 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-05 18:37:56 +02:00
atm-quentin
1b35380dda NEW stats invoice graph with 3 bars 2020-05-05 16:13:04 +02:00
Laurent Destailleur
7e6b5a384d Code comment 2020-05-05 15:16:30 +02:00
Laurent Destailleur
2afd38e2f6 FIX Combo list of available users to filter on the list of leaves. 2020-05-04 21:59:31 +02:00
Laurent Destailleur
6d894b7abd Fix missing link in message 2020-05-04 19:08:31 +02:00
Laurent Destailleur
4b34a6bd4a Look and feel 2020-05-04 12:43:47 +02:00
Laurent Destailleur
535ae612f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-03 22:48:48 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Marc Guenneugues
b5abb72c5b Add / as a delimiter for replacement pattern in select_produits* 2020-05-02 16:36:40 +02:00
Laurent Destailleur
48e62eca0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-02 15:19:09 +02:00
Laurent Destailleur
a88ab40384 Clean phpcs 2020-05-02 15:18:59 +02:00
Frédéric FRANCE
44f914fede Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-02 13:29:56 +02:00
Laurent Destailleur
099871e217 Merge pull request #13649 from atm-john/12.0_add_class_unitstools 
NEW class tool for converting units
 2020-05-02 13:05:51 +02:00
Frédéric FRANCE
39ac031aa9 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-02 06:59:54 +02:00
Marc Guenneugues
fbabfe9a71 Correct typo 2020-05-02 06:53:11 +02:00
Marc Guenneugues
79647b35cd Enable multiple mass actions on a single page - dev branch 2020-05-02 06:42:12 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00