Laurent Destailleur
|
3593b5ac51
|
Revert "Revert " New:Algerian Chart of accounts""
This reverts commit 1d644a33a3.
|
2018-09-03 12:39:01 +02:00 |
|
Laurent Destailleur
|
5566dfe221
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-03 11:47:11 +02:00 |
|
Laurent Destailleur
|
fea6d43450
|
Merge pull request #9400 from Dolibarr/revert-9391-abb80016
Revert " New:Algerian Chart of accounts"
|
2018-09-03 11:42:16 +02:00 |
|
Laurent Destailleur
|
1d644a33a3
|
Revert " New:Algerian Chart of accounts"
|
2018-09-03 11:42:01 +02:00 |
|
Laurent Destailleur
|
5581c31609
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-03 11:39:19 +02:00 |
|
Laurent Destailleur
|
b9066fc4a0
|
Merge pull request #9391 from bafbes/abb80016
New:Algerian Chart of accounts
|
2018-09-03 11:39:07 +02:00 |
|
Laurent Destailleur
|
6876785347
|
Doc
|
2018-09-03 11:37:45 +02:00 |
|
Laurent Destailleur
|
76fdb5e63f
|
Merge pull request #9398 from hregis/develop_accounting
FIX remove deprecated triggers USER_LOG*
|
2018-09-03 11:36:14 +02:00 |
|
Regis Houssin
|
2b7e15edbd
|
FIX remove old triggers
|
2018-09-03 09:35:14 +02:00 |
|
Regis Houssin
|
912c05774b
|
FIX remove deprecated triggers USER_LOG*
|
2018-09-03 09:30:36 +02:00 |
|
Laurent Destailleur
|
d2afffaeca
|
Fix phpcs
|
2018-09-02 17:53:31 +02:00 |
|
Bahfir Abbes
|
09b75fc53e
|
Update llx_accounting_account_dz.sql
|
2018-09-02 16:52:41 +01:00 |
|
Abbes Bahfir
|
28a146fb5e
|
New:Algerian Chart of accounts - First version
|
2018-09-02 16:44:07 +01:00 |
|
Laurent Destailleur
|
e081e8443b
|
Merge pull request #9204 from ptibogxiv/patch-32
Fix payment in connect mode
|
2018-09-02 17:25:27 +02:00 |
|
Laurent Destailleur
|
3cc268c840
|
Update stripe.class.php
|
2018-09-02 17:23:38 +02:00 |
|
Laurent Destailleur
|
7ca45cd117
|
Update stripe.class.php
|
2018-09-02 17:22:45 +02:00 |
|
Laurent Destailleur
|
4cca4ce020
|
Update stripe.class.php
|
2018-09-02 17:21:45 +02:00 |
|
Laurent Destailleur
|
a68f5cad77
|
Fix syntax error
|
2018-09-02 17:18:19 +02:00 |
|
Laurent Destailleur
|
edd55fc756
|
Fix all TODO in main and master files
|
2018-09-02 16:47:58 +02:00 |
|
Laurent Destailleur
|
887a40cf1d
|
Remove TODO
|
2018-09-02 16:46:01 +02:00 |
|
Laurent Destailleur
|
0bf850c1ea
|
Fix phpcs
|
2018-09-02 16:26:00 +02:00 |
|
Laurent Destailleur
|
3baaa2e975
|
Fix syntax error
|
2018-09-02 16:18:08 +02:00 |
|
Laurent Destailleur
|
ddd6ac296c
|
Fix missing class
|
2018-09-02 16:09:40 +02:00 |
|
Laurent Destailleur
|
5488bfe1fe
|
Merge pull request #9018 from all3kcis/patch-10
Enable auto update PDF on update note
|
2018-09-02 16:01:22 +02:00 |
|
Laurent Destailleur
|
dda0c5699e
|
Update actions_setnotes.inc.php
|
2018-09-02 15:59:09 +02:00 |
|
Laurent Destailleur
|
e661eff329
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-02 15:48:43 +02:00 |
|
Laurent Destailleur
|
3d3edb19d8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/langs/en_US/commercial.lang
|
2018-09-02 15:48:26 +02:00 |
|
Laurent Destailleur
|
76d6affb27
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
.travis.yml
|
2018-09-02 15:46:09 +02:00 |
|
Laurent Destailleur
|
b270563cd3
|
Merge pull request #9389 from frederic34/patch-17
Update myobject.class.php
|
2018-09-02 15:41:30 +02:00 |
|
Laurent Destailleur
|
1418adde8b
|
Merge pull request #9388 from frederic34/patch-16
Update actioncommreminder.class.php
|
2018-09-02 15:41:07 +02:00 |
|
Laurent Destailleur
|
b34731afb4
|
Merge pull request #9385 from frederic34/patch-15
Update html_cerfafr.modules.php
|
2018-09-02 15:38:19 +02:00 |
|
Laurent Destailleur
|
63217de5e0
|
Merge pull request #9384 from frederic34/patch-14
comment missing and not camecaps are incompatible
|
2018-09-02 15:37:38 +02:00 |
|
Laurent Destailleur
|
91809de1c3
|
Merge pull request #9383 from frederic34/patch-13
Update doc_generic_user_odt.modules.php
|
2018-09-02 15:35:54 +02:00 |
|
Laurent Destailleur
|
86331ee321
|
Merge pull request #9382 from frederic34/patch-11
Update dav.class.php
|
2018-09-02 15:35:41 +02:00 |
|
Laurent Destailleur
|
b90cecf728
|
Merge pull request #9380 from frederic34/patch-9
remove superfluous space
|
2018-09-02 15:35:29 +02:00 |
|
Laurent Destailleur
|
ff6a57d52a
|
Merge pull request #9381 from frederic34/patch-10
remove superfluous space
|
2018-09-02 15:35:18 +02:00 |
|
Laurent Destailleur
|
bb5fae0e46
|
Fix eol
|
2018-09-02 15:30:56 +02:00 |
|
Laurent Destailleur
|
f216da78d5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
.travis.yml
|
2018-09-02 15:27:03 +02:00 |
|
Laurent Destailleur
|
e0b272941f
|
Fix mariadb
|
2018-09-02 15:25:27 +02:00 |
|
Laurent Destailleur
|
ebba0b9e67
|
phpunit 6.1 compatibility
|
2018-09-02 15:24:29 +02:00 |
|
Laurent Destailleur
|
0b34acae7c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-09-02 15:22:56 +02:00 |
|
Laurent Destailleur
|
42cb2b07db
|
Only min and max version
|
2018-09-02 15:22:49 +02:00 |
|
Laurent Destailleur
|
a7dfc88b59
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
test/phpunit/CoreTest.php
|
2018-09-02 15:21:21 +02:00 |
|
Laurent Destailleur
|
32a03f3c0b
|
Fix eol
|
2018-09-02 14:25:52 +02:00 |
|
Laurent Destailleur
|
bd3647a9d7
|
Prepare phpunit 6.1 compatibility
|
2018-09-02 14:23:52 +02:00 |
|
Laurent Destailleur
|
b9c95a5a5c
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2018-09-02 14:19:43 +02:00 |
|
Laurent Destailleur
|
5bab9d59b2
|
Fix var_dump
|
2018-09-02 14:19:23 +02:00 |
|
Laurent Destailleur
|
df721a5fbc
|
Only min and max php version
|
2018-09-02 14:18:04 +02:00 |
|
Laurent Destailleur
|
37fb70d983
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2018-09-02 14:15:32 +02:00 |
|
Laurent Destailleur
|
02bedc49d3
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
test/phpunit/PricesTest.php
test/phpunit/RestAPIUserTest.php
test/phpunit/WebservicesInvoicesTest.php
|
2018-09-02 14:15:17 +02:00 |
|