aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ee4d697172
Fix several bugs reported by scrutinizer
2014-09-19 14:57:31 +02:00
Laurent Destailleur
ca3c5d9513
Fix: invalid list of params
...
Fix: loading of sql menu
2014-09-19 14:36:55 +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
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Marcos García de La Fuente
7bac9444e6
[ bug #1546 ] Incorrect page number when searching in the list of bank transactions
2014-09-14 14:32:17 +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
aspangaro
fa6941efc6
Merge branch 'Upstream/develop'
2014-09-04 04:23:19 +02:00
aspangaro
2cba7ab9e6
Card presentation
2014-09-04 04:22:43 +02:00
Laurent Destailleur
1eaf615426
Fix: no br after title
2014-09-03 14:32:59 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
Laurent Destailleur
605919be76
Fix: Too many parameter
...
Fix: Can't delete bank account
2014-08-01 14:51:40 +02:00
Laurent Destailleur
07cf09536d
Fix: delete bank account
2014-08-01 14:48:48 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731
Migrated old error notifications to the """new""" system
2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ac824728bc
Migrated old error notifications to the """new""" system
2014-07-20 01:09:43 +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
frederic34
742bdcb715
Set bank account for supplier invoices
2014-07-09 18:44:20 +02:00
frederic34
865fea37e9
Correct filter
2014-07-08 16:02:46 +02:00
frederic34
a2911cef11
Filter on invoice for "treso"
2014-07-08 11:46:22 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +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
aspangaro
5cc8ec4f5f
Add accountancy code journal into bank card & modify presentation
2014-06-29 20:10:43 +02:00
aspangaro
516363f491
Bank - Enhance readability
2014-06-17 06:43:50 +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
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +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
frederic34
88c5d6e5d1
Display the total with currency
2014-06-11 18:01:14 +02:00
frederic34
89547dde37
Display the total by currency account
2014-06-11 17:42:03 +02:00
Marcos García de La Fuente
ae4bd4445e
Moved dol_syslog query log to the database handler and decreased report level to DEBUG
2014-06-09 15:49:54 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
3209483f1b
Bank search: Better wording
2014-05-19 14:38:26 +02:00
Laurent Destailleur
76330ad04a
Fix: [ bug #1383 ] When add a salary payment - In bank, link "user"
...
doesn't work
2014-05-11 18:35:25 +02:00
Laurent Destailleur
c2c0a9b4bb
Merge pull request #1568 from GPCsolutions/closingtagremoval
...
Qual: Remove the closing PHP tag
2014-05-04 18:08:37 +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
Marcos García de La Fuente
5d46115dd3
Missing translation of transaction types in releve detail
2014-05-01 16:32:04 +02:00
aspangaro
bab54f8264
Type bank & tva
2014-04-28 06:41:27 +02:00
aspangaro
73eec6b872
Fix :: Key language "Thirdparty" not traduced when module thirdparty is deactivated
2014-04-28 04:53:39 +02:00
Florian Henry
0d1697589e
syntax
2014-04-13 20:39:40 +02:00
Florian Henry
7d84c573ab
syntax travis ruleset.xml
2014-04-13 18:57:35 +02:00
Florian Henry
57e4453ea2
Add filter date and total line on bank writing list page
2014-04-13 18:26:21 +02:00
Laurent Destailleur
9a8a306d78
Qual: Method form->select_currency() has been removed. Use instead
...
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
2014-04-02 14:53:42 +02:00
Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Laurent Destailleur
a5c2b78565
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-29 17:38:06 +01:00
Laurent Destailleur
61f649e1ae
Fix: When select_date is called with '' as preselected date,
...
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
2014-03-29 04:26:44 +01:00
Florian Henry
c8c4a10a06
Fix restrictedearea bug
2014-03-21 16:18:17 +01:00