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
fe7889e266
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:19:19 +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
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
phf
9eed66d998
[CORE] FIX : Travis phptest (#incoterm).
2015-02-23 11:46:39 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
phf
81130634d3
[CORE] intégration de incoterm sur les différentes class (#incoterm).
2015-02-23 09:16:14 +01:00
Laurent Destailleur
30a5111c68
Work on expense report module
2015-02-21 15:18:05 +01:00
aspangaro
63099727d0
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-21 15:10:35 +01:00
Laurent Destailleur
6e66197621
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-02-20 23:49:06 +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
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
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +01:00
Laurent Destailleur
316e5c2f19
Merge pull request #2358 from marcosgdf/board-refactor
...
Refactored dashboard indicator
2015-02-18 23:39:15 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
Laurent Destailleur
ead6b4bf95
Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1830
Conflicts:
ChangeLog
2015-02-18 22:50:12 +01:00
Laurent Destailleur
89b9364837
Merge pull request #2337 from marcosgdf/bug-1822
...
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
2015-02-18 22:23:07 +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
Laurent Destailleur
b00de9707a
Work on expensereport module
2015-02-15 19:13:16 +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
Laurent Destailleur
bedaa483ad
br useless
2015-02-14 20:40:10 +01:00
Laurent Destailleur
179cbbd187
Maxi debug and enhancement of module batch.
2015-02-11 22:54:06 +01:00
Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +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
Marcos García de La Fuente
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
6531a5c6c7
Fix: [ bug #1830 ] Salaries payment only allows checking accounts
2015-02-10 09:44:27 +01:00
Marcos García de La Fuente
d9ac21ab82
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
2015-02-08 16:54:41 +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
24ad1afdd2
Merge pull request #2335 from atm-alexis/3.7
...
FIX empty discount where created if amount is null
2015-02-08 00:07:48 +01:00
Laurent Destailleur
aac584afda
Merge pull request #2320 from defrance69/patch-46
...
Update paiement.class.php
2015-02-07 23:46:40 +01:00
Alexis Algoud
0ca6661e69
FIX empty discount where created if amount is null for a line with a different tva
2015-02-07 23:42:35 +01:00
Laurent Destailleur
ef31ca9b84
New: Add balance of each account statement.
2015-02-07 23:32:46 +01:00
aspangaro
f23212eb22
Center title column & modify language key
2015-02-07 14:55:56 +01:00
aspangaro
ace524056e
Same problem
2015-02-07 14:34:04 +01:00
aspangaro
ba78b4c5e9
FIXED Missing language file
2015-02-07 14:18:02 +01:00
BENKE Charles
50ff9d2d0c
Update paiement.class.php
...
in case of sql query add error message in log instead of the screen
2015-02-04 02:17:37 +01:00
Marcos García de La Fuente
ef35483494
Fix: [ bug #1819 ] SQL error when searching for an invoice payment
2015-02-01 12:58:54 +01:00
Laurent Destailleur
21f72c7594
Fix regression
2015-01-31 17:10:19 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
29d399ba79
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 00:09:37 +01:00
