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
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

48 Commits

Author SHA1 Message Date
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
2e87318b58 Fix sql error 2017-12-18 19:15:42 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
Regis Houssin
09e71f1390 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-10-02 11:51:27 +02:00
Laurent Destailleur
0feae17ef5 Fix file not always defined 2017-09-30 11:51:34 +02:00
Regis Houssin
20684b4505 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/rapport/pdf_paiement.class.php
	htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
 2017-09-27 17:22:18 +02:00
Papoteur
cc9954e95e Clean debug messages 2017-09-26 12:51:14 +02:00
Papoteur
50d639f1fa Add total and subtotal in payments reports 2017-09-26 12:10:51 +02:00
Papoteur
cbe1683fe7 Invoice number on one line instead of two (issue#7487) 2017-09-26 11:30:28 +02:00
Papoteur
d2c55ea07b Factorize code between payments reports client/provider 2017-09-26 11:27:53 +02:00
Regis Houssin
2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-22 18:49:40 +02:00
Laurent Destailleur
260beed512 NEW Generated files are now indexed in database 2017-08-18 23:19:55 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
8f52a34e71 Report of supplier payment is name "supplier_payments" 2017-02-06 20:37:42 +01:00
arnaud
7f6ab748c5 NEW add rapport file for supplier paiement 2017-02-03 16:42:06 +01:00
arnaud
6d3e43ddaf NEW Report page and menu for suppliers paiements 2017-02-03 16:34:14 +01:00
Regis Houssin
d55ac472c3 Fix: issue when bank module is disabled 
Fix: missing entity filter for lines of payment
 2016-02-16 11:27:58 +01:00
Laurent Destailleur
e036e7baf4 Restore correct filling of page 2015-04-12 19:37:49 +02:00
BENKE Charlie
59bff8afac Update pdf_paiement.class.php 
Minors bug fix (first page with bad numbering)
improvement compute of number of page
better fillment of page with line (save the tree is good for karma)
 2015-04-11 12:22:42 +02:00
BENKE Charles
8f0e514f83 Update pdf_paiement.class.php 
Add bank account on detail line (usefull when you have many bank account)
Add society name in the header (usefull when you nanage many society)
 2015-03-15 10:49:16 +01: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
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
afcebea440 FIX: Missing global declaration 2014-09-19 03:05:21 +02:00
Raphaël Doursenaud
131997eeb8 FIX: Removed undeclared variables 2014-09-19 03:05:21 +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
aa1ff28158 Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Laurent Destailleur
8abde9e11f Sec: Missing permission tests 2014-01-30 11:44:31 +01:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02: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
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Laurent Destailleur
57742b347a Fix: Bad position of field with non A4 pages 2012-12-12 20:58:49 +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
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +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
Laurent Destailleur
d8becd3cdb Doxygen 2012-03-17 01:13:10 +01: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
0a17345415 Doxygen 2012-02-16 18:39:22 +01:00
Regis Houssin
3302a86f0c Fix: add entity field in llx_paiement 2012-02-01 18:29:06 +01:00
Laurent Destailleur
d596920898 Doxygen 2012-01-23 18:43:30 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00