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
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
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
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
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
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
912d5c53f2
Standardize code
2018-04-21 15:54:05 +02: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
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
5ae13ea9d6
Fix navigation in bank direct debit orders
2017-12-15 17:05:01 +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
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
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
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
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02: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
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
a52ad545eb
Enhancement on module Direct Debit SEPA.
2016-10-02 13:03:45 +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
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
4215ec3ca9
FIX usage of sepa generation setup.
2016-08-28 20:12:25 +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
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
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
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
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
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +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
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
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
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
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
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
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
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
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Frédéric FRANCE
a7d263c14e
Typo
2015-01-16 23:34:10 +01:00
Juanjo Menent
26e5efd71d
Improve code create function
2015-01-16 23:09:13 +01:00
Juanjo Menent
93d3ffb06f
Fix: PostgreSQL compatibilty
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-01-16 18:03:55 +01:00
Juanjo Menent
0d4aad4111
Fix: PostgreSQL compatibilty
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-01-16 17:59:58 +01:00
Juanjo Menent
fe5533d1c3
Fix: PostgreSQL compatibilty
2015-01-16 17:41:56 +01:00
Juanjo Menent
1930d0677e
Fix: withdrawal create error if in the same month are deleted previus
...
withdrawals.
Conflicts:
ChangeLog
2015-01-15 10:02:42 +01:00
Juanjo Menent
f03ffaf5a3
Fix: withdrawal create error if in the same month are deleted previus
...
withdrawals.
Conflicts:
ChangeLog
2015-01-15 10:00:52 +01:00
Juanjo Menent
d40eab2494
Fix: withdrawal create error if in the same month are deleted previus
...
withdrawals.
2015-01-15 09:57:20 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
Laurent Destailleur
63f2bfed24
Fixed: Maxi debug of withdrawal module.
2014-12-09 11:19:16 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Laurent Destailleur
60ca5aa026
Debug of module withdraw.
2014-11-05 17:32:42 +01:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Laurent Destailleur
c6fc07e412
Merge pull request #1926 from fmarcet/3.6
...
Fix: Withdrawal total amount is double
2014-09-29 15:41:59 +02: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
fmarcet
7b9f154c29
Fix: Withdrawal total amount is double
2014-09-25 12:45:08 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
0cefe5af43
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/lib/date.lib.php
htdocs/fourn/facture/fiche.php
htdocs/includes/tcpdf/include/tcpdf_static.php
htdocs/product/price.php
2014-09-07 13:18:56 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
da8a1cb475
Fix: Iban was used instead of Bic into SEPA file.
...
Fix: Must unaccent strings into SEPA file.
2014-09-04 15:38:20 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +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
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Juanjo Menent
773caf808e
[ task #867 ] Remove ESAEB external module code from core
2014-06-27 09:09:54 +02:00
Juanjo Menent
6ce1ef08cf
[ task #867 ] Remove ESAEB external module code from core
2014-06-27 09:09:08 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Marcos García de La Fuente
9344123887
CR Fix
2014-06-09 15:25:31 +02:00
fmarcet
66606b42ca
Fix: Serious bug on withdrawal
2014-06-06 17:06:30 +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
Juanjo Menent
f458c384d7
Fix: Can not make withdrawals
...
Conflicts:
ChangeLog
2014-04-11 12:10:04 +02:00
Juanjo Menent
75e76dc232
Fix: Can not make withdrawals
2014-04-11 12:07:01 +02:00
Laurent Destailleur
c81406c7f3
Fix: CI
2014-03-31 02:41:15 +02:00
Laurent Destailleur
3d8fb60f94
Start to implement sepa format. Need serious tests.
2014-03-30 20:22:54 +02:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
Laurent Destailleur
fdfb7f1a8a
Fix: Be sure there is no duplicate default rib.
2014-02-08 03:24:48 +01:00
simnandez
11353786a1
Fix: Unable to make a withdrawal with two or more invocies
2013-12-23 10:46:19 +01:00
Laurent Destailleur
2f47b0fcfd
Fix: picto for status8 is a flash red icon to report a critical error
...
that need a task to fix. This is not the case for a close thirdparty (a
close thirdparty is a regular status). However to have a bigger contrast
with thirdparty active, i set picto to statut5.png
2013-11-04 23:56:15 +01:00
Laurent Destailleur
72557437ef
Checkstyle
2013-09-10 14:19:36 +02:00
Marcos García
4532399026
CR Fix
...
I'm getting tired of these commits...
2013-06-19 09:26:20 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
ee890a87a3
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
simnandez
0c853b3ebd
Fix: Some bugs on withdrawal rejects
2013-05-13 17:35:30 +02:00
simnandez
050ca946e9
Fix: Debug of withdrawals rejects
2013-05-13 16:30:52 +02:00
simnandez
dbb0fa09ff
Fix: Debug of withdrawals rejects
2013-05-11 18:36:44 +02:00
Laurent Destailleur
7382a97223
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2013-05-03 10:13:31 +02:00
Marcos García
f8f4fd3a6f
Enhanced fix
2013-05-03 08:16:31 +02:00
Marcos García
a9e63610ae
Fixed bug #866 : Standing order from an invoice suggests invoice total amount instead of remaining to pay
2013-05-01 20:40:29 +02:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
Grand Philippe
8d7654916f
english language standardization
2013-02-23 15:46:12 +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
simnandez
68866eaa5f
Fix: Withdrawal payment warning
2013-01-04 11:07:31 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
simnandez
7cbcd1fc5d
Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is
...
mandatory
2012-12-12 17:00:29 +01:00
simnandez
488d482508
Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is
...
mandatory
2012-12-12 16:57:53 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Regis Houssin
2d5368e135
Fix: converting line delimiters
2012-11-20 12:11:19 +01:00
Laurent Destailleur
f58d0636a1
Doxygen
2012-11-18 16:55:00 +01:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Laurent Destailleur
0cf89eac08
Doxygen
2012-09-08 02:17:08 +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
97474bf77f
Fix: strict mode safari
2012-08-16 19:18:24 +02:00
Laurent Destailleur
e53e847083
Qual: Uniformize code
2012-08-05 14:37:45 +02:00
Marcos García
5a73c32f46
Migrated ClassName to __construct() function
...
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Regis Houssin
73487a6aec
Fix: replace mktime() by dol_now()
2012-04-30 15:01:25 +02:00
Regis Houssin
1dd12db306
Todo: Use hookmanager for external modules
2012-04-26 10:54:39 +02:00
simnandez
429851cb49
Fix: Bad include
2012-04-26 10:52:10 +02:00
Laurent Destailleur
cf68414b21
Checkstyle
2012-04-01 20:38:22 +02:00
simnandez
f319ec7dd2
Fix: Bad sql query
2012-03-02 20:15:43 +08:00
Laurent Destailleur
c4b845d60a
Qual: Removed deprecated function name.
2012-02-19 18:34:22 +01:00
Laurent Destailleur
6a5218b9b2
Qual: Ckeckstyle
2012-01-10 01:31:06 +01:00
Laurent Destailleur
c2348ef600
Uniformize field country_id, country_code, country
2011-12-29 18:07:41 +01:00