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
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
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
63f2bfed24
Fixed: Maxi debug of withdrawal module.
2014-12-09 11:19:16 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Frédéric FRANCE
8c839cc2a1
Update /compta/prelevement/list.php
2014-11-23 17:44:16 +01:00
Frédéric FRANCE
37eef59b50
Update /compta/prelevement/list.php
2014-11-23 09:50:19 +01:00
aspangaro
c256243bf7
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-16 08:41:39 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
aspangaro
840dfd780d
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-07 21:28:39 +01:00
Laurent Destailleur
60ca5aa026
Debug of module withdraw.
2014-11-05 17:32:42 +01:00
Laurent Destailleur
90fb05805c
Fix: Missing translation
2014-11-05 16:21:17 +01:00
aspangaro
cbfa90abca
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 20:57:05 +01:00
aspangaro
25433120e6
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 06:16:03 +01:00
aspangaro
39e83576a2
prelevement list
2014-11-02 21:44:03 +01:00
Laurent Destailleur
9619c0cdea
Fix: [ bug #1581 ] SQL injection possbile
2014-10-27 00:58:56 +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
aspangaro
7e11fa06bb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-05 16:35:38 +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
aspangaro
250b57ca0a
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-28 14:00:26 +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
3d23319226
Update
2014-09-24 04:10:29 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
aspangaro
7a9ce455d9
Uniformize code $_SERVER["PHP_SELF"]
2014-09-18 20:13:38 +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
Laurent Destailleur
94335b186e
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Raphaël Doursenaud
c3f05d1c1c
Withdrawals: fixed bad translation key
2014-05-19 14:38:26 +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
Laurent Destailleur
880f77b7e1
Fix: Preview feature
2014-04-30 13:50:25 +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
7eea96c07c
Minor fix into standing order.
2014-03-17 20:43:01 +01: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
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +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
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
aspangaro
e8c7bb9c62
Fix for language
2013-11-14 21:02:33 +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
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +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
869e877cb7
Qual: We must not concat currency symbol after a price, but use the
...
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
simnandez
26b36f3a4e
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:10:31 +02:00
simnandez
097fbaacd0
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:09:30 +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
fhenry
de4b9b01bf
Fix Bug [ bug #880 ] Prelevement section is broken
2013-05-07 15:34:40 +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
c65620ab62
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866
...
Conflicts:
ChangeLog
2013-05-03 08:17:58 +02:00
Marcos García
f8f4fd3a6f
Enhanced fix
2013-05-03 08:16:31 +02:00
Laurent Destailleur
fc0d5abd14
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
Marcos García
97478ccbf2
Error statut image + not translated strings
2013-05-01 20:54:45 +02:00
Marcos García
95f63a8171
Corrected some es_ES translations and fixed problems with translations not being translated
2013-05-01 20:43:08 +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
dd13c334c7
New: Compatibility with jmobile
2013-04-20 20:30:18 +02:00
Laurent Destailleur
de2ddc02e4
Qual: Another clean of menu management system. Removed all files
...
pre.inc.php
2013-04-15 13:11:29 +02:00
Laurent Destailleur
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
Laurent Destailleur
f52fe71018
Fix: Bad div closing
2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
55f9879a6c
Replace table with div. Prepare work for android application.
2013-03-16 14:53:15 +01: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
Marcos García
be40114541
Fixed translation problems with Prelevement module
2013-01-09 21:33:55 +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
Grand Philippe
c6a3add952
fix : typo
2012-12-06 17:09:12 +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
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +02:00
Laurent Destailleur
9c04cb25db
Qual: Removed not used files.
2012-08-26 15:51:28 +02:00
Marcos García
ea119c45a2
Lower-cased all <?PHP
2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +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
Laurent Destailleur
c2db3265ec
Fix: Regression with quot management. Try a better fix.
2012-05-30 12:43:23 +02:00
Regis Houssin
a5b0de15ac
Fix: can't delete a files with quote
2012-05-30 08:30:25 +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
658911b8c9
Qual: Move embeded style into css files. Add more styles.
2012-04-18 14:27:31 +02:00
Laurent Destailleur
cf68414b21
Checkstyle
2012-04-01 20:38:22 +02:00
Laurent Destailleur
6280605965
Fix: Move include
2012-03-10 01:06:58 +01:00
simnandez
f319ec7dd2
Fix: Bad sql query
2012-03-02 20:15:43 +08:00
simnandez
cda3600f7f
Fix: Security
2012-02-29 18:56:54 +01:00
Laurent Destailleur
1645ddbe47
Sec: Sanitize all input for ids.
2012-02-27 22:26:22 +01:00
Laurent Destailleur
c4b845d60a
Qual: Removed deprecated function name.
2012-02-19 18:34:22 +01:00
Regis Houssin
4431510ce4
Fix: use entity field of object
2012-02-01 11:32:55 +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
Laurent Destailleur
ebea7f6c97
Fix: fix not initialized variables
2011-12-05 18:36:54 +01:00
Laurent Destailleur
839781dfbe
Qual: Removed a TODO by renaming all ->monnaie into ->currency
2011-11-23 14:55:36 +01:00
Laurent Destailleur
1770a46519
Qual: Removed tons of warning
2011-11-22 14:00:03 +01:00
Regis Houssin
f0c327c070
Fix: uniform code
...
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Laurent Destailleur
2996ee7639
New: Add trigger ACTION_DELETE and ACTION_MODIFY
...
Fix: LOG_ERROR must be LOG_ERR
2011-11-01 13:22:39 +01:00
Juanjo Menent
5c9ba8a548
[task 189] Move Error* key from other.lang into errors.lang files
2011-10-29 23:52:05 +02:00
Regis Houssin
3338649316
[task #217 ] Move core files in core directory
2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f
[task #216 ] Move lib in core directory
2011-10-24 12:59:44 +02:00
Regis Houssin
63d60a33fc
[task #216 ] Move lib in core directory
2011-10-24 11:25:54 +02:00
Regis Houssin
30c5f4b214
Move all core class in htdocs/core/class
2011-10-24 09:29:17 +02:00
Laurent Destailleur
31bfa1bddd
Fix: Removed warnings
2011-09-21 12:25:23 +00:00
Laurent Destailleur
030f960df3
Doxygen
2011-09-20 22:55:11 +00:00
Laurent Destailleur
1f9f17247f
Doxygen
2011-09-20 22:28:31 +00:00
Laurent Destailleur
25a3779fcc
Doxygen
2011-09-20 22:45:39 +00:00
Regis Houssin
6c4acefd93
Fix: Space before opening parenthesis of function call prohibited
2011-09-20 12:56:06 +00:00
Regis Houssin
ac2d7aab7c
Fix: Space found before comma
2011-09-20 09:59:08 +00:00
Regis Houssin
b6a2f13673
Fix: avoid jenkins warning
...
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
2011-09-20 09:40:27 +00:00
Regis Houssin
2c1b3722f2
Fix: replace sizeof() by count()
2011-09-17 19:49:50 +00:00
Laurent Destailleur
b75d19c264
Qual: Uniformize constructors
2011-09-11 18:35:38 +00:00
Laurent Destailleur
351a2974dd
Doxygen
2011-09-03 00:14:27 +00:00
Laurent Destailleur
044879c838
Doxygen
2011-09-02 23:57:26 +00:00
Laurent Destailleur
0e2946cec7
Doxygen
2011-09-03 00:19:56 +00:00
Laurent Destailleur
e5988ad241
Fix: Error management when adding notification
2011-09-02 23:41:55 +00:00
Laurent Destailleur
2d89e6609e
Doxygen
2011-09-03 00:14:27 +00:00
Laurent Destailleur
5be5852cf4
Fix: Third party emails must not be visible into notification page
2011-09-02 23:07:47 +00:00
Laurent Destailleur
42c86ce1ac
Work on rpm package
2011-09-03 01:46:33 +00:00
Juanjo Menent
cac55067fb
Qual: Uniformize code
2011-09-02 22:33:28 +00:00
Laurent Destailleur
55c5c5f9f5
Work on rpm package
2011-09-03 01:27:00 +00:00
Laurent Destailleur
f5f37fa8dc
Qual: Uniformize code
2011-09-02 16:33:11 +00:00
Laurent Destailleur
d53b179102
Fix: Fix GNU address
...
Doxygen
2011-09-03 01:24:09 +00:00
Laurent Destailleur
f39c932b2e
Qual: Uniformize code
2011-09-02 16:25:07 +00:00
Laurent Destailleur
26badd59f4
Doxygen
2011-09-03 00:27:02 +00:00
Juanjo Menent
116e215323
Uniformize code
2011-09-02 15:41:35 +00:00
Laurent Destailleur
1ca46d8ec4
Doxygen
2011-09-03 00:19:56 +00:00
Juanjo Menent
8f19ee66e4
Uniformize code
2011-09-02 14:31:53 +00:00
Laurent Destailleur
d1d145620d
Doxygen
2011-09-03 00:14:27 +00:00
Regis Houssin
03711cf6f2
Fix: remove obsolete tags
2011-08-27 19:15:14 +00:00
Regis Houssin
2ecc03104c
Fix: remove obsolete tags (in progress)
2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd
Fix: remove obsolete tags (in progress)
2011-08-27 14:24:16 +00:00
Laurent Destailleur
0adbca4625
Qual: Mutualize a lot of duplicate functions into functions.lib.php
2011-08-17 15:56:22 +00:00
Laurent Destailleur
e2c007305c
Fix: Avoid errors into rpm packages
2011-07-31 22:21:57 +00:00
Laurent Destailleur
717ccab054
Fix: If list is empty, show "None".
2011-07-29 21:15:39 +00:00
Laurent Destailleur
4180412747
Fix: encoding
2011-07-18 18:07:36 +00:00
Laurent Destailleur
e1094fc293
Qual: Debug and clean notification module
2011-06-12 18:05:30 +00:00
Juanjo Menent
8c6db8669b
Uniformize code
2011-05-12 15:57:38 +00:00
Juanjo Menent
ca0905a32e
Withdrawals: Fix get bankaccount for rejected lines
2011-05-12 15:41:07 +00:00
Juanjo Menent
cd2d5ddd73
Uniformize code
2011-05-06 16:56:53 +00:00
Juanjo Menent
b69a1bc082
Uniformize code
2011-05-06 14:20:20 +00:00
Juanjo Menent
8f66345e9d
Uniformize code
2011-05-06 13:49:34 +00:00
Juanjo Menent
cb83b265d2
Fix: Standing Order display mistmach
2011-03-31 07:49:10 +00:00
Laurent Destailleur
b9577d5f7e
Fix: Menu was not complete
2011-03-16 11:12:57 +00:00
Regis Houssin
11a3b7f6eb
Fix: reencoding preview tabs, Imagick is a class today
...
Fix: uniformize code
2011-03-04 16:52:29 +00:00
Regis Houssin
20ea744d8a
Fix: reencoding preview tabs, Imagick is a class today
2011-03-04 12:27:40 +00:00
Regis Houssin
3b4ea76538
Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class
2011-02-24 18:11:12 +00:00
Laurent Destailleur
638cb105df
Fix: HTML tags must be escaped
2011-02-18 10:45:38 +00:00
Laurent Destailleur
a903d9c9c7
Fix: Bad links
2011-02-16 12:59:55 +00:00
Juanjo Menent
4dc39fb690
Withdrawals: Checking need data to create standigns orders receipt file
2011-02-03 22:19:36 +00:00
Juanjo Menent
9e3694640f
Withdrawals: Improvements
2011-02-01 20:58:37 +00:00
Juanjo Menent
e6ddc8bd71
Withdrawals: Add bank transaction for refused withdrawals
2011-01-31 21:39:23 +00:00
Juanjo Menent
5d1a032cd1
Withdrawals: Add bank transaction for refused withdrawals
2011-01-31 21:39:23 +00:00
Juanjo Menent
e3a44d79ac
Withdrawals: Fix bad link
2011-01-29 23:09:36 +00:00
Juanjo Menent
363d014516
Withdrawals: Restore lost comment
2011-01-29 22:41:16 +00:00
Juanjo Menent
284606af73
Withdrawals: Add bank transaction. Payment of invoice should not be in standing order creation. Transaction added and payment translated to infocredit function
2011-01-29 21:37:50 +00:00
Juanjo Menent
07046ce3b4
Withdrawls: Add user permission control
2011-01-15 08:51:22 +00:00
