Commit Graph

730 Commits

Author SHA1 Message Date
Laurent Destailleur
27f3287ac4 Merge pull request #15413 from frederic34/patch-22
doxygen
2020-11-15 17:05:22 +01:00
Laurent Destailleur
5c15162c40 Fix warning 2020-11-15 15:10:15 +01:00
Frédéric FRANCE
518ad097d0 Update pdf_sponge.modules.php 2020-11-14 21:21:58 +01:00
Frédéric FRANCE
9075e30a94 doxygen 2020-11-14 21:19:28 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
Laurent Destailleur
754a9778ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/modUser.class.php
2020-11-12 14:17:10 +01:00
Laurent Destailleur
0764cb2abd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:13:19 +01:00
Laurent Destailleur
a168c3fbb1 Remove warnings 2020-11-12 12:33:29 +01:00
Laurent Destailleur
576e1e1de8 Fix pdf crabe 2020-11-11 23:42:24 +01:00
quentin
fb27c98f9c FIX : handling $heightforinfotot when he's superior to a page height 2020-11-10 09:40:45 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7 FIX #14979 2020-11-01 17:01:26 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Florian HENRY
d347af385b new: add PDFInvoiceSituation translation key for PDF title 2020-10-21 13:47:40 +02:00
Laurent Destailleur
0908ac5867 Fix phpcs 2020-10-14 20:18:07 +02:00
Laurent Destailleur
4a3a3190ea Standardize pdf templates 2020-10-14 01:46:49 +02:00
Laurent Destailleur
8a079cf716 Code comment 2020-10-05 09:31:12 +02:00
Laurent Destailleur
b5703350da Fix escape 2020-09-19 22:41:05 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Philippe Grand
51cbbcd3b8 Update pdf_sponge.modules.php 2020-08-04 15:55:14 +02:00
Philippe Grand
d97a9c9b0d Update pdf_crabe.modules.php 2020-08-04 15:53:20 +02:00
Philippe GRAND
857505a887 Change comment to fixe a lot of undefined method 2020-08-03 09:36:23 +02:00
Philippe GRAND
0e0adcbe43 Change comment to fixe a lot of undefined method 2020-08-03 09:33:19 +02:00
Philippe GRAND
8f37bb5a69 Minimum version of PHP required by module 2020-07-11 15:04:06 +02:00
Philippe GRAND
872b99be42 Minimum version of PHP required by module 2020-07-11 14:37:25 +02:00
Laurent Destailleur
c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
2020-06-01 04:09:52 +02:00
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
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Laurent Destailleur
8360ca4b20 Update pdf_crabe.modules.php 2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae Update pdf_crabe.modules.php 2020-05-28 17:37:53 +02:00
atm-lena
edc6abcea8 FIX Rounding Total TVA in "crabe" model pdf 2020-05-28 15:19:37 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00: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
Frédéric FRANCE
8f42707220 Update pdf_crabe.modules.php 2020-04-21 23:20:11 +02:00
Laurent Destailleur
770fca0b33 Debug the double language feature in pdf 2020-04-21 20:16:36 +02:00
Frédéric FRANCE
7b68a2a60e Update pdf_crabe.modules.php 2020-04-19 21:50:52 +02:00
ATM john
3b4b30ea57 Fix merge remaining lines 2020-04-16 20:33:53 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Scrutinizer Auto-Fixer
d021559b16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-15 22:42:57 +00:00
Laurent Destailleur
43ec6c3ae5 Fix phpcs 2020-04-15 23:38:14 +02:00
Laurent Destailleur
3be426be5b Align sponge and crabe 2020-04-15 02:24:08 +02:00
Laurent Destailleur
1dd951495b Removed hard coded dependency on an external module 2020-04-15 02:20:57 +02:00
ATM john
b70cd84402 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-14 14:11:12 +02:00
Laurent Destailleur
8c8a8263dd Merge branch 'develop' into patch-145 2020-04-13 16:22:19 +02:00
Laurent Destailleur
99cbb273c8 Update pdf_crabe.modules.php 2020-04-13 16:21:47 +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