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

997 Commits

Author SHA1 Message Date
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Frédéric FRANCE
6d8c59991d
doxygen 2019-11-28 23:21:42 +01:00
Scrutinizer Auto-Fixer
eba082320c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-16 22:25:24 +00:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:46 +00: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
453ffad9e8 Look and feel v11 2019-11-12 18:01:16 +01:00
Laurent Destailleur
2a67dd0f66 Look and feel v11 2019-11-12 17:43:27 +01:00
Laurent Destailleur
e79ac7081a Look and feel v11 2019-11-12 17:37:05 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
6348227698
Merge pull request #12275 from frederic34/patch-8 
css
 2019-11-02 13:31:18 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f202424432
css 2019-10-30 18:52:54 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
dbdc62b028 Fix td 2019-10-14 18:41:46 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Laurent Destailleur
14f7e48fe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 18:50:33 +02:00
Laurent Destailleur
a56b9e1ca9 The trigger BON_PRELEVEMENT has been renamed into 
DIRECT_DEBIT_ORDER_CREATE.
 2019-09-30 18:50:23 +02:00
Laurent Destailleur
cff8f582e7
Update bonprelevement.class.php 2019-09-30 18:47:18 +02:00
Laurent Destailleur
9d5b84ec44
Merge branch 'develop' into fix_9.0_withdraw_trigger_create_missing 2019-09-30 18:39:46 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
cad9a59d2a Add option to be able to find behaviour before the fix of list of 
invoice in direct debit order.
 2019-09-06 14:45:55 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
 2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists. 
FIX Confirmation of deletion
 2019-09-06 14:24:33 +02:00
Laurent Destailleur
bc7bf3b4b5 FIX bad consistency in list of invoice for direct debit order. 2019-09-06 13:44:02 +02:00
Laurent Destailleur
d1a5be20ea Fix wrong warning 2019-09-06 13:02:52 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
atm-ph
f7fe3d2842 Fix set var in context attribute instead of object attribute 2019-09-04 16:30:55 +02:00
atm-ph
5aa27a126a Fix trigger create on widthdraw is missing 2019-08-28 13:45:02 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Maxime Kohlhaas
3cc2c91e31 Use date_rum if defined 2019-07-28 22:26:19 +02:00
Laurent Destailleur
a61fdc5a3c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-23 00:25:10 +02:00
Laurent Destailleur
a33ac665bb Fix phpcs 2019-07-22 22:07:04 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
a379d7804c
Merge pull request #11535 from aspangaro/11.0_p1 
QUAL Move ligne.php to line.php
 2019-07-22 18:33:06 +02:00
Alexandre SPANGARO
5f042cf6ad QUAL Move ligne.php to line.php 2019-07-19 23:19:06 +02:00
Laurent Destailleur
14751680d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-19 13:38:05 +02:00
Laurent Destailleur
2e08c02510 Better error management 2019-07-19 13:37:28 +02:00
atm-ph
a03bb00254 Fix missing hook 2019-07-19 11:26:21 +02:00
Laurent Destailleur
e5801c0b68
Update bonprelevement.class.php 2019-07-19 04:06:22 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
atm-ph
fcd95ce073 Fix missing trigger call 2019-07-18 18:07:17 +02:00
Laurent Destailleur
b3182f65bc
Update create.php 2019-07-18 17:23:52 +02:00
atm-ph
984fe98342 Fix missing hook 2019-07-18 16:12:42 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Maxime Kohlhaas
0aa42fefae Fix : use RUM if defined in bank account 2019-07-09 18:13:11 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Louis Sautier
818a8c7d59
Fix missing form end tag in prelevement 2019-07-03 10:46:32 +02:00
Laurent Destailleur
2cefe638ef Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/compta/prelevement/factures.php
 2019-06-29 23:24:04 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
854bbf8405 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-28 14:09:00 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10 
Fix link to direct debit payment order
 2019-06-20 13:37:06 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Frédéric FRANCE
