223 Commits

Author	SHA1	Message	Date
Frédéric FRANCE	a4e25359e7	add missing rule	2021-03-01 20:37:16 +01:00
Frédéric FRANCE	554e449e40	code syntax core directory	2021-02-23 22:03:23 +01:00
Laurent Destailleur	026259ebd7	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/ajax.lib.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/fournisseurs.php	2021-02-15 13:12:27 +01:00
Alexis LAURIER	468f40743d	contract - use multidir_output	2021-02-10 13:18:55 +01:00
Philippe GRAND	11053fe0ed	standardization, internationalisation	2021-02-09 14:00:26 +01:00
Philippe GRAND	c96d36cad3	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:39:22 +01:00
Laurent Destailleur	7982cab526	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/modules/contract/doc/pdf_strato.modules.php htdocs/ticket/card.php	2021-01-21 18:34:55 +01:00
BlackMirror	640cf50b7f	[FM] Fix 12.0 - duplicate label, probably mistaken for ref	2021-01-20 15:20:50 +01:00
Laurent Destailleur	46171a6ec8	Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT	2020-12-02 21:27:15 +01:00
Frédéric FRANCE	c12c0a0d2f	Update pdf_strato.modules.php	2020-11-14 20:50:15 +01:00
Laurent Destailleur	a168c3fbb1	Remove warnings	2020-11-12 12:33:29 +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
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	e4faa0228e	Update pdf_strato.modules.php	2020-08-04 15:40:42 +02:00
Philippe GRAND	ccb9d62a14	Change comment to fixe a lot of undefined method	2020-08-03 09:13:46 +02:00
Philippe GRAND	8d06471a4e	Minimum version of PHP required by module	2020-07-11 15:03:00 +02:00
Philippe GRAND	c9c5d9cc70	Minimum version of PHP required by module	2020-07-11 14:34:11 +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
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	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
Tobias Sekan	cdbe6c1e81	Add position to ODT contract template	2020-02-24 14:59:20 +01:00
Laurent Destailleur	55bef402c4	Fix remove a lot of warnings on Eclipse	2020-02-21 17:47:36 +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
Frédéric FRANCE	a7a474d032	Update doc_generic_contract_odt.modules.php	2019-12-31 14:28:14 +01:00
Laurent Destailleur	a612aefab7	Fix HTML5	2019-12-12 11:11:08 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
ATM John BOTELLA	773f823748	factoring token usage	2019-12-01 10:20:11 +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
Laurent Destailleur	6a01132fdb	Merge pull request #12210 from grandoc/new_branch_24_10_2019 ... add some comment	2019-10-30 03:17:21 +01:00
Frédéric FRANCE	8f6d38ee82	clean indent	2019-10-27 17:01:23 +01: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
Philippe GRAND	7ce5ddbf02	Internationalization	2019-10-14 21:25:43 +02: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
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
Philippe GRAND	f1e40b4b22	translations	2019-06-27 09:31:42 +02:00
Laurent Destailleur	ec922d3d17	Add CONTRACT_HIDE_PLANNED_DATE_ON_PDF and CONTRACT_HIDE_REAL_DATE_ON_PDF	2019-05-20 14:54:09 +02:00
Frédéric FRANCE	bed3ed705c	Update mod_contract_magre.php ... The property db does not exist on mod_contract_magre.	2019-04-20 09:31:53 +02:00