lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

357 Commits

Author SHA1 Message Date
Maxime Kohlhaas
095fd2769a Fix project beluga order status 2019-05-18 01:11:34 +02:00
BENKE Charlene
f8f40a9239
planned_timespent not present on task 
duration is the good one
 2019-04-30 11:27:33 +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
3a209d2454 update code 2019-04-09 09:30:32 +02:00
Philippe GRAND
b4a9b3aa20 update with html5 compliant code 2019-03-14 14:30:08 +01:00
Philippe GRAND
5977cdad26 update with html5 compliant code 2019-03-14 14:29:16 +01:00
Lionel VESSILLER
ef10a32069 Fix authorize long references in Beluga PDF model (uses Landscape mode) 2019-03-05 11:18:44 +01:00
Frédéric FRANCE
c5c27fdb77
add visibility 2019-03-01 19:24:06 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility 2019-02-28 23:19:58 +01:00
Frédéric FRANCE
e7706192b5
doc comment 2019-02-24 10:08:42 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Laurent Destailleur
7625eb7cd4 Fix missing error management after afterPDFCreation hook. 
Removed dead code
 2019-02-08 19:54:24 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b7f373802 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-18 21:37:34 +01:00
Laurent Destailleur
fb8c3f01a4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/project/doc/pdf_baleine.modules.php
	htdocs/core/modules/project/doc/pdf_beluga.modules.php
 2018-12-18 21:35:30 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer 
fix scrunitizer
 2018-12-14 17:28:34 +01:00
Maxime Kohlhaas
8fea6338e1 Fix #6565 
Fix pdf footer height for all documents
 2018-12-02 18:51:49 +01:00
Frédéric FRANCE
9ceea06468
fix travis 2018-12-01 17:10:06 +01:00
florian HENRY
b9046b9174 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:42:07 +01:00
BENKE Charlene
1f91a763ff
scrutinizer major error correction 
It seems like $tasksarray can also be of type string. However, the property $lines is declared as type array<integer,object<Task>>. Maybe add an additional type check?
 2018-12-01 11:44:46 +01:00
Philippe GRAND
9bf0f12068 fix typo error 2018-11-26 14:32:04 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
4b402aa6d1 Fix regression on name of array 2018-10-31 15:41:00 +01:00
Laurent Destailleur
be8e48b265 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
	htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
	htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
 2018-10-31 15:38:29 +01:00
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
b80d2fa12d
fill empty catch with log 2018-10-26 21:09:46 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe Grand
b7304e3d82
Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Philippe GRAND
9fab0a1d45 Update comments 2018-09-21 14:16:22 +02:00
Philippe Grand
d5003c9d3c
Merge branch 'develop' into new_branch_21_09_2018 2018-09-21 13:55:04 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Philippe GRAND
e1a03c49cf Standardize and update code 2018-09-20 17:19:42 +02:00
Philippe GRAND
2adfdab771 Standardize and update code 2018-09-20 15:14:59 +02:00
Philippe GRAND
7903a64c36 Standardize and update code 2018-09-20 14:23:09 +02:00
Philippe GRAND
bb0a830b78 Standardize and update code 2018-09-20 13:56:18 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Philippe GRAND
d091f5e16f Standardize and update code 2018-09-20 12:21:49 +02:00
Philippe GRAND
0222ea7e8c Standardize and update code 2018-09-20 09:19:17 +02:00
Philippe GRAND
06ad6e7196 Standardize and update code 2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8 Standardize and update code 2018-09-20 09:03:52 +02:00
Philippe GRAND
bd3ba04e24 Standardize and update code 2018-09-19 16:36:08 +02:00
Philippe GRAND
57fc8cf06f Standardize and update code 2018-09-19 16:31:36 +02:00
Philippe GRAND
ad061f4e13 Standardize and update code 2018-09-18 11:14:21 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2 
start changing phpcs:ignore
 2018-09-12 21:14:34 +02:00
Philippe GRAND
06cde1c35f Standardize and update code 2018-09-12 19:32:30 +02:00
Philippe GRAND
04017367f9 Standardize and update code 2018-09-12 19:24:45 +02:00
Frédéric FRANCE
70ba223788
move phpcs:ignore 2018-09-06 21:27:18 +02:00
Frédéric FRANCE
3ecf788438
move phpcs:ignore 2018-09-06 18:29:01 +02:00
Frédéric FRANCE
ecc6c118a6
move phpcs:ignore 2018-09-04 23:26:37 +02:00
Frédéric FRANCE
3847df1de6
move phpcs:ignore 2018-09-04 21:53:53 +02:00
Frédéric FRANCE
5f4a922c1d
move phpcs:ignore 2018-09-03 19:00:37 +02:00
Frédéric FRANCE
e4946cc8eb
move phpcs:ignore 2018-09-03 00:03:17 +02:00
Frédéric FRANCE
9c3352d2de
move phpcs:ignore 2018-09-02 23:44:53 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
c76a33fb4f
remove superfluous spaces 2018-08-21 20:12:27 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Philippe GRAND
edb566501d Update and standardize code 2018-08-17 18:54:41 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
4c52384609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-16 14:47:56 +02:00
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing 2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
76c6f28d85
Merge pull request #9035 from grandoc/new_branch_29_06_2018 
update code
 2018-07-16 10:09:46 +02:00
