Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/expedition/fiche.php
2015-04-18 23:55:17 +02:00
Marcos García de La Fuente
728b64e334
Fix Bug #2583 : Unable to create a bank transfer with localized numbers
2015-04-12 20:24:22 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Frédéric FRANCE
06c749942a
Update index.php
2015-04-07 18:40:19 +02:00
Frédéric FRANCE
7a2942684c
Fix #2559 Bug: Untranslated "Total" in Bank module
2015-04-07 12:45:25 +02:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +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
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
Maxime Kohlhaas
db9d727eb8
FIX : Link to user was wrong on bank transaction card
2015-02-08 12:36:55 +01:00
aspangaro
6f3d9200bf
Correct link
2015-01-22 07:15:14 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
Frédéric FRANCE
650d4a3da9
Fix missing /form
2014-12-02 19:55:10 +01:00
Laurent Destailleur
6d2e024d52
Doxygen
2014-11-23 17:53:44 +01:00
Frédéric FRANCE
dd1c39b44e
Update /compta/bank/search.php
2014-11-23 17:44:29 +01:00
Laurent Destailleur
652b0f84a7
Fixed: Field is used only by module accounting so must have a condition
...
on it.
2014-11-23 17:03:22 +01:00
Laurent Destailleur
671243e8f6
Fixed: Bugs reported by scrutinizer
...
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
80e62697f0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/bank/treso.php
2014-11-18 19:01:01 +01:00
Laurent Destailleur
01279edfc8
Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank
...
planned transactions.
2014-11-16 16:36:32 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
aspangaro
10ed271e38
Search bank transactions
2014-11-02 20:18:46 +01:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
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
