Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,581 Commits 36 Branches 190 Tags
b59b7785eecb51e50bcf3cf30e224e9435de80f9
Commit Graph

40 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
 2014-11-05 16:28:44 +01:00
Maxime Kohlhaas
ccddf0d1be Fix : actioncomme report was not filtering by entity... 2014-10-31 16:56:14 +01:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Raphaël Doursenaud
131997eeb8 FIX: Removed undeclared variables 2014-09-19 03:05:21 +02:00
Laurent Destailleur
0d6d064e7e New: PDF event report show project and status of event 
Fix: Can edit description of intervention
New: Show status of object on refere page.
 2014-09-15 12:48:24 +02:00
Laurent Destailleur
60c633fd8b Qual: Generalize hook afterPDFCreation. 
New: Add hook beforePDFCreation
 2014-09-04 23:24:19 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Raphaël Doursenaud
fe05d3f2c4 Qual: Missing global declaration 2014-04-23 18:24:03 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
717657dd05 Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO 2012-12-30 12:40:32 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Laurent Destailleur
19c617e4a0 Fix: Solve double ";;" 2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0 Fix: Not enought space for free text. To avoid to edit again and again 
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
 2012-11-03 13:32:37 +01:00
Laurent Destailleur
f8a9733b73 Again 2 pixels missings 2012-11-03 00:37:10 +01:00
Laurent Destailleur
f6d9b2abe3 New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, 
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
 2012-10-31 13:48:59 +01:00
Laurent Destailleur
a68483d72f Uniformize code. 2012-09-19 14:49:13 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation. 
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
 2012-08-08 04:12:20 +02:00
Laurent Destailleur
591b029781 Doxygen 2012-08-05 15:15:58 +02:00
Laurent Destailleur
4792727ca6 Fix: Label was not translated 2012-06-23 15:01:08 +02:00
Laurent Destailleur
9e5cffc62b Doxygen 2012-03-14 11:49:11 +01:00
Laurent Destailleur
c4b845d60a Qual: Removed deprecated function name. 2012-02-19 18:34:22 +01:00
Laurent Destailleur
d596920898 Doxygen 2012-01-23 18:43:30 +01:00
Laurent Destailleur
b2cd7018db Doxygen 2012-01-10 10:53:04 +01:00
Laurent Destailleur
3f8d2cbef8 Qual: Remove checkstyle warnings 2012-01-04 21:23:50 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00