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
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01: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
aspangaro
63099727d0
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-21 15:10:35 +01:00
Frédéric FRANCE
b73f1eb827
Update account.class.php
2015-02-19 08:40:38 +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
Laurent Destailleur
316e5c2f19
Merge pull request #2358 from marcosgdf/board-refactor
...
Refactored dashboard indicator
2015-02-18 23:39:15 +01:00
frederic34
4bbbff8d69
Add BIC/SWIFT Validation
2015-02-17 22:04:16 +01:00
frederic34
f652cf4e97
Add translation for IBAN Valid or not
2015-02-17 17:02:38 +01:00
Marcos García de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +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
Laurent Destailleur
381af3e6bc
Field amount must be right aligned
2015-02-08 00:32:49 +01:00
Laurent Destailleur
ef31ca9b84
New: Add balance of each account statement.
2015-02-07 23:32:46 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
aspangaro
6f3d9200bf
Correct link
2015-01-22 07:15:14 +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
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
87a59ef527
Merge branch 'develop_bank_extrafields' of
...
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields
Conflicts:
htdocs/admin/bank.php
2015-01-17 14:42:04 +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
Frédéric FRANCE
37e5a97f84
Typo
2014-12-09 23:07:41 +01:00
Frédéric FRANCE
650d4a3da9
Fix missing /form
2014-12-02 19:55:10 +01:00
Frédéric FRANCE
bff209a895
Fix missing /form
2014-11-28 08:25:51 +01:00
Laurent Destailleur
d9cb9c1585
Merge pull request #2102 from aspangaro/develop-center
...
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +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
aspangaro
c256243bf7
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-16 08:41:39 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
aspangaro
c70539b3b2
Bug & merge
2014-11-12 07:33:03 +01:00
Florian HENRY
9c795d2c4b
Finnish bank extrafeilds
2014-11-10 13:18:27 +01:00
Florian HENRY
e9f754395d
Start bank extrafields
2014-11-10 13:09:58 +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
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
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
