Commit Graph

69041 Commits

Author SHA1 Message Date
Laurent Destailleur
cb89942bfb Add option capture on input file for photo 2018-09-05 16:03:10 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Laurent Destailleur
aec0d4022b Fix responsive 2018-09-04 19:59:20 +02:00
Laurent Destailleur
154e44e761 Fix responsive 2018-09-04 19:57:20 +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
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
203c925c5b Fix look and feel v8 2018-09-04 12:03:21 +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
8c2eac4c93 FIX #9317 2018-09-04 11:34:23 +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
9042d341f0 FIX #9316 Error when listing invoices 2018-09-04 11:19:31 +02:00
Laurent Destailleur
e7d2bcc34c FIX #9316 Error when listing invoices 2018-09-04 11:17:08 +02:00
Laurent Destailleur
f2ec94e9fd FIX #9353 Bug: html error - div inside span on graphs 2018-09-04 11:13:54 +02:00
Laurent Destailleur
76703972ed FIX #9355 2018-09-04 10:53:42 +02:00
Laurent Destailleur
37afd79ec0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-04 10:38:19 +02:00
Laurent Destailleur
9697bdf3b0 FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES 2018-09-04 10:38:09 +02:00
Laurent Destailleur
38c8d9d008 FIX inconsistency behaviour on option FACTURE_ENABLE_NEGATIVE_LINES 2018-09-04 10:37:29 +02:00
Laurent Destailleur
15b3fa73f4 FIX #9394 2018-09-04 10:16:16 +02:00
Laurent Destailleur
6b3ccddb65 FIX #9396 2018-09-04 10:14:45 +02:00
Laurent Destailleur
c59b0f95e6 FIX #9403 2018-09-04 10:10:47 +02:00
Laurent Destailleur
4a7bec2c04 Fix fax not required as visible by default on list 2018-09-04 09:48:30 +02:00
Laurent Destailleur
739c2822af Fix look and feel v8 2018-09-04 09:42:28 +02:00
Laurent Destailleur
cdc1e1fc76 Fix responsive 2018-09-04 09:37:51 +02:00
Laurent Destailleur
dc5d1432b1 Fix code not reachable 2018-09-04 01:23:46 +02:00
Laurent Destailleur
db6f80e2ff FIX invoice popup hide localtax2 and 3 if not defined 2018-09-04 00:42:15 +02:00
Laurent Destailleur
94c05fbd84 Look and feel v8 2018-09-04 00:29:31 +02:00
Laurent Destailleur
6ce37e588d Prepare 8.0.2 2018-09-04 00:22:14 +02:00
Laurent Destailleur
392f31abbd FIX invert mime type and name 2018-09-04 00:21:48 +02:00
Laurent Destailleur
3d50c454c1 Code comment 2018-09-03 17:05:44 +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