62501b11e8
add visibility 2019-03-02 00:14:22 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Philippe GRAND
0d5726b70a update with html5 compliant code 2019-02-10 16:08:03 +01:00
Philippe GRAND
5d6ebad557 update with html5 compliant code 2019-02-10 16:05:06 +01:00
Philippe GRAND
9670228f06 update with html5 compliant code 2019-02-10 16:00:59 +01:00
Philippe GRAND
d42ef14a92 update with html5 compliant code 2019-02-10 15:59:19 +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
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
fbf5a1c056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 20:48:19 +01:00
Frédéric FRANCE
4ab19c25c8
add missing global $conf in bonprelevement class 2019-01-21 08:23:31 +01:00
markus
a45ea9239d Rename consts and cleanup 2019-01-19 14:24:20 +01:00
markus
de9b8f427d Add configurable days to SEPA Withdrawal Execution Date 2019-01-18 16:16:55 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe GRAND
d98ebbd9ee Standardize and update code 2018-10-13 10:39:27 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Philippe GRAND
b40fe8e4c9 Standardize and update code 2018-09-09 12:07:14 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
056b0b26cc fix : Public member variable _fetched must not be prefixed with an underscore 2018-09-05 15:39:04 +02:00
Philippe GRAND
38ca6096b2 Standardize and update code 2018-09-05 10:31:12 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore 2018-09-02 13:38:11 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore 2018-09-02 09:57:19 +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
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +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
ATM-Nicolas
d8d54d246c FIX : Pagination on withdraw request list 2018-08-10 15:05:21 +02:00
Philippe GRAND
5b8b4a1415 Standardize 2018-08-08 12:29:36 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
STAGIAIRE-PC\Pierre
a94eeaa500 adding the possibility to personnalize ent_to_end and ustrd of a bank levy 2018-06-27 10:53:45 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs 2018-05-27 09:27:09 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
912d5c53f2 Standardize code 2018-04-21 15:54:05 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Laurent Destailleur
7b71e29fa0 Duplicate translation 2018-03-17 15:17:35 +01:00
Laurent Destailleur
bb835d3633
Update bonprelevement.class.php 2018-03-10 22:09:32 +01:00
Laurent Destailleur
f609547bc9
Update bonprelevement.class.php 2018-03-10 18:50:41 +01:00
Laurent Destailleur
9e0c74ca20
Update bonprelevement.class.php 2018-03-10 18:49:48 +01:00
Inovea Conseil
d2dff92f26 Add execution date on prelevement 2018-03-10 11:28:12 +01:00
Inovea Conseil
975300b90b Add execution date on prelevement 2018-03-10 11:23:35 +01:00
Laurent Destailleur
9f42e1b172 Prepare code to introduce different payment modes than BAN 2018-03-08 22:33:40 +01:00
vabeltran
604cc5896e FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php 
Column 'amount_requested' in ORDER clause not exists because that column is called 'amount' now in 'prelevement_bons' table in db.
 2018-02-26 12:31:40 +01:00
Laurent Destailleur
2b2e68c78d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/societe/card.php
 2018-02-08 15:18:28 +01:00
Juanjo Menent
9b56555962 FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page 2018-02-06 18:49:29 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
3a4ca8ae2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-24 11:49:36 +01:00
arnaud
c0481be8d8 FIX subject mail sepa 2018-01-23 17:01:03 +01:00
arnaud
19c616756a FIX email sent was not in HTML 2018-01-23 12:14:22 +01:00
Laurent Destailleur
d967527b58 Fix status was not refreshed 2018-01-18 18:40:01 +01:00
Laurent Destailleur
1730feeb4f Fix error message 2018-01-18 17:52:48 +01:00
Laurent Destailleur
8bb89f6bf4 Fix look and feel v6 2017-12-15 17:24:36 +01:00
Laurent Destailleur
5ae13ea9d6 Fix navigation in bank direct debit orders 2017-12-15 17:05:01 +01:00
Laurent Destailleur
56b0279ed7 Fix translation 2017-12-05 20:46:36 +01:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
d12019d1b5 Fix from scrutinizer 2017-10-13 13:10:36 +02:00
Laurent Destailleur
1d92e80788 Fix line addr in xml sepa file 2017-10-12 02:07:51 +02:00
Laurent Destailleur
08c94f11b6 FIX SEPA file if address is empty 2017-10-12 01:44:26 +02:00
Laurent Destailleur
dd15884f83 Fix recur - rcur 2017-10-12 01:35:04 +02:00
Laurent Destailleur
7c29bb5818 Fix must use differently FRST and SEPA 2017-10-12 01:24:19 +02:00
Laurent Destailleur
15bcbc8b43 FIX Check on bank info for sepa must be done on iban/swift not on ban 2017-10-12 00:38:59 +02:00
Laurent Destailleur
56e437a6c3 Bed fetch 2017-10-12 00:03:24 +02:00
Laurent Destailleur
5715f44fe6 Better error messages 2017-10-12 00:02:24 +02:00
Laurent Destailleur
d36af4a46a RUM number start with RUM- 2017-10-11 23:06:23 +02:00
Laurent Destailleur
6a0ef4b561 Fix info ot total in direct debit page 2017-09-19 19:29:00 +02:00
Laurent Destailleur
f87614e2d3 Fix missing translation 2017-09-19 19:12:54 +02:00
Laurent Destailleur
59f644a3e2 FIX SEPA recording payment must save one payment in bank per customer 2017-09-15 18:39:10 +02:00
Laurent Destailleur
17eec5f9e9 Fix look and field for direct debit notes 2017-09-15 17:23:41 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae Fixing pages warning when value is null 2017-06-24 16:45:45 +02:00
Laurent Destailleur
b441c62e1d Fix syntax error 2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c Fix security 2017-06-08 14:33:46 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2017-06-03 01:55:05 +02:00
Laurent Destailleur
3555bd2bd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
 2017-06-03 01:29:59 +02:00
