Frédéric FRANCE
|
ecc6c118a6
|
move phpcs:ignore
|
2018-09-04 23:26:37 +02:00 |
|
Frédéric FRANCE
|
7799774ca1
|
move phpcs:ignore
|
2018-09-04 22:52:55 +02:00 |
|
Frédéric FRANCE
|
3847df1de6
|
move phpcs:ignore
|
2018-09-04 21:53:53 +02:00 |
|
Frédéric FRANCE
|
c6cef85ccd
|
move phpcs:ignore
|
2018-09-04 21:16:17 +02:00 |
|
Frédéric FRANCE
|
48d8a444e0
|
correct merge
|
2018-09-04 20:58:05 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Frédéric FRANCE
|
fd6281b364
|
move phpcs:ignore
|
2018-09-04 20:00:09 +02:00 |
|
Laurent Destailleur
|
b3e6d4a943
|
Merge pull request #9399 from grandoc/new_branch_03_09_2018
New branch 03 09 2018
|
2018-09-04 15:59:00 +02:00 |
|
Frédéric FRANCE
|
bdcac95761
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 15:15:23 +02:00 |
|
Philippe GRAND
|
fada93574d
|
Merge branch 'new_branch_03_09_2018' of github.com:grandoc/dolibarr into new_branch_03_09_2018
|
2018-09-04 14:51:44 +02:00 |
|
Philippe GRAND
|
707f8b7312
|
fix merge
|
2018-09-04 14:49:56 +02:00 |
|
Philippe GRAND
|
d357031719
|
fix merge
|
2018-09-04 14:46:10 +02:00 |
|
Philippe GRAND
|
47b6374abc
|
Standardize and update code
|
2018-09-04 13:45:20 +02:00 |
|
Philippe GRAND
|
42565e722e
|
Standardize and update code
|
2018-09-04 13:37:00 +02:00 |
|
Philippe GRAND
|
0492492df1
|
fix merge
|
2018-09-04 12:30:06 +02:00 |
|
Laurent Destailleur
|
23f4e7cc36
|
FIX #9251
|
2018-09-04 11:49:11 +02:00 |
|
Laurent Destailleur
|
c7fdd8686b
|
NEW Add civility in list of members. Close #9251
|
2018-09-04 11:41:28 +02:00 |
|
Laurent Destailleur
|
69cf7026eb
|
NEW Close #9296 Add field ref_ext into llx_categorie
|
2018-09-04 11:29:52 +02:00 |
|
Laurent Destailleur
|
3ef808cb9b
|
Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken
|
2018-09-04 11:23:28 +02:00 |
|
Frédéric FRANCE
|
1ae1afe843
|
move phpcs:ignore
|
2018-09-04 08:09:48 +02:00 |
|
Laurent Destailleur
|
dc5d1432b1
|
Fix code not reachable
|
2018-09-04 01:23:46 +02:00 |
|
Frédéric FRANCE
|
d08b68e8ed
|
move phpcs:ignore
|
2018-09-03 20:38:52 +02:00 |
|
Frédéric FRANCE
|
7288335c6d
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-03 19:01:11 +02:00 |
|
Frédéric FRANCE
|
5f4a922c1d
|
move phpcs:ignore
|
2018-09-03 19:00:37 +02:00 |
|
Laurent Destailleur
|
540999faa5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
|
2018-09-03 14:06:51 +02:00 |
|
Laurent Destailleur
|
47655f0725
|
Add comment as FIXME
|
2018-09-03 14:00:12 +02:00 |
|
Laurent Destailleur
|
d050c0654b
|
FIX Add "-- ADD xxx to rowd" to avoid rowid conflict on account chart
|
2018-09-03 13:14:25 +02:00 |
|
Laurent Destailleur
|
c5c0491ea7
|
Fix restaure behavior account_parent point ro rowid
|
2018-09-03 12:59:20 +02:00 |
|
Laurent Destailleur
|
bf6463b152
|
Revert old behaviour
|
2018-09-03 12:54:20 +02:00 |
|
Laurent Destailleur
|
c423aebdad
|
Revert "FIX "account_parent" is linked with "account_number" instead rowid"
This reverts commit b1a340b193.
|
2018-09-03 12:51:20 +02:00 |
|
Laurent Destailleur
|
e9f3c131ec
|
Add the line -- ADD xxx to rowid
|
2018-09-03 12:42:26 +02:00 |
|
Laurent Destailleur
|
3593b5ac51
|
Revert "Revert " New:Algerian Chart of accounts""
This reverts commit 1d644a33a3.
|
2018-09-03 12:39:01 +02:00 |
|
Laurent Destailleur
|
6641a05744
|
Fix missing class
|
2018-09-03 11:59:19 +02:00 |
|
Laurent Destailleur
|
1249e597d4
|
Fix test param $id
|
2018-09-03 11:56:05 +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 |
|
Philippe GRAND
|
4fba7cdf45
|
fix : Class Contact not found in htdocs/core/lib/company.lib.php on line 1496
|
2018-09-03 09:45:06 +02:00 |
|
Regis Houssin
|
2b7e15edbd
|
FIX remove old triggers
|
2018-09-03 09:35:14 +02:00 |
|
Philippe GRAND
|
7a0c19485e
|
fix merge
|
2018-09-03 09:34:08 +02:00 |
|
Regis Houssin
|
912c05774b
|
FIX remove deprecated triggers USER_LOG*
|
2018-09-03 09:30:36 +02:00 |
|
Frédéric FRANCE
|
e4946cc8eb
|
move phpcs:ignore
|
2018-09-03 00:03:17 +02:00 |
|
Frédéric FRANCE
|
9c3352d2de
|
move phpcs:ignore
|
2018-09-02 23:44:53 +02:00 |
|
Frédéric FRANCE
|
489074af5c
|
move phpcs:ignore
|
2018-09-02 23:25:10 +02:00 |
|
Frédéric FRANCE
|
47e73bfd8e
|
move phpcs:ignore
|
2018-09-02 23:01:14 +02:00 |
|
Frédéric FRANCE
|
2a9ef8dc05
|
move phpcs:ignore
|
2018-09-02 22:05:19 +02:00 |
|