2
0
forked from Wavyzz/dolibarr
Commit Graph

18964 Commits

Author SHA1 Message Date
Laurent Destailleur
66a288a343 Merge pull request #12235 from frederic34/scopeindent
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
05fdddd15e Merge pull request #12240 from frederic34/patch-19
Update html.formmail.class.php
2019-10-30 02:57:27 +01:00
Laurent Destailleur
248016cd5d Merge pull request #12241 from frederic34/contactphone
Contactphone
2019-10-30 02:52:11 +01:00
Laurent Destailleur
bf0400a29b Merge pull request #12252 from oscim/patch-10
Update admin.lib.php
2019-10-30 02:41:59 +01:00
Laurent Destailleur
f03bf149bd Fix autoselect of field with modulebuilder 2019-10-30 02:09:29 +01:00
Laurent Destailleur
bc3f088f50 Enhance modulebuilder
Work on MO
2019-10-30 01:35:41 +01:00
Laurent Destailleur
beb85ee3a8 Work on MO 2019-10-30 00:56:57 +01:00
Laurent Destailleur
66337ec234 NEW Add widgets for BOMs and MOs 2019-10-30 00:36:47 +01:00
Laurent Destailleur
4eedf4a113 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop 2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stock/replenishorders.php
2019-10-29 11:48:11 +01:00
Laurent Destailleur
e58ecaaa64 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
	htdocs/product/stock/replenishorders.php
2019-10-29 11:43:35 +01:00
stickler-ci
52ef2bb990 Fixing style errors. 2019-10-29 10:16:49 +00:00
oscim
d310ca6e82 Update admin.lib.php
add function modulehelp_prepare_head
2019-10-29 11:15:03 +01:00
Laurent Destailleur
5e06fe0712 FIX Avoid fatal error when creating thumb from PDF 2019-10-29 11:11:13 +01:00
Frédéric FRANCE
043a71442f contact phone 2019-10-27 20:06:16 +01:00
Frédéric FRANCE
a9447bc963 Update html.formmail.class.php 2019-10-27 18:08:21 +01:00
Frédéric FRANCE
1ba9612f12 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-27 17:03:50 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
afa3ed499f Can export BOMs 2019-10-27 15:56:20 +01:00
Frédéric FRANCE
e2afcfb999 clean indent 2019-10-27 11:53:20 +01:00
Frédéric FRANCE
e203f87c84 clean indent 2019-10-27 11:18:36 +01:00
Laurent Destailleur
5cb9434bb4 FIX Stock qty hidden without permission to see stock 2019-10-27 00:55:06 +02:00
Laurent Destailleur
e17cc5b2e5 Debug cloning of BOMs 2019-10-27 00:26:11 +02:00
Laurent Destailleur
f060ef1018 FIX Clean decimal data for module builder 2019-10-27 00:01:16 +02:00
Frédéric FRANCE
a43e6f96b5 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Frédéric FRANCE
83ed70f72f Update agenda.lib.php 2019-10-24 22:44:51 +02:00
Laurent Destailleur
2814a5c07b Fix phpcs 2019-10-24 21:47:31 +02:00
Laurent Destailleur
b45ee20696 NEW Add a tab to setup "Opening hours" of company (information only) 2019-10-24 21:29:07 +02:00
Laurent Destailleur
8d21144521 Beautify select of products in vendor record 2019-10-24 20:33:16 +02:00
Philippe GRAND
5e44d63ec0 Merge remote-tracking branch 'upstream/develop' into new_branch_24_10_2019 2019-10-24 16:24:17 +02:00
Laurent Destailleur
88e848e346 FIX Extrafields missing in export of expense report 2019-10-24 16:00:10 +02:00
Laurent Destailleur
15609e319f FIX Extrafields missing in export of expense report 2019-10-24 15:57:34 +02:00
Philippe GRAND
ac839204d7 add some comment 2019-10-24 15:12:20 +02:00
Philippe GRAND
ffa5c8cbc0 add some comment 2019-10-24 15:10:05 +02:00
stickler-ci
3fb0b1ac73 Fixing style errors. 2019-10-24 13:07:19 +00:00
Philippe GRAND
480e21b88a add some comment 2019-10-24 15:06:56 +02:00
stickler-ci
9eb0385a88 Fixing style errors. 2019-10-24 13:02:34 +00:00
Philippe GRAND
f1db8e6f03 add some comment 2019-10-24 15:02:37 +02:00
stickler-ci
8a7360dd32 Fixing style errors. 2019-10-24 12:59:20 +00:00
Philippe GRAND
96ab43d495 add some comment 2019-10-24 14:58:15 +02:00
Laurent Destailleur
7297514afb NEW Use the gender of member for picto in member lists. 2019-10-23 21:00:29 +02:00
Laurent Destailleur
fd04729727 Fix tooltip on extrafield title was on wrong line. 2019-10-23 20:35:39 +02:00
Laurent Destailleur
b48f08dd07 Theme v11 2019-10-23 20:12:29 +02:00
Laurent Destailleur
41303006f3 Rename constant 2019-10-23 17:48:55 +02:00
Laurent Destailleur
f4545a2068 Debug method MAIN_STATUS_USES_CSS 2019-10-23 17:31:54 +02:00
Laurent Destailleur
a8ca8c7a1f Fix edit of extrafields link when empty 2019-10-23 16:38:15 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
2019-10-23 04:04:32 +02:00
Laurent Destailleur
161f2a018f Fix responsive and bad closing td 2019-10-23 03:50:48 +02:00
Laurent Destailleur
f23804a091 FIX #12152 2019-10-23 03:00:19 +02:00