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

17941 Commits

Author SHA1 Message Date
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
david
ac539d20b9 FIX #10460 compatibility with MariaDB 10.4 2019-09-09 11:10:08 +02:00
Laurent Destailleur
071dad3233 Merge pull request #11844 from dgfmdrv/develop 
FIX #10460 compatibility with MariaDB 10.4
 2019-09-09 11:09:46 +02:00
Laurent Destailleur
73c3fa40bf Update phpunit 2019-09-09 10:53:13 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00
Laurent Destailleur
5cc0b24f6f Fix param 2019-09-08 21:24:01 +02:00
Laurent Destailleur
1d311b2969 Fix scrutinizer 2019-09-08 21:21:33 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
ATM john
a639724b92 Fix follow tasks and time spent 2019-09-08 18:13:15 +02:00
ATM john
fa5cda2e88 Fix missing total progress column 2019-09-08 18:03:14 +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
david
48b2a11da2 FIX #10460 compatibility with MariaDB 10.4 2019-09-08 05:15:26 +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
Laurent Destailleur
d6f105c783 Work on MRP module 2019-09-07 15:44:48 +02:00
Frédéric FRANCE
4054ebaf27 wip 2019-09-07 15:12:07 +02:00
Frédéric FRANCE
61d432865b wip 2019-09-07 14:33:36 +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
5d6ccfdf00 Fix phpcs 2019-09-07 13:12:39 +02:00
Laurent Destailleur
881b69d117 Merge branch 'develop' into Edit_priceHT_for_predefined_products 2019-09-07 11:29:49 +02:00
Laurent Destailleur
eb7f964268 Update objectline_create.tpl.php 2019-09-07 11:25:11 +02:00
Laurent Destailleur
30d2f84eb7 Remove a label that is no more used 2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289 Merge pull request #11793 from altatof/supplierorderstatus 
Differentiate supplier orders status
 2019-09-07 10:54:03 +02:00
Laurent Destailleur
7386ba61d7 Merge pull request #11673 from ptibogxiv/patch-221 
NEW display supplier in objectline if defined
 2019-09-07 10:50:32 +02:00
Laurent Destailleur
7fe2483a82 Merge branch 'develop' into Hook_on_commonGenerateDocument 2019-09-07 10:26:23 +02:00
Laurent Destailleur
4e5b4964dc Merge pull request #11827 from aspangaro/10.0_boxes_nowrap 
FIX Nowrap missing on amount in boxes
 2019-09-06 23:37:23 +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
231725e351 Fix scrutinizer 2019-09-06 19:12:43 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
 2019-09-06 16:10:55 +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
165f64463b Fix look and feel v10 2019-09-06 12:46:54 +02:00
Laurent Destailleur
123eace8c0 Fix look and feel v10 2019-09-06 12:44:23 +02:00
Laurent Destailleur
f08c07f315 Fix bugs reported by scrutinizer 2019-09-06 10:42:51 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
Laurent Destailleur
ec1751bae9 Doxygen 2019-09-06 02:47:20 +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
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
stickler-ci
cd96238adc Fixing style errors. 2019-09-05 14:19:35 +00:00
Christophe Battarel
6902b2cbf2 fix function visibility thanks to stckler 2019-09-05 16:14:15 +02:00
Christophe Battarel
1cfd5615d3 resolv conflict 2019-09-05 16:10:23 +02:00
Laurent Destailleur
87c596a934 Fix responsive 2019-09-05 15:58:54 +02:00
Laurent Destailleur
07e647ca10 Fix sql outside transaction 2019-09-05 14:27:13 +02:00
Laurent Destailleur
f62c79c445 Fix object user must be a param of delete method 2019-09-05 14:26:18 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
4a19f510fd Fix scrutinizer reports 2019-09-05 13:58:35 +02:00