Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,692 Commits 36 Branches 189 Tags
7b1b51e752fc285850cae897637ed1a85421c660
Commit Graph

7215 Commits

Author SHA1 Message Date
Laurent Destailleur
cc5dad977c Fix scrutinizer 2019-08-31 02:17:06 +02:00
Laurent Destailleur
5188f3ed44 Fix doxygen 2019-08-31 02:10:55 +02:00
Laurent Destailleur
517a0091d6 Doxygen 2019-08-31 02:02:19 +02:00
Laurent Destailleur
01962cbc67 Clean code 2019-08-29 13:17:14 +02:00
Inovea Conseil
ac7bcbd1b2 Add main feature level 2019-08-29 10:59:36 +02:00
Laurent Destailleur
77dfc19389 Try to compile css with lessc 2019-08-29 04:38:24 +02:00
Laurent Destailleur
76e8384f09 NEW Add option multiselect for developers on the selector of language. 2019-08-28 16:06:19 +02:00
Maxime Kohlhaas
9c09876bd4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin 2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65 Move $selectedlines to parameter 2019-08-27 14:33:28 +02:00
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +02:00
Laurent Destailleur
9fb06b1e7e Fix phpcs 2019-08-27 11:42:18 +02:00
Jean Traullé
dd1e7bbc3d Merge branch 'develop' into stickler-ci 2019-08-27 08:52:33 +02:00
Jean Traullé
0702ef4e0f Fix CI (code style) 2019-08-27 08:43:58 +02:00
Laurent Destailleur
b1479e5787 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:41:27 +02:00
Laurent Destailleur
63dcef710e Fix phpcs 2019-08-27 03:41:02 +02:00
Laurent Destailleur
a77c8023dc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:23:59 +02:00
Laurent Destailleur
4fb36ce84d Fix phpcs 2019-08-27 03:22:58 +02:00
Laurent Destailleur
4b5d9e44b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
 2019-08-26 22:44:49 +02:00
Laurent Destailleur
b6db04a727 Fix add missing filter on entity on stock listing for product combo 2019-08-26 22:42:04 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
7cb68d6438 NEW Default for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION 2019-08-25 18:02:10 +02:00
Laurent Destailleur
4040693823 FIX Use a SCA ready workflow with Stripe module 2019-08-24 18:12:20 +02:00
Laurent Destailleur
f5aede8256 NEW GeoIP v2 support is natively provided. 2019-08-21 19:38:45 +02:00
Laurent Destailleur
bfbabbf626 Update geoip v1 2019-08-21 18:26:41 +02:00
Laurent Destailleur
eb0644c6f4 PSR-12 2019-08-21 13:00:22 +02:00
Laurent Destailleur
d2d7fb4b04 Fix management of collapsing of extrafields separators. 2019-08-21 03:38:57 +02:00
Laurent Destailleur
5351d78a96 Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
18eb2a83fe FIX #11671 CVE-2019-15062 2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100 FIX #11671 CVE-2019-15062 2019-08-17 22:16:27 +02:00
Laurent Destailleur
ae7ba9ff54 Doc 2019-08-17 15:15:52 +02:00
Laurent Destailleur
a746075dbe Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2019-08-16 17:04:28 +02:00
Laurent Destailleur
9692ea5faf FIX #11671 CVE-2019-15062 2019-08-16 16:41:53 +02:00
Laurent Destailleur
8874a0f3c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 2019-08-15 23:39:02 +02:00
Laurent Destailleur
b8406f842d Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list 
Fix total on list and amount opened on thirdparty card (for supplier)
 2019-08-15 21:14:03 +02:00
Laurent Destailleur
6430c74793 Merge pull request #11168 from hregis/develop_menu 
NEW add new function "setEntity()" and better compatibility with Multicompany
 2019-08-15 21:00:05 +02:00
Laurent Destailleur
163ae6d81a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 20:42:51 +02:00
Laurent Destailleur
12e6dabc43 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-15 20:41:56 +02:00
Laurent Destailleur
0cde1b5c93 Merge pull request #11676 from ptibogxiv/patch-222 
Fix force recalculate price with multicurrency
 2019-08-15 19:53:54 +02:00
Laurent Destailleur
9f18b3d690 Update commonobject.class.php 2019-08-15 19:53:38 +02:00
Laurent Destailleur
38fc05866d Merge pull request #11619 from simnandez/10.0 
Fix: allow access from any other class that inherits Form class.
 2019-08-15 19:48:41 +02:00
Laurent Destailleur
ffece8dd34 Better link for syntax help 2019-08-15 18:46:48 +02:00
Laurent Destailleur
b5d72edebc Can add more samples of pages. Add an exemple of page with dynamic 
content.
 2019-08-15 18:07:36 +02:00
Laurent Destailleur
87b2a01a35 NEW Add less 2 css converter 2019-08-14 19:49:07 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
ptibogxiv
a489207122 Fix force recalculate price with multicurrency 2019-08-12 13:56:12 +02:00