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
aspangaro
560150fd1c
Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)
2015-04-22 07:15:17 +02:00
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
jfefe
23e5bc4f53
Add title image for bank section
2015-04-18 23:17:47 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +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
Laurent Destailleur
503a4ff7a0
Enhance filtering for bank transaction and timesheet.
2015-04-09 20:40:49 +02:00
Laurent Destailleur
edd104a6bc
Merge pull request #2563 from frederic34/patch-7
...
Accounts "from" & "to" need to have same currency
2015-04-08 11:51:41 +02:00
Frédéric FRANCE
7f62892609
Display total with currency code
2015-04-08 09:19:41 +02:00
Frédéric FRANCE
856238c876
Accounts "from" & "to" need to have same currency
2015-04-08 09:09:11 +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
6fa0234409
Uniformize code
2015-04-07 03:00:11 +02:00
Laurent Destailleur
c9f690904c
Merge pull request #2514 from frederic34/patch-10
...
Correction for workboard in compta/bank/index.php
2015-04-02 11:40:55 +02:00
aspangaro
309b059089
New: Add a button to purge criteria in bank lines list
2015-03-31 21:00:22 +02:00
Frédéric FRANCE
fc5d7e57a2
Correction for workboard in compta/bank/index.php
2015-03-31 18:31:36 +02:00
Laurent Destailleur
b83e9ea32f
Merge branch 'loan' of https://github.com/frederic34/dolibarr into
...
frederic34-loan
Conflicts:
htdocs/compta/bank/ligne.php
2015-03-30 02:56:26 +02:00
aspangaro
c22a563422
New: Add management for accounting account in admin donation & correct bugs
2015-03-29 21:04:20 +02:00
frederic34
b6b1617741
Work on payment loan
2015-03-29 17:53:36 +02:00
aspangaro
ce6df7c022
Debug
2015-03-29 09:20:32 +02:00
aspangaro
77b123cb2d
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-27 06:30:35 +01:00
aspangaro
a39f81b1a6
FIXED: Correct path of loan class
2015-03-26 20:51:27 +01:00
aspangaro
b60f1e33d6
Debug
2015-03-26 06:29:16 +01:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
aspangaro
9d34b40897
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/compta/bank/account.php
2015-03-24 05:28:57 +01:00
aspangaro
414d4c6432
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-22 18:08:12 +01:00
aspangaro
b4b3c45dbc
Update works
2015-03-21 18:00:16 +01:00
Laurent Destailleur
6e251690ab
Doxygen
2015-03-17 11:23:45 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
aspangaro
3897e65425
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-11 05:28:59 +01:00
Laurent Destailleur
209f8946d0
All files must be lowercase
2015-03-10 14:17:58 +01:00
Laurent Destailleur
3894a48ffd
Fix: bad CSS
2015-03-08 02:37:25 +01:00
aspangaro
11704e0807
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-05 20:24:53 +01:00
Laurent Destailleur
8e29dcdb79
Some fix after merging bank account number form
2015-03-04 21:59:03 +01:00
Laurent Destailleur
40adbe5a72
Merge pull request #2420 from aspangaro/develop-patch17
...
NEW: [T1848] Merge bank card & account card
2015-03-04 21:09:28 +01:00
aspangaro
022d051726
Typo
2015-03-03 06:32:46 +01:00
aspangaro
42e43791ef
Add ajax for type on edit mode
2015-03-03 06:20:09 +01:00
aspangaro
fafebf5b2a
NEW: [T1758] Merge bank card & account card
2015-03-02 22:44:11 +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
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
