Commit Graph

85280 Commits

Author SHA1 Message Date
Laurent Destailleur
83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
2020-04-10 01:22:22 +02:00
Laurent Destailleur
f7d1ce1e09 FIX Can use decimal value in virtual products 2020-04-10 00:26:09 +02:00
Laurent Destailleur
401b8b2dcc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-10 00:25:41 +02:00
Laurent Destailleur
80862f7173 FIX Can use decimal value in virtual products 2020-04-10 00:25:30 +02:00
Laurent Destailleur
635cd7a995
Merge pull request #13531 from defrance/patch-149
add linked object block
2020-04-09 20:44:02 +02:00
Laurent Destailleur
5f00f0133e
Merge pull request #13529 from bb2a/patch-4
Display Phone link and  separ personalise in const
2020-04-09 19:54:48 +02:00
Laurent Destailleur
1ed8639653
Merge pull request #13532 from atm-quentin/11_fix_buyprice_extrafield_langfile_and_tooltip
FIX buyprice extrafield langfile and tooltip
2020-04-09 19:49:32 +02:00
Laurent Destailleur
09f1536c27
Merge pull request #13537 from andreubisquerra/master
Add langs and print only no printed order lines
2020-04-09 19:38:30 +02:00
Laurent Destailleur
3c9ca3860b
Merge pull request #13543 from atm-lena/11.0_FIX_hookmanager_typeAddReplace_completeTabsHead
FIX - Add function "completeTabsHead" to "addreplace" type hook.
2020-04-09 19:37:48 +02:00
Laurent Destailleur
bc2a1d653d
Merge pull request #13542 from ptibogxiv/patch-325
FIX pencil with font awesome 5.13
2020-04-09 19:35:35 +02:00
Laurent Destailleur
56336e1d30
Merge pull request #13541 from fappels/11_stock_list_default_vis
Fix set default warehouse list columns
2020-04-09 19:35:18 +02:00
Laurent Destailleur
c83f0f7484
Merge pull request #13533 from simicar29/11.0
11.0
2020-04-09 19:34:31 +02:00
Laurent Destailleur
6202b0a391
Merge pull request #13528 from bb2a/patch-3
Link Mail in list
2020-04-09 19:33:10 +02:00
Laurent Destailleur
2e3d4f03b6
Merge pull request #13544 from andreubisquerra/develop
FIX TakePOS buying price
2020-04-09 19:30:53 +02:00
Laurent Destailleur
2ac03c2875
Merge pull request #13545 from fappels/fix_photos_on_shipment_docs
FIX print pictures on shipment docs
2020-04-09 19:30:31 +02:00
Laurent Destailleur
f1c391363d Fix label 2020-04-09 18:40:00 +02:00
Laurent Destailleur
6a60678186 Look and feel v12 2020-04-09 16:36:39 +02:00
Francis Appels
0a8a8bafa0 FIX print pictures in shipment docs 2020-04-09 15:40:36 +02:00
ptibogxiv
5bba22aeeb
FIX pencil with font awesome 5.13 2020-04-09 14:58:42 +02:00
andreubisquerra
e43e9a0daa
FIX TakePOS buying price 2020-04-09 14:56:50 +02:00
atm-lena
c9ab61b521 FIX - Add function "completeTabsHead" to hooks "addreplace" 2020-04-09 14:54:47 +02:00
Francis Appels
caecb0152f Fix set default warehouse list columns 2020-04-09 14:46:20 +02:00
andreubisquerra
7d11a36beb
FIX TakePOS buying price 2020-04-09 14:42:42 +02:00
Laurent Destailleur
5819aadf75 Clean html code (replace table into table with div) 2020-04-09 13:40:26 +02:00
jove@bisquerra.com
ea79c91482 Add langs and print only no printed order lines 2020-04-08 20:02:54 +02:00
BENKE Charlene
728bfd1c90
oups ssooory
everything fine thank's
2020-04-08 19:46:29 +02:00
Laurent Destailleur
9a6c89d03f Fix phpcs 2020-04-08 18:51:24 +02:00
Laurent Destailleur
b9fc642a35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-08 18:32:23 +02:00
Laurent Destailleur
63f0c07a07 Add warning 2020-04-08 18:32:13 +02:00
Laurent Destailleur
361baa0c73 CSS 2020-04-08 17:56:24 +02:00
Laurent Destailleur
02436c1e84 NEW The module selection uses a KanBan view by default. 2020-04-08 17:04:23 +02:00
Laurent Destailleur
fe614658c8 Look and feel v12 2020-04-08 16:13:29 +02:00
stickler-ci
e402e35d96 Fixing style errors. 2020-04-08 14:09:04 +00:00
simicar29
89bd8ecc21
Merge pull request #5 from simicar29/simicar29-patch-6
Avoid the doubledot issue in quoted-printable mail
2020-04-08 16:05:54 +02:00
simicar29
6cb780d125
Avoid the doubledot issue in quoted-printable mail
When sending HTML mail using swiftmailer, the content will be encoded using quoted-printable. We may then encounter the "double dot" issue (doubled dot at the beginning of the line). This can be problematic with broken links to pictures for example.
This PR switches the encoding to base64.
2020-04-08 16:03:41 +02:00
stickler-ci
50b789456d Fixing style errors. 2020-04-08 14:03:16 +00:00
atm-quentin
64f6542f96 FIX buyprice extrafield langfile and tooltip 2020-04-08 15:59:10 +02:00
BENKE Charlene
732a103ba8
add linked object block 2020-04-08 15:30:48 +02:00
Anthony Berton
97153fd57d
Update functions.lib.php 2020-04-08 15:13:19 +02:00
Laurent Destailleur
18f2087cc6 Fix look and feel v12 2020-04-08 15:13:01 +02:00
Laurent Destailleur
d257b5553e
Merge pull request #13351 from TobiasSekan/FixErrorAndSortingInContactView
FIX error and sorting in contact view
2020-04-08 15:03:37 +02:00
Laurent Destailleur
a27a499727
Merge pull request #13157 from bb2a/patch-17
Add search order to assign to a warehouse
2020-04-08 14:54:36 +02:00
Laurent Destailleur
3a024124e8
Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard
NEW Confirm file delete on fracture card
2020-04-08 14:53:19 +02:00
Anthony Berton
b1ad30cbb4
Update list.php 2020-04-08 14:51:28 +02:00
Laurent Destailleur
b8a657ec0f
Merge pull request #13509 from andreubisquerra/develop
Order printer with 'Receipt printers' module
2020-04-08 14:51:23 +02:00
Laurent Destailleur
bcd336d029
Merge pull request #13518 from bb2a/patch-1
Add custom search criteria to those default for QUICKSEARCH
2020-04-08 14:50:50 +02:00
Laurent Destailleur
5afd043ec5
Update list.php 2020-04-08 14:50:41 +02:00
Laurent Destailleur
711f54846b
Merge pull request #13514 from andreubisquerra/develop
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label
2020-04-08 14:49:16 +02:00
Laurent Destailleur
12c033649a
Merge pull request #13512 from frederic34/zopflipng
compress png with zopflipng
2020-04-08 14:48:38 +02:00
Laurent Destailleur
3ac07ff84f
Merge pull request #13507 from atm-john/11.0_Fix_warehouse_list
Fix warehouse list
2020-04-08 14:44:55 +02:00