2
0
forked from Wavyzz/dolibarr
Commit Graph

522 Commits

Author SHA1 Message Date
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-25 19:00:10 +01:00
Laurent Destailleur
ac67a5a2bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:34:25 +01:00
Marc de Lima Lucio
0e0dd1ec6c FIX: invoice pdf: lines originating from deposits were not detailed anymore 2022-02-22 17:42:11 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
2022-02-10 10:23:42 +01:00
Laurent Destailleur
c496e6eb51 doc 2022-02-07 20:53:13 +01:00
Florian HENRY
30779be77e fix: if capital is not numeric just display input value 2022-02-07 16:36:47 +01:00
Florian HENRY
228142684b fix: if capital is not numeric just display input value 2022-02-07 16:33:27 +01:00
Anthony Berton
07c7209c0c Update pdf.lib.php 2022-02-04 19:05:22 +01:00
Laurent Destailleur
a7021008ba Update pdf.lib.php
Conflicts:
	htdocs/core/lib/pdf.lib.php
2022-02-04 12:27:13 +01:00
Laurent Destailleur
5c4fad3cc0 phpcs 2021-12-19 00:37:43 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
2021-12-19 00:36:22 +01:00
Laurent Destailleur
98ddfbf792 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/compta/facture/info.php
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/fourn/facture/list.php
	htdocs/mrp/mo_movements.php
	htdocs/product/stock/movement_card.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/replenishorders.php
	htdocs/reception/card.php
	htdocs/supplier_proposal/list.php
2021-12-19 00:17:37 +01:00
Laurent Destailleur
baa9585f85 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/holiday/month_report.php
2021-12-19 00:01:11 +01:00
Laurent Destailleur
930ac3e928 Merge pull request #19613 from hregis/fix_avoid_blank_page_with_error
FIX avoid blank page with error
2021-12-16 17:19:16 +01:00
John BOTELLA
d149596043 fix test of method exist on wrong object 2021-12-16 10:33:53 +01:00
Laurent Destailleur
53be92fac3 FIX #19626 2021-12-15 17:32:15 +01:00
Regis Houssin
3b65d46b53 FIX avoid blank page with error 2021-12-14 11:19:41 +01:00
Laurent Destailleur
0027335e3b Fix regression 2021-12-10 03:25:07 +01:00
Laurent Destailleur
c4ef3ec116 Merge pull request #19578 from fr69400/patch4
FIX - Missing one html conversion
2021-12-09 17:31:03 +01:00
Laurent Destailleur
baabfd380f Update pdf.lib.php 2021-12-09 17:25:06 +01:00
fr69400
abd984bc14 Update pdf.lib.php 2021-12-09 09:39:22 +01:00
stickler-ci
f74077a2e7 Fixing style errors. 2021-12-09 08:35:12 +00:00
fr69400
d0413f423f FIX - Missing one html conversion 2021-12-09 09:33:00 +01:00
habot-it
6501bb7cbf Update pdf.lib.php 2021-12-08 16:43:11 +01:00
stickler-ci
39117e8089 Fixing style errors. 2021-12-06 11:06:50 +00:00
habot-it
9ee3903fc4 Update pdf.lib.php 2021-12-06 12:06:32 +01:00
habot-it
2ad9761040 Add hookmanager in function pdf_pagefoot of pdf.lib.php
Customize PDF footers with HTML.
(Only on the last page with free text)
2021-12-06 07:47:24 +01:00
Laurent Destailleur
07506b523f Clean code 2021-11-30 14:09:46 +01:00
stickler-ci
c807286f0b Fixing style errors. 2021-11-30 11:17:48 +00:00
fr69400
19fc862a7e Merge branch 'patch3' of https://github.com/fr69400/dolibarr into patch3 2021-11-30 12:17:21 +01:00
fr69400
078a040078 Update pdf.lib.php 2021-11-30 12:13:21 +01:00
stickler-ci
a933793b8a Fixing style errors. 2021-11-28 13:42:25 +00:00
fr69400
5a165ae2bf FIX PDF_NOLD_PRODUCT_LABEL 2021-11-28 14:40:15 +01:00
Laurent Destailleur
16c28b505b Add comment on a bugged option 2021-11-15 11:10:18 +01:00
Laurent Destailleur
06f378db18 FIX Bad use of dol_concatdesc() 2021-11-11 15:31:19 +01:00
Laurent Destailleur
66f1dd8545 Fix avoid too large PDF 2021-11-11 15:12:31 +01:00
Laurent Destailleur
552d32ccd6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-07 13:54:07 +01:00
Laurent Destailleur
3b7c385c6c Fix syntax error 2021-11-07 13:53:30 +01:00
Laurent Destailleur
713db0e613 Removed function pdf_getTotalQty (duplicate with pdf_getlineqty) 2021-11-07 12:26:44 +01:00
Laurent Destailleur
ccc1d4d1fa Fix warning 2021-11-07 12:24:25 +01:00
Florian HENRY
bb4eb2feea Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-22 23:38:44 +02:00
Florian HENRY
87ac58efb6 fix php 8 2021-10-22 15:27:36 +02:00
Laurent Destailleur
a28d01ca83 Use PDF/A format instead of PDF 2021-10-16 18:59:01 +02:00
Laurent Destailleur
f3ea05b701 Merge pull request #17873 from atm-quentin/FIX_multiple_order_linked_to_facture
NEW when multiple order linked to facture, show list into note.
2021-10-12 14:30:34 +02:00
Alexandre SPANGARO
d10ec688c7 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:03:13 +02:00
Alexandre SPANGARO
463efd3802 Missing language key 2021-10-05 06:26:19 +02:00
Laurent Destailleur
3e5deeadf4 Merge pull request #18406 from vincentjdc/supplier-order-hide-product-label
NEW : Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
2021-08-17 16:24:19 +02:00
Vincent Dieltiens
e691217d00 Add a Global variable 'PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES' to have the possibility to hide product label in supplier order lines. 2021-08-12 13:56:41 +02:00
stickler-ci
9d2552e77b Fixing style errors. 2021-08-03 09:29:25 +00:00
Quentin VIAL-GOUTEYRON
2fab637b92 add dol_concatdesc 2021-08-03 11:26:57 +02:00