Laurent Destailleur
37a261587e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-03 01:17:03 +02:00
Laurent Destailleur
d70c14a411 Update bonprelevement.class.php 2017-05-31 19:07:39 +02:00
Maxime Kohlhaas
510b1aedcf Fix xml SEPA $ListOfFactures not used and was listing all invoices in each XML line 2017-05-30 16:13:49 +02:00
Maxime Kohlhaas
200f4010d8 Fix special char and size limit in SEPA XML 2017-05-30 16:00:39 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
b568877f22 Merge pull request #6829 from grandoc/new_branch_10_05 
Update code using new css class
 2017-05-13 19:47:27 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
philippe grand
b7b16dc632 Update code using new css class 2017-05-10 16:41:19 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
184d52525a PHP code to manage pair/impair is replaced by native CSS. 2017-03-07 22:45:22 +01:00
Laurent Destailleur
6ee286f5f7 FIX #6404 2017-03-03 15:11:41 +01:00
Laurent Destailleur
ebe625aa16 Fix debug direct debit module 2017-02-21 13:16:28 +01:00
Laurent Destailleur
d461c0dfa4 Fix left align 2017-02-10 10:47:19 +01:00
Laurent Destailleur
6cb3199824 Translation message 2017-02-06 12:03:20 +01:00
Laurent Destailleur
ade8fd1415 Fix table format 2017-01-27 01:20:56 +01:00
Laurent Destailleur
66819a34fa Fix several bugs 2017-01-22 13:19:07 +01:00
Laurent Destailleur
c1d6ad90b3 FIX #6255 2017-01-16 12:35:19 +01:00
Laurent Destailleur
43cb9c30b2 Fix var_dump 2017-01-16 12:21:37 +01:00
Laurent Destailleur
c01baf1223 FIX #6255 2017-01-16 12:16:49 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
Laurent Destailleur
a52ad545eb Enhancement on module Direct Debit SEPA. 2016-10-02 13:03:45 +02:00
aspangaro
8dc6a8fd1d Correct presentation 2016-09-24 14:47:51 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture.php
 2016-09-21 18:38:30 +02:00
Laurent Destailleur
1c15539bb4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-21 01:27:25 +02:00
Laurent Destailleur
4096981378 FIX #3128 2016-09-12 03:10:18 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
philippe grand
959f4d0ba0 internationalized comments 2016-09-01 19:44:49 +02:00
Laurent Destailleur
10ced563b3 Fix var $conf not defined 2016-08-31 19:39:12 +02:00
Laurent Destailleur
292993c14f Fix var $conf not defined 2016-08-31 19:37:34 +02:00
Laurent Destailleur
545bc9d33d Fix var conf not defined. 2016-08-31 19:36:21 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
Laurent Destailleur
4215ec3ca9 FIX usage of sepa generation setup. 2016-08-28 20:12:25 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php
 2016-08-05 00:42:40 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
621a7d93fa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-01 15:05:57 +02:00
Laurent Destailleur
97dd1f4bbb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2016-08-01 15:03:59 +02:00
BENKE Charlie
9a0494bd64 Update bonprelevement.class.php 2016-08-01 14:11:58 +02:00
Laurent Destailleur
69247afd06 FIX #4447 2016-07-29 17:26:24 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Ferran Marcet
5bc51a3439 FIX: Can't create withdrawal document 2016-07-28 16:56:23 +02:00
BENKE Charlie
3e13877f3c Update fiche-stat.php 2016-07-27 22:32:58 +02:00
BENKE Charlie
a3dea2c648 Update fiche-rejet.php 2016-07-27 22:32:42 +02:00
BENKE Charlie
c7a70fd5a3 suffix left on url 2016-07-27 22:32:17 +02:00
BENKE Charlie
c1c44ce996 Update bonprelevement.class.php 2016-07-27 22:24:48 +02:00
BENKE Charlie
457a48c9ac Bad folders name (repeat /receipts 2 times) 2016-07-27 22:17:25 +02:00
Laurent Destailleur
76d24ac8ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3 Fix NNE has been replaced with ICS 2016-07-02 11:26:55 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
 2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/sendings.lib.php
 2016-07-01 02:06:30 +02:00
