Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 14:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,710 Commits 36 Branches 190 Tags
4b7de1e5f5cea42b5c70d38fe26d5e94adb51fda
Commit Graph

4731 Commits

Author SHA1 Message Date
Frédéric FRANCE
de3a67f5bd Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
Laurent Destailleur
5fd88f438f Clean code 2019-09-12 00:03:51 +02:00
Frédéric FRANCE
3fddef0c9e add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
ATM john
9db2e27289 add widget box for supplier orders awaiting reception 2019-09-10 21:47:08 +02:00
stickler-ci
017a0fb70f Fixing style errors. 2019-09-10 19:42:31 +00:00
Philippe GRAND
6634ef4de5 Merge remote-tracking branch 'origin/develop' into new_branch_29_06_2019 2019-09-10 21:40:04 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
VESSILLER
3ea2e0c915 NEW add parent id or ref column in warehouse import 2019-09-09 15:03:20 +02:00
Laurent Destailleur
66a9fabd06 If you develop your own emailing target selector and used 
parent::add_to_target(...), you must now use parent::addToTargets(...)
 2019-09-09 14:18:25 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
Laurent Destailleur
2c0d7ba97d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 12:58:42 +02:00
Laurent Destailleur
21d84f63a5 Work on template 2019-09-09 12:58:32 +02:00
Laurent Destailleur
64506a3e00 Merge pull request #11843 from aspangaro/11.0_translation 
Translation
 2019-09-09 12:57:55 +02:00
Laurent Destailleur
1d311b2969 Fix scrutinizer 2019-09-08 21:21:33 +02:00
Alexandre SPANGARO
985cfab8e9 Traduction 2019-09-08 05:22:13 +02:00
Alexandre SPANGARO
3ddd123eb1 Traduction 2019-09-08 05:18:52 +02:00
Alexandre SPANGARO
d9fa32b555 Traduction 2019-09-08 05:00:24 +02:00
Alexandre SPANGARO
3a2b3d311a Traduction 2019-09-08 04:57:09 +02:00
Frédéric FRANCE
4054ebaf27 wip 2019-09-07 15:12:07 +02:00
Frédéric FRANCE
c6a02312a9 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-07 14:19:07 +02:00
Laurent Destailleur
f338a5f9ad Debug module datapolicy 2019-09-06 19:56:00 +02:00
Laurent Destailleur
89e1cdff61 Debug module datapolicy 2019-09-06 19:41:15 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
 2019-09-06 14:27:01 +02:00
Laurent Destailleur
f08c07f315 Fix bugs reported by scrutinizer 2019-09-06 10:42:51 +02:00
Laurent Destailleur
5b1d94a668 Fix translation 2019-09-06 02:27:49 +02:00
Laurent Destailleur
08c16ea2e1 Fix bad dir created 2019-09-06 02:03:26 +02:00
Laurent Destailleur
12868413bd Doxygen 2019-09-05 13:33:49 +02:00
Laurent Destailleur
1950952b05 Missing label 2019-09-04 15:11:06 +02:00
Laurent Destailleur
7d5877b8b1 Doxygen 2019-09-04 13:50:10 +02:00
Laurent Destailleur
bb7b34816d Merge pull request #11785 from a-schild/develop 
Fix for issue #11783
 2019-09-03 17:43:49 +02:00
Laurent Destailleur
bd47bd096b NEW Can defined a position of numbering submodules for thirdparties 2019-09-03 15:58:20 +02:00
Laurent Destailleur
106938168f Fix phpcs 2019-09-03 15:36:49 +02:00
Laurent Destailleur
a9bb891760 Merge pull request #11767 from aspangaro/11.0_digitaria 
NEW Digitaria model for numbering accountancy thirdparty
 2019-09-03 15:01:10 +02:00
Laurent Destailleur
c4a4efe0dc Merge pull request #11769 from Tim-Otte/develop 
NEW: Added odt support to supplier orders
 2019-09-03 13:04:33 +02:00
Tim Otte
0f02a621ba Seriously? One newline failed the stickler ci test? 2019-09-03 10:39:11 +02:00
Tim Otte
443f16bddf Removed debug output 2019-09-03 10:36:00 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
a-schild
ad779bc714 Correctly initialize $addDescription in all cases 2019-08-29 09:46:10 +02:00
a-schild
c38e29185c Fix for #11783 2019-08-29 09:43:49 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +02:00
Tim Otte
5abfc04900 Merge branch 'develop' into develop 2019-08-27 16:37:41 +02:00
Alexandre SPANGARO
47b9af09a5 Fix stickler 2019-08-27 16:37:14 +02:00
Tim Otte
75152cb210 Added odt support to supplier orders 2019-08-27 16:22:16 +02:00
Alexandre SPANGARO
958361b45e Merge branch 'develop' into 11.0_digitaria 2019-08-27 14:11:27 +02:00
Alexandre SPANGARO
d7f8df2e45 NEW Digitaria model for numbering accountancy thirdparty 2019-08-27 14:03:33 +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
2b8c57b714 Merge pull request #11724 from ptibogxiv/patch-228 
Fix stripelive_oauthcallback.php
 2019-08-26 16:34:40 +02:00
ptibogxiv
30b929c621 Update modAdherent.class.php 2019-08-23 13:57:22 +02:00
ptibogxiv
839ba76ae4 Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00