Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

18964 Commits

Author SHA1 Message Date
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
florian HENRY
dff7be59c8 mostlyDone 2019-09-06 09:22:53 +02:00
florian HENRY
d50114df64 mostlyDone 2019-09-06 09:20:18 +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
Laurent Destailleur
f4a7714f82 Fix bad log 2019-09-05 13:42:58 +02:00
Laurent Destailleur
12868413bd Doxygen 2019-09-05 13:33:49 +02:00
Alexandre SPANGARO
4fe141c9f1 FIX Nowrap missing on amount in boxes 2019-09-05 12:05:50 +02:00
Laurent Destailleur
9666200d6b Enhance error management 2019-09-04 19:55:15 +02:00
Tim Otte
54d0b94b6d Added extrafield support to the product supplier price lines 2019-09-04 15:13:42 +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
b445c0eec7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5 FIX Several pb in export of documents 
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
 2019-09-03 22:39:24 +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
1a8f271bf4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-03 17:41:56 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00