Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

18639 Commits

Author SHA1 Message Date
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
Laurent Destailleur
d6881f9192 Merge pull request #12095 from atm-john/develop_fix_logo_bg 
Fix logo container css name and add hidden conf to remove background
 2019-10-11 16:25:48 +02:00
Laurent Destailleur
a0f918c85a Merge pull request #12094 from grandoc/new_branch_11_10_2019 
fix some translations
 2019-10-11 16:21:06 +02:00
Laurent Destailleur
dbb06adf98 Merge pull request #12090 from frederic34/patch-19 
doxygen
 2019-10-11 16:15:36 +02:00
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:12:01 +02:00
Laurent Destailleur
114e741975 Merge pull request #12079 from frederic34/patch-17 
Update box_factures_imp.php
 2019-10-11 15:54:37 +02:00
Laurent Destailleur
c6a796d270 Try to fix #12097 2019-10-11 15:45:32 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00
Laurent Destailleur
7ce01c5ceb Look and feel v11 2019-10-11 14:42:55 +02:00
John Botella
1fdc38da2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fix_logo_bg 2019-10-11 14:36:48 +02:00
Laurent Destailleur
c21224ef96 Align code of auguria menu handler with new architecture 2019-10-11 14:24:47 +02:00
Laurent Destailleur
9251f04d63 Update thumbs of themes 2019-10-11 13:26:48 +02:00
Laurent Destailleur
5801d09dbe NEW Use the squarre logo as favicon of pages 2019-10-11 12:28:13 +02:00
VESSILLER
2fb776ee34 NEW add new rule fetchidfromcodeandlabel for categories import 2019-10-11 11:57:11 +02:00
Philippe GRAND
25b9be9de7 update code 2019-10-11 10:19:58 +02:00
Philippe Grand
bcb7365a5a Update commondocgenerator.class.php 2019-10-11 10:13:21 +02:00
John Botella
4873cbd071 Fix css name 2019-10-11 10:10:12 +02:00
John Botella
13115a55a2 Fix logo background and hidden conf 2019-10-11 10:02:59 +02:00
Philippe GRAND
af88f44fd9 fix some translations 2019-10-11 09:51:17 +02:00
John Botella
9194eb4bec Fix block title height if no button 2019-10-11 09:14:10 +02:00
John Botella
724999f1ce Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature 2019-10-11 08:40:43 +02:00
Frédéric FRANCE
c80d055af3 fix search by roles 2019-10-10 23:51:54 +02:00
Frédéric FRANCE
03bbfc6ad9 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-10 23:24:50 +02:00
Laurent Destailleur
e7f56b67d8 Look and feel v11 2019-10-10 23:00:33 +02:00