Maxime Kohlhaas
d004f3a538 FIX #4448 $filebonprev is not used, $this->filename now 2016-06-30 17:03:56 +02:00
Laurent Destailleur
b01eed697e Fix sort on thirdparty on bank transaction list 2016-06-20 11:30:43 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
5bfc65676c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/theme/eldy/style.css.php
 2016-04-22 21:02:20 +02:00
Juanjo Menent
ecbf5996c1 FIX #4961 2016-04-15 17:20:37 +02:00
Maxime Kohlhaas
9de6d31c87 New add link to widthdraw slip card on bank transaction 2016-04-13 15:57:46 +02:00
Laurent Destailleur
724610ba5b Quality fixes reported by scrutinizer 2016-04-09 15:07:55 +02: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
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
368b4c621f Fix phpcs 2016-03-12 18:25:41 +01:00
philippe grand
b495fdb58e [Qal] uniformize code 2016-03-10 15:51:31 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +01:00
Marcos García de La Fuente
6f5481896b FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field 
Close #4453
 2016-03-02 12:41:24 +01:00
Frédéric FRANCE
10d04e63c1 Update bonprelevement.class.php 2016-02-29 22:59:08 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
philippe grand
f308606ee1 [Qual] Uniformize code 2015-11-15 07:47:35 +01:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php
 2015-07-19 11:38:44 +02:00
Maxime Kohlhaas
20bdfdb286 Fix : withdrawal rejection were taking the total amount of the invoice instead of the amount of the withdrawal 2015-07-14 11:57:47 +02:00
Laurent Destailleur
be92f5e7a0 Fix syntax error 2015-06-27 02:31:26 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Laurent Destailleur
7d1d1caf30 Debug withdraw module 2015-06-21 17:09:00 +02:00
Laurent Destailleur
230fd7a7e4 Debug withdraw module 2015-06-21 17:05:49 +02:00
maxime peyrot
f99a127a57 NEW : Enter amount for withdraws requests 2015-06-19 13:45:14 +02:00
Laurent Destailleur
e382999b9e Css fix 2015-05-15 20:10:17 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Maxime Kohlhaas
54a68116e4 Fix : prevelement with SEPA 2015-04-19 01:55:35 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-06 10:25:30 +00:00
aspangaro
414d4c6432 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Juanjo Menent
a2adeb2807 Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line 
159
 2015-03-14 10:17:41 +01:00
Juanjo Menent
851cae80a2 Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line 
159
 2015-03-14 10:16:50 +01:00
aspangaro
3897e65425 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-11 05:28:59 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
d847f9581e Fix generation of RUM number. Show it on card to help debug. 2015-03-10 11:31:23 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
aspangaro
c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-02 21:05:38 +01:00
Laurent Destailleur
f81cb81e67 Merge pull request #2405 from frederic34/patch-5 
phpcs
 2015-03-02 00:31:50 +01:00
Laurent Destailleur
2795d27cc9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
 2015-03-01 16:13:22 +01:00
Laurent Destailleur
9b0dce2e34 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/agenda.lib.php
 2015-03-01 13:58:56 +01:00
Laurent Destailleur
a421564b84 Fix phpcs 2015-03-01 13:52:58 +01:00
Frédéric FRANCE
eb2cc110fc phpcs 2015-02-28 10:49:14 +01:00
Juanjo Menent
856c8f24de Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:14:45 +01:00
Juanjo Menent
88d1d203d8 Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:13:24 +01:00
Juanjo Menent
7ca8fdb20c PHP norms 2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47 Fix: Bad SEPA xml file creation 2015-02-27 17:55:15 +01:00
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
Laurent Destailleur
9e078b32d2 Fixes the way the RUM number is generated. Start phpunit test. 2015-02-20 18:35:52 +01:00
Laurent Destailleur
49cb36461c Typo 2015-02-20 15:54:16 +01:00