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
Frédéric FRANCE
d1d9b1ed85 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
Laurent Destailleur
2ed96c9e5f Fix scrutinizer 2019-10-15 02:54:19 +02:00
Laurent Destailleur
a1c93cb2e6 MAIN_ACTIVATE_HTML5 is now always on now (so option removed). 
Look and feel v11
 2019-10-15 02:45:12 +02:00
Laurent Destailleur
f50a75194c Removed warning 2019-10-15 00:44:22 +02:00
Frédéric FRANCE
194072fc60 Update box_last_ticket.php 2019-10-15 00:14:43 +02:00
Frédéric FRANCE
a53c7cfca8 Update box_last_modified_ticket.php 2019-10-15 00:13:52 +02:00
Laurent Destailleur
c869cbe193 Merge pull request #11995 from atm-john/develop_unlock_title_button_feature 
Unlock title button feature
 2019-10-14 23:55:10 +02:00
Laurent Destailleur
2d1bc90e57 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:06 +02:00
Frédéric FRANCE
b77d2f2ff2 Update box_task.php 2019-10-14 23:27:37 +02:00
stickler-ci
30099a821b Fixing style errors. 2019-10-14 19:39:00 +00:00
Philippe GRAND
6761e1ef33 Internationalization 2019-10-14 21:38:21 +02:00
Philippe GRAND
7ce5ddbf02 Internationalization 2019-10-14 21:25:43 +02:00
Laurent Destailleur
07bb83a96d Merge pull request #12113 from aspangaro/10.0_p25 
Remove a duplicate line
 2019-10-14 21:04:22 +02:00
Laurent Destailleur
b8a27a47aa Merge pull request #12112 from frederic34/patch-17 
Update box_last_modified_ticket.php
 2019-10-14 20:57:18 +02:00
Laurent Destailleur
1fc5afa022 Merge pull request #12111 from frederic34/patch-16 
Update box_last_ticket.php
 2019-10-14 20:56:25 +02:00
Laurent Destailleur
7b1b51e752 Merge pull request #12115 from TobiasSekan/develop 
Fix MS Outlook import error
 2019-10-14 20:54:30 +02:00
Laurent Destailleur
4941a99cc7 Merge pull request #12126 from grandoc/new_branch_14_10_2019 
add missing translation
 2019-10-14 20:53:28 +02:00
Laurent Destailleur
5a55997540 Update pdf_eratosthene.modules.php 2019-10-14 20:53:18 +02:00
Laurent Destailleur
2f0bf491ac Merge pull request #12130 from frederic34/patch-19 
Update check_notifications.php
 2019-10-14 20:38:40 +02:00
Laurent Destailleur
5c4edad0d4 Merge pull request #12105 from grandoc/new_branch_12_10_2019 
more internationalization
 2019-10-14 20:37:50 +02:00
Frédéric FRANCE
502d154cea Update check_notifications.php 2019-10-14 20:01:35 +02:00
Laurent Destailleur
3b84e2bac3 Use img-thumb css 2019-10-14 19:21:13 +02:00
Frédéric FRANCE
2351750d2b Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-14 19:02:46 +02:00
Philippe GRAND
fd90ebe63b add missing translation 2019-10-14 15:57:29 +02:00
Philippe GRAND
e326c23245 add missing translation 2019-10-14 15:48:24 +02:00
Cédric
44476afdac FIX: No pricing rule on new clean installation 
There is no pricing rule on new fresh installation of Dolibarr.
I think the pricing rule "PRODUCT_PRICE_UNIQ" should be set by default because it is needed to update a product through API REST.
 2019-10-14 15:35:04 +02:00
Laurent Destailleur
a33fb47777 Work on MO module 2019-10-14 12:10:14 +02:00
Laurent Destailleur
7973b03201 NEW Add estimated duration on the BOM module 2019-10-14 11:38:36 +02:00
Tobias Sekan
e2ca646b6e Fix MS Outlook import error 2019-10-14 10:22:47 +02:00
Alexandre SPANGARO
e50d32dc00 Remove a duplicate line 2019-10-13 13:20:45 +02:00
Frédéric FRANCE
92e4b962fa Update box_last_modified_ticket.php 2019-10-13 10:37:30 +02:00
Frédéric FRANCE
67278e4781 Update box_last_ticket.php 2019-10-13 10:18:41 +02:00
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Frédéric FRANCE
c143584af4 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 21:16:54 +02:00
Laurent Destailleur
c338db6c36 Fix unlink picto 2019-10-12 19:16:36 +02:00
Frédéric FRANCE
d9ba09bec1 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Philippe GRAND
33efd77fc7 more internationalization 2019-10-12 12:10:33 +02:00
Frédéric FRANCE
9f59656589 fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
2fa3b23cf1 Fix missing price level field 2019-10-11 19:36:36 +02:00
Laurent Destailleur
f334180cb8 Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent 
NEW add parent category id or label in import category module
 2019-10-11 17:33:28 +02:00
Laurent Destailleur
fa928f7dc3 Update modCategorie.class.php 2019-10-11 17:33:13 +02:00
Laurent Destailleur
95305a313d Fix trans 2019-10-11 17:02:35 +02:00
Laurent Destailleur
60bdb3133e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 16:57:56 +02:00
Laurent Destailleur
b58c2c38b2 Fix missing token 2019-10-11 16:57:47 +02:00
Laurent Destailleur
3f62a6d532 Merge pull request #12093 from frederic34/patch-23 
fix search by roles
 2019-10-11 16:57:33 +02:00
Frédéric FRANCE
367ef4acaf Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
cc73877e03 Merge branch 'develop' into patch-18 2019-10-11 16:32:48 +02:00
Laurent Destailleur
541357027e Merge pull request #12077 from frederic34/patch-15 
globe fontawesome
 2019-10-11 16:31:37 +02:00