lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,014 Commits 43 Branches 150 Tags 886 MiB
d357031719
Commit Graph

69014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
dc5d1432b1 Fix code not reachable 2018-09-04 01:23:46 +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
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
Laurent Destailleur
6952f346ad Prepare 8.0.1 2018-09-02 17:47:21 +02: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