Commit Graph

196 Commits

Author SHA1 Message Date
Laurent Destailleur
dbac97a908 Fix several troubles into numbering modules.
Prefix for takepos moved from TK to TC (TK was already used for tasks)
2020-06-01 04:02:47 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
40b3db940c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-20 14:44:36 +02:00
Laurent Destailleur
3e7f0b364e FIX #13611 2020-04-17 10:22:08 +02:00
Laurent Destailleur
5b8864b46e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-04-12 21:41:40 +02:00
simicar29
9573f1289a
FIX #7594
This is a temptative fix of the bad "multi page break" in expense report
2020-04-11 13:42:37 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Scrutinizer Auto-Fixer
612bac6598 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-05 00:44:59 +00:00
Laurent Destailleur
e6641b5369 Fix doc 2020-04-03 18:01:54 +02:00
Laurent Destailleur
4762bafb02 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/mrp/class/mo.class.php
2020-02-12 22:58:37 +01:00
Ruger
8d9de521f3 FIX: #13038 ExpenseReport PDF - custom category description is not correct 2020-02-11 09:13:15 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
stickler-ci
5dcd5e5b87 Fixing style errors. 2020-02-03 09:54:35 +01:00
AdrianDominik
ed269a387f FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page 2020-02-03 09:54:34 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
d6a31f60cd Clean code 2020-01-22 14:39:00 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1e49fd0d45 Translate 2019-09-20 15:07:58 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Alexandre SPANGARO
3ddd123eb1 Traduction 2019-09-08 05:18:52 +02:00
Alexandre SPANGARO
d9fa32b555 Traduction 2019-09-08 05:00:24 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
2019-08-15 23:39:02 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
Laurent Destailleur
4387d40b9a Translation lignes -> lines 2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Philippe GRAND
3cc97ec351 translation 2019-06-22 12:07:02 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
2019-05-09 12:27:14 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2019-05-09 12:16:43 +02:00
Laurent Destailleur
ab1f371ea5 Fix encoding on expense report PDF 2019-04-24 20:58:27 +02:00
Laurent Destailleur
742de5c777 Fix pdf of expense report 2019-04-23 16:04:53 +02:00
Frédéric FRANCE
315349a681
replace @public by @var 2019-04-18 18:41:02 +02:00
Laurent Destailleur
b5bf6830e9 Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
2019-04-17 01:13:59 +02:00
Philippe GRAND
baecb20562 update code 2019-04-09 09:24:41 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1
NEW improve Expensereport, Inverse Receiver
2019-04-08 14:04:08 +02:00
Laurent Destailleur
67760d6f41 Fix phpcs 2019-04-05 19:53:45 +02:00
markus
c08b69d00b Rely on MAIN_INVERT_SENDER_RECIPIENT 2019-04-01 19:59:58 +02:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
markus
b0e12deb25 Fix travis 2019-03-20 09:36:23 +01:00
markus
8c010c2580 fix travis 2019-03-18 10:24:21 +01:00
markus
b4807e7972 remove unneeded class 2019-03-17 18:38:26 +01:00
markus
a45fbfae76 fix travis 2019-03-16 14:37:07 +01:00
Rafael Ingenleuf
f19574f27f changed UserBankAccount fetch 2019-03-12 11:57:50 +01:00