Philippe GRAND
afd3868a8a docs: complete comments 2018-07-04 14:38:56 +02:00
Philippe GRAND
640f7697e4 update code 2018-06-30 11:45:49 +02:00
Philippe GRAND
62586c7c5d clean and upsdate code 2018-06-18 12:47:17 +02:00
Philippe GRAND
909fa496e5 clean and update code 2018-06-04 17:37:17 +02:00
Laurent Destailleur
9f2f8ca7e0 Fix scrutinizer 2018-05-25 09:31:16 +02:00
Laurent Destailleur
a1c799507a Fix $contactobject not always defined 2018-05-23 08:16:24 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Philippe GRAND
743a61159d use loadLangs for translation files 2018-03-14 19:34:33 +01:00
Laurent Destailleur
38d1fc27e0 Start to introduce common substitution rules for odt substitutions 2018-02-24 13:41:01 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
4cfec30f93 Start to work on PDF template for timesheet 2018-02-05 15:35:55 +01:00
Laurent Destailleur
72f6b2956a Fix: pagination into belugo template 2018-02-05 14:31:39 +01:00
Laurent Destailleur
775085e1b8 Border of comment box 2018-02-05 14:10:24 +01:00
Laurent Destailleur
97a29e87ea Fix pdf template baleine (pb with page breaks and long task desc) 2018-02-03 16:31:36 +01:00
Laurent Destailleur
3c9532841f Fix regression db => this->db 2017-09-15 19:37:23 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
fe724a2e69 Fix syntax error 2017-08-21 12:35:43 +02:00
Laurent Destailleur
260beed512 NEW Generated files are now indexed in database 2017-08-18 23:19:55 +02:00
Laurent Destailleur
03b3f54c2c Fix class not found 2017-08-01 13:10:15 +02:00
Thomas Raschbacher
70de54e97d fix project extrafields for ODT 
for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.
 2017-05-10 15:21:53 +02:00
Thomas Raschbacher
267e66abfa Add more fields to projectcontacts substitution 
civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not
 2017-05-10 08:48:28 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Thomas Raschbacher
a76ddc8b3f Add phone phone numbers to project contacts 
Add phone number(s) for project contacts to be used in odt
 2017-03-29 15:33:32 +02:00
Laurent Destailleur
f5569ee890 Add tasktime_task_duration_sec tag in odt substitution 2017-02-11 13:50:30 +01:00
Marcos García de La Fuente
8225b06018 NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions 2017-01-16 21:59:02 +01:00
Laurent Destailleur
a07a77e323 Not yet ready for php 7.1 2017-01-16 01:11:38 +01:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
Sergio Sanchis Climent
3b57727542 PHP7 warnings on project module's configuration page 2016-07-26 22:22:55 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
Maxime Kohlhaas
d658e2cf31 FIX task ODT company object not correctly retrieved 2016-07-05 16:04:18 +02:00
Laurent Destailleur
59f86a12d2 Fix delete of documents generated on project. 
Fix missin translation
 2016-07-01 17:49:13 +02:00
Maxime Kohlhaas
651213123f Oups missing $conf 2016-04-23 17:45:38 +02:00
Maxime Kohlhaas
930b4a9be0 New var name 2016-04-23 17:36:55 +02:00
Maxime Kohlhaas
ad26fb2824 New option to show details in pdf page foot 2016-04-23 17:23:44 +02:00
Scrutinizer Auto-Fixer
c2243909e9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 13:07:33 +00:00
Laurent Destailleur
cab1c0f5cd Merge pull request #4886 from apachler/develop 
Added functionality to get project customer contact as contact_xx tags
 2016-04-04 00:11:19 +02:00
Andreas Pachler
7eded39e28 Reworked functionality to get project contact as contact_xx tags 2016-03-30 08:34:32 +02:00
Laurent Destailleur
88e5616622 Prepare code to be able to download ODT templates 2016-03-25 15:56:50 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Andreas Pachler
0d308f74be Added functionality to get project customer contact as contact_xx tags 2016-03-24 09:16:24 +01:00
Laurent Destailleur
54ac3c0a7b Fix regression 2016-03-22 17:41:42 +01:00
Laurent Destailleur
95a45e8f87 Prepare code to be able to download ODT templates 2016-03-22 17:35:58 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
 2016-03-10 15:09:30 +01:00
Laurent Destailleur
3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
	htdocs/product/document.php
	htdocs/societe/commerciaux.php
 2016-03-10 15:03:53 +01:00
Laurent Destailleur
210d8435da FIX The part added with hidden option MAIN_DOC_USE_TIMING was included 
with a . instead of -. This make os think it is part of extension
instead of file name.
 2016-03-06 00:39:13 +01:00
BENKE Charlie
8349446340 No segment defined is not an error 
This is a proposition of correction on all ODT file
If we don't define table of segment on odt we have an error
But in some case we don't want an table on ODT
 2016-02-19 10:59:50 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
cc71445b45 Fix: Only one name for one same feature. 2016-01-22 02:41:51 +01:00
Laurent Destailleur
d46c655fb4 FIX: Sql syntax error in doc_generic_task_odt 2016-01-16 10:20:14 +01:00
BENKE Charlie
cbb5f522eb Update doc_generic_task_odt.modules.php 2016-01-06 10:39:18 +01:00
BENKE Charlie
e6fd718e51 Update doc_generic_project_odt.modules.php 2016-01-06 10:38:06 +01:00
BENKE Charlie
16770d3d3f Update doc_generic_task_odt.modules.php 2016-01-04 15:08:08 +01:00
BENKE Charlie
0d2a6a9868 Update doc_generic_project_odt.modules.php 2016-01-04 15:07:42 +01:00
BENKE Charlie
b308baaf27 Update doc_generic_task_odt.modules.php 2016-01-04 14:58:57 +01:00
BENKE Charlie
f4953a3a6e Update doc_generic_project_odt.modules.php 2016-01-04 14:55:53 +01:00
Laurent Destailleur
0330d8237f Fix: Color too dark 2015-12-12 14:13:45 +01:00
Romain DESCHAMPS
94101412e9 Progress column not wide enough for 100% 
Progress column not wide enough for 100%
 2015-11-30 12:20:14 +01:00