Philippe GRAND
d5a3411fbc
Standardize and update code
2018-09-20 11:28:54 +02:00
Philippe GRAND
08325d40ce
Standardize and update code
2018-09-20 11:18:02 +02:00
John BOTELLA
83d3e5ec39
NEW : can add project's task to agenda on create event card
2018-09-20 10:17:43 +02:00
Philippe GRAND
0222ea7e8c
Standardize and update code
2018-09-20 09:19:17 +02:00
Philippe GRAND
1adc4bad9e
Standardize and update code
2018-09-20 09:17:25 +02:00
Philippe GRAND
46d7385c54
Standardize and update code
2018-09-20 09:13:49 +02:00
Philippe GRAND
9b3dba4a56
Standardize and update code
2018-09-20 09:04:30 +02:00
Philippe GRAND
06ad6e7196
Standardize and update code
2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8
Standardize and update code
2018-09-20 09:03:52 +02:00
Philippe GRAND
ad84340bf5
Standardize and update code
2018-09-20 09:03:26 +02:00
Philippe GRAND
08b9c0c926
Missing translation
2018-09-20 09:02:54 +02:00
Laurent Destailleur
d4ffc5e088
css
2018-09-20 00:48:00 +02:00
Laurent Destailleur
4ca5bd696d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-19 20:28:27 +02:00
ptibogxiv
1a841b48ae
Update transaction.php
2018-09-19 20:15:12 +02:00
Laurent Destailleur
a546ef7f2d
FIX default day
2018-09-19 20:01:25 +02:00
ptibogxiv
203a2291ba
Update transaction.php
2018-09-19 19:05:46 +02:00
ptibogxiv
7e0bad97eb
Update transaction.php
2018-09-19 18:59:32 +02:00
Frédéric FRANCE
237f888356
Update api_thirdparties.class.php
2018-09-19 18:47:59 +02:00
Frédéric FRANCE
9ee88e9d35
remove superfluous spaces
2018-09-19 18:33:11 +02:00
Laurent Destailleur
19ec5103ad
css
2018-09-19 18:06:36 +02:00
Laurent Destailleur
55e3d97842
Trans
2018-09-19 17:56:51 +02:00
Laurent Destailleur
22053e0f4d
CSS
2018-09-19 17:53:24 +02:00
Laurent Destailleur
09a41fd757
Look and feel v8
2018-09-19 17:33:50 +02:00
Laurent Destailleur
92aa6929de
Fix go back on agenda view on correct page
2018-09-19 17:03:13 +02:00
Philippe GRAND
52533a0210
Standardize and update code
2018-09-19 16:43:37 +02:00
Philippe GRAND
7f59328eb7
Merge remote-tracking branch 'upstream/develop' into new_branch_19_09_2018
2018-09-19 16:43:01 +02:00
Laurent Destailleur
12b449fe49
It's easier to select fields to show on list
2018-09-19 16:41:33 +02:00
Philippe GRAND
bd3ba04e24
Standardize and update code
2018-09-19 16:36:08 +02:00
Philippe GRAND
57fc8cf06f
Standardize and update code
2018-09-19 16:31:36 +02:00
Philippe GRAND
30e426e487
Standardize and update code
2018-09-19 16:21:52 +02:00
Philippe GRAND
c9b8da8acb
Missing translation
2018-09-19 16:06:39 +02:00
Laurent Destailleur
ee788b543e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-19 15:06:42 +02:00
Laurent Destailleur
1d47569651
Brighter gradient
2018-09-19 15:06:14 +02:00
Laurent Destailleur
824b572bd0
FIX Amount when using mutlicurrency on PDF
...
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2018-09-19 15:03:24 +02:00
Laurent Destailleur
9b190d2cbc
Merge pull request #9201 from atm-quentin/FIX_select_element
...
FIX exclude element of the select
2018-09-19 14:55:31 +02:00
gauthier
d62118dca8
FIX : langs fr
2018-09-19 14:53:56 +02:00
Laurent Destailleur
dc7c27b162
Release 8.0.2
2018-09-19 14:53:39 +02:00
Laurent Destailleur
02617bd799
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-09-19 14:53:07 +02:00
Laurent Destailleur
2b67da3f34
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-09-19 14:52:43 +02:00
Laurent Destailleur
cde023148a
Merge pull request #9121 from yolocodefrench/develop
...
Generation of the mandate file from the api
2018-09-19 14:47:25 +02:00
Laurent Destailleur
f240cd130d
Update api_thirdparties.class.php
2018-09-19 14:47:11 +02:00
Laurent Destailleur
019ba74225
Update api_thirdparties.class.php
2018-09-19 14:44:16 +02:00
Laurent Destailleur
9d0594c0b4
Merge pull request #9559 from frederic34/ccharges
...
correct trimParameters
2018-09-19 14:29:10 +02:00
Laurent Destailleur
2643b6e1dd
Merge pull request #9558 from grandoc/new_branch_18_09_2018
...
Standardize and update code
2018-09-19 14:26:28 +02:00
Laurent Destailleur
7ca6b2603c
Trans
2018-09-19 12:25:07 +02:00
Frédéric FRANCE
1d43c6bc3a
call to deprecated add_object_linked was present two times
2018-09-19 10:57:59 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf
2018-09-19 09:26:56 +02:00
Laurent Destailleur
d35687c8b3
Work on module social network
2018-09-19 01:45:56 +02:00
Laurent Destailleur
2ec02afa8b
Fix nb of module
2018-09-19 01:14:55 +02:00
Laurent Destailleur
85180b117c
Fix warnings
2018-09-18 23:48:02 +02:00
Laurent Destailleur
c56b02c1c4
Fix warning
2018-09-18 23:47:55 +02:00
Laurent Destailleur
86bc1c813c
Fix warnings
2018-09-18 23:45:22 +02:00
Laurent Destailleur
7dba51c9a8
Fix warning
2018-09-18 23:39:49 +02:00
Laurent Destailleur
79b248fc67
FIX warning picto when next run date passed
2018-09-18 23:27:26 +02:00
Laurent Destailleur
8a43fe22cc
FIX warning picto when next run date passed
2018-09-18 23:25:38 +02:00
Frédéric FRANCE
126e5ae3ad
remove not needed require
2018-09-18 20:05:48 +02:00
Frédéric FRANCE
032f9729a5
correct trimParameters
2018-09-18 19:05:00 +02:00
Laurent Destailleur
014da6c22c
Fix translation
2018-09-18 18:11:07 +02:00
Philippe GRAND
83871468ba
Standardize and update code
2018-09-18 17:37:08 +02:00
Philippe GRAND
4536993fdc
Standardize and update code
2018-09-18 17:34:01 +02:00
Philippe GRAND
c3db591d7b
Standardize and update code
2018-09-18 17:31:01 +02:00
Philippe GRAND
73d161833a
Standardize and update code
2018-09-18 17:26:20 +02:00
Philippe GRAND
d021a3d5af
Standardize and update code
2018-09-18 17:24:10 +02:00
Philippe GRAND
30601accc3
Standardize and update code
2018-09-18 17:15:06 +02:00
Philippe GRAND
f28f3d12c2
Standardize and update code
2018-09-18 17:10:47 +02:00
Philippe GRAND
ac3efe1d5b
Standardize and update code
2018-09-18 17:06:25 +02:00
Philippe GRAND
ad6ecc6231
Standardize and update code
2018-09-18 16:49:20 +02:00
Philippe GRAND
71d8356f6a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_18_09_2018
2018-09-18 16:48:32 +02:00
Philippe GRAND
b4692f0812
fix merge
2018-09-18 16:45:06 +02:00
Laurent Destailleur
99d214abd5
Fix family of module Payment of employee salaries
2018-09-18 16:38:51 +02:00
Philippe GRAND
c3bbe70e2d
fix merge
2018-09-18 16:38:14 +02:00
Laurent Destailleur
e2e3354807
Clean code
2018-09-18 16:35:38 +02:00
John BOTELLA
3fb2d4c159
remove change on text
2018-09-18 15:52:57 +02:00
Laurent Destailleur
4580ed0b09
Fix bad link
2018-09-18 15:31:25 +02:00
Laurent Destailleur
24279b71ef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-18 15:29:01 +02:00
Laurent Destailleur
34c130e715
Merge pull request #9551 from frederic34/patch-27
...
clean html donateur_code.php
2018-09-18 15:19:27 +02:00
Laurent Destailleur
2918d4dc9f
Merge pull request #9541 from frederic34/patch-23
...
reduce complexity of cronjob class
2018-09-18 15:18:28 +02:00
Laurent Destailleur
b67392b016
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-18 15:18:16 +02:00
Laurent Destailleur
52b6dd16da
Standardize code
2018-09-18 15:18:07 +02:00
Laurent Destailleur
eba0ce2f4f
Merge pull request #9540 from frederic34/patch-22
...
reduce complexity of contact class
2018-09-18 15:13:29 +02:00
Laurent Destailleur
b1d223069d
Merge pull request #9539 from frederic34/patch-21
...
reduce complexity of establishment class
2018-09-18 15:12:58 +02:00
Laurent Destailleur
03928a914d
Merge pull request #9537 from frederic34/patch-20
...
reduce complexity of actioncomm reminder class
2018-09-18 15:08:46 +02:00
Laurent Destailleur
2e7f853a8e
Merge pull request #9536 from frederic34/patch-19
...
reduce complexity of actioncomm class
2018-09-18 15:08:35 +02:00
Laurent Destailleur
6b8baab7b4
Merge pull request #9535 from frederic34/patch-18
...
reduce complexity of contrat class
2018-09-18 15:04:48 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters
...
trimParameters function
2018-09-18 15:04:32 +02:00
Laurent Destailleur
1c13fbb122
Merge pull request #9532 from frederic34/patch-17
...
reduce complexity of commoninvoice class
2018-09-18 15:03:25 +02:00
Laurent Destailleur
25d5200073
Merge pull request #9531 from frederic34/patch-16
...
reduce complexity of ProductStockEntrepot class
2018-09-18 15:03:04 +02:00
Laurent Destailleur
e65ec9f4ef
Merge pull request #9530 from frederic34/patch-15
...
reduce complexity of cchargesociales class
2018-09-18 15:02:44 +02:00
Laurent Destailleur
8c8c4bad21
Merge pull request #9529 from frederic34/patch-14
...
reduce complexity of user class
2018-09-18 15:02:24 +02:00
Laurent Destailleur
d72446cebc
Merge pull request #9528 from grandoc/new_branch_16_09_2018
...
New branch 16 09 2018
2018-09-18 15:01:23 +02:00
Laurent Destailleur
1a31071a5e
Merge pull request #9527 from frederic34/patch-11
...
clean datepicker
2018-09-18 15:00:52 +02:00
Laurent Destailleur
e6791e1763
Merge pull request #9526 from frederic34/patch-10
...
completely comment unused code
2018-09-18 14:59:55 +02:00
Laurent Destailleur
28f26f728a
Merge pull request #9553 from AXeL-dev/patch-1
...
Fix $heightforframes value to fit menu height on dolibarr 8
2018-09-18 14:59:34 +02:00
Laurent Destailleur
8c67e338eb
Merge pull request #9546 from frederic34/patch-26
...
clean stripe payment
2018-09-18 14:58:55 +02:00
Laurent Destailleur
dcc1c855fb
Merge pull request #9542 from frederic34/patch-24
...
reduce complexity of company lib
2018-09-18 14:58:17 +02:00
Laurent Destailleur
fa61ebeb9d
Merge pull request #9547 from grandoc/new_branch_17_09_2018
...
Standardize and update code
2018-09-18 14:57:50 +02:00
Laurent Destailleur
609c0c8b90
Merge pull request #9544 from ptibogxiv/patch-63
...
fix html
2018-09-18 14:57:26 +02:00
Laurent Destailleur
867850eadb
Merge pull request #9525 from frederic34/patch-9
...
reduce complexity societe class
2018-09-18 14:56:51 +02:00
Laurent Destailleur
1a1219ee2a
Trans
2018-09-18 14:52:50 +02:00
Laurent Destailleur
a8ecec68e7
css
2018-09-18 11:58:26 +02:00
Laurent Destailleur
85bed00474
Fix default fields
2018-09-18 11:50:04 +02:00
Laurent Destailleur
e07ce644e8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Philippe GRAND
ad061f4e13
Standardize and update code
2018-09-18 11:14:21 +02:00
Philippe GRAND
c08f443f0a
Standardize and update code
2018-09-18 11:09:56 +02:00
Philippe GRAND
72f906683f
Standardize and update code
2018-09-18 11:02:18 +02:00
Laurent Destailleur
2d8eb034e3
FIX Maxi debug to allow to load chart of account with multicompany
2018-09-17 21:02:07 +02:00
AXeL-dev
361f1c3d9a
fix $heightforframes value to fit menu height on dolibarr 8
2018-09-17 16:39:58 +01:00
Philippe GRAND
d1a27b33fb
Standardize and update code
2018-09-17 17:28:05 +02:00
Laurent Destailleur
1e36aba35f
Trans
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-09-17 16:42:44 +02:00
Laurent Destailleur
2f06e58237
css
2018-09-17 16:31:58 +02:00
Philippe GRAND
b06516180b
Standardize and update code
2018-09-17 15:06:41 +02:00
Philippe GRAND
cc5a8eb7d9
Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018
2018-09-17 15:03:27 +02:00
Laurent Destailleur
98f26bfcfb
NEW Can set 2 url in url field of thirdparty
2018-09-17 14:31:30 +02:00
Laurent Destailleur
3fc3cc4688
Fix missing email in popup
2018-09-17 14:17:10 +02:00
Laurent Destailleur
d717e28338
Trans
2018-09-17 14:15:30 +02:00
Frédéric FRANCE
20e245108f
clean html donateur_code.php
2018-09-17 13:12:04 +02:00
Laurent Destailleur
d872beb499
Fix css
2018-09-17 12:59:43 +02:00
Philippe GRAND
cd796bf682
Standardize and update code
2018-09-17 12:29:21 +02:00
Philippe GRAND
2a0ed0f14c
Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018
2018-09-17 12:27:36 +02:00
Laurent Destailleur
a75629e8e9
CSS
2018-09-17 12:25:49 +02:00
Laurent Destailleur
f3ce7cb5a5
Quick hack to provide help to fix pb of undesirable files
2018-09-17 10:40:42 +02:00
Philippe GRAND
484b36c5aa
Standardize and update code
2018-09-17 09:31:32 +02:00
Philippe GRAND
01ea6aee6c
Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018
2018-09-17 09:25:42 +02:00
Laurent Destailleur
0bf540b3c1
Fix regression in edition of date
2018-09-17 09:17:11 +02:00
Philippe GRAND
a1b15f170e
Standardize and update code
2018-09-17 09:00:23 +02:00
Laurent Destailleur
797de131a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb
Fix sql
2018-09-17 02:23:11 +02:00
ptibogxiv
0770d8e56e
Update transaction.php
2018-09-16 23:14:22 +02:00
ptibogxiv
3c5a9326e1
Update transaction.php
2018-09-16 23:13:24 +02:00
Frédéric FRANCE
9cf6c6aeb4
clean stripe payment
2018-09-16 23:02:37 +02:00
ptibogxiv
38b23d2be4
Update charge.php
2018-09-16 22:55:50 +02:00
ptibogxiv
35f2f5f48c
Update transaction.php
2018-09-16 22:41:17 +02:00
ptibogxiv
7f4378870c
Fix link display
2018-09-16 22:39:38 +02:00
ptibogxiv
8c32ffd2e2
fix html
2018-09-16 22:36:58 +02:00
Laurent Destailleur
7fb2b1a769
Fix reset extrafields that must be unique when cloning
2018-09-16 22:30:13 +02:00
Laurent Destailleur
9415486059
Unique extrafields are reset when cloning contract
2018-09-16 22:13:29 +02:00
Frédéric FRANCE
aec1f779ff
reduce complexity of company lib
2018-09-16 21:40:28 +02:00
Frédéric FRANCE
0e0197f246
reduce complexity of cronjob class
2018-09-16 19:26:49 +02:00
Frédéric FRANCE
a4fd8c4b75
reduce complexity of contact class
2018-09-16 19:19:45 +02:00
Frédéric FRANCE
ad2d15bef1
reduce complexity of establishment class
2018-09-16 19:11:56 +02:00
Frédéric FRANCE
beb7a0609c
reduce complexity of actioncomm reminder class
2018-09-16 19:06:21 +02:00
Frédéric FRANCE
7b37c41cfb
reduce complexity of actioncomm class
2018-09-16 19:04:43 +02:00
Frédéric FRANCE
122275f2a7
reduce complexity of contrat class
2018-09-16 18:58:59 +02:00
wdammak
b17c44c665
Update html.form.class.php
...
Add the ability to sort products by category
2018-09-16 16:53:35 +01:00
Frédéric FRANCE
f935701d30
trimParameters
2018-09-16 15:35:19 +02:00
Frédéric FRANCE
b950043618
trimParameters
2018-09-16 15:16:08 +02:00
Laurent Destailleur
eeb919dcda
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 14:24:13 +02:00
Frédéric FRANCE
f9441d3249
Update commoninvoice.class.php
2018-09-16 14:07:11 +02:00
Frédéric FRANCE
6c8cbf710b
reduce complexity of ProductStockEntrepot class
2018-09-16 13:59:15 +02:00
Frédéric FRANCE
367e202df0
reduce complexity of cchargesociales class
2018-09-16 13:54:17 +02:00
Frédéric FRANCE
4120d0f92c
reduce complexity of user class
2018-09-16 13:49:22 +02:00
Laurent Destailleur
055a0b2859
Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0
2018-09-16 13:29:13 +02:00
Laurent Destailleur
79b15b81f2
Fix list of tasks on time consumed
2018-09-16 13:28:37 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-09-16 12:54:39 +02:00
Laurent Destailleur
d06785e91a
Fix responsive
2018-09-16 12:48:36 +02:00
Laurent Destailleur
74a9c680df
FIX "Other ..." link so the "Back to" link works.
2018-09-16 12:27:56 +02:00
Laurent Destailleur
4151ca49eb
Fix position of menu
2018-09-16 12:15:33 +02:00
Philippe GRAND
9f35767b4b
Standardize and update code
2018-09-16 11:53:49 +02:00
Philippe GRAND
251273e3c3
Standardize and update code
2018-09-16 11:50:29 +02:00
Philippe GRAND
cd8e0aa919
Standardize and update code
2018-09-16 11:47:56 +02:00
Philippe GRAND
120f823065
Standardize and update code
2018-09-16 11:45:18 +02:00
Philippe GRAND
988774120c
Standardize and update code
2018-09-16 11:42:20 +02:00
Philippe GRAND
ab92871dc3
Standardize and update code
2018-09-16 11:37:43 +02:00
Philippe GRAND
8efe98b993
Standardize and update code
2018-09-16 11:31:54 +02:00
Philippe GRAND
90644222d8
Standardize and update code
2018-09-16 11:30:06 +02:00
Frédéric FRANCE
2f633857af
clean datepicker
2018-09-16 11:26:39 +02:00
Laurent Destailleur
f7c2bd877a
Comment dead code
2018-09-16 10:39:30 +02:00
Laurent Destailleur
10c6bc44ca
Fix scrutinizer
2018-09-16 10:28:41 +02:00
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +02:00
Laurent Destailleur
e90a60d4ee
Remove warnings
2018-09-16 10:09:19 +02:00
Laurent Destailleur
d9ffba72f0
Fix use fetch_object instead of fetch_array
2018-09-16 10:03:47 +02:00
Laurent Destailleur
2527127859
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 09:50:30 +02:00
Laurent Destailleur
eebd329c7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modFacture.class.php
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/main.lang
htdocs/stripe/transaction.php
2018-09-16 09:50:13 +02:00
Laurent Destailleur
a0bcf999c5
FIX #9043
2018-09-16 09:45:33 +02:00
Laurent Destailleur
a6d4185d6b
FIX #9043
2018-09-16 09:44:52 +02:00
Laurent Destailleur
55e7989552
FIX #9043
2018-09-16 09:42:30 +02:00
Frédéric FRANCE
7b3b020533
completely comment unused code
2018-09-16 09:41:38 +02:00
Laurent Destailleur
2c8064967b
Code comment
2018-09-16 09:31:06 +02:00
Laurent Destailleur
272944983c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-16 09:27:54 +02:00
Laurent Destailleur
34b75828d3
Work on fix for #9043
2018-09-16 09:27:36 +02:00
Frédéric FRANCE
cb2d72d5c1
reduce complexity libstatut societe class
2018-09-16 09:22:49 +02:00
Laurent Destailleur
39419367b6
Merge pull request #9491 from frederic34/patch-11
...
reduce complexity of libstatut expedition.class.php
2018-09-16 08:56:02 +02:00
Laurent Destailleur
1aaf395831
Merge pull request #9524 from frederic34/patch-19
...
update code comment lettering class
2018-09-16 08:55:44 +02:00
Laurent Destailleur
de0355ac59
Merge pull request #9523 from frederic34/patch-18
...
reduce complexity libstatut adherent
2018-09-16 08:55:25 +02:00
Laurent Destailleur
2e7394efc0
Merge pull request #9522 from frederic34/patch-17
...
reduce complexity libstatut societe.account.class
2018-09-16 08:55:14 +02:00
Laurent Destailleur
62d4955db0
Merge pull request #9521 from frederic34/patch-16
...
reduce complexity of showWeather
2018-09-16 08:55:04 +02:00
Laurent Destailleur
48ff10e76f
Merge pull request #9520 from frederic34/patch-15
...
reduce complexity libstatut commande fournisseur class
2018-09-16 08:54:44 +02:00
Laurent Destailleur
bed8674714
Merge pull request #9519 from frederic34/patch-14
...
reduce complexity of libstatut inventory.class.php
2018-09-16 08:54:22 +02:00
Laurent Destailleur
949cd5f82f
Merge pull request #9518 from frederic34/patch-10
...
reduce complexity of libstatut product.class.php
2018-09-16 08:54:12 +02:00
Frédéric FRANCE
e8d2cb6135
update code comment lettering class
2018-09-16 08:39:43 +02:00
Frédéric FRANCE
4a57a75758
Merge branch 'develop' into patch-9
2018-09-16 08:09:18 +02:00
Frédéric FRANCE
8f5e5be01c
reduce complexity libstatut adherent
2018-09-16 08:06:17 +02:00
Frédéric FRANCE
e89ef9c3db
reduce complexity libstatut societe.account.class
2018-09-16 07:58:16 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018
...
New branch 15 09 2018
2018-09-15 23:59:10 +02:00
Laurent Destailleur
856b1e7f40
Fix phpcs
2018-09-15 23:58:02 +02:00
Frédéric FRANCE
c15ccb0498
reduce complexity of showWeather
2018-09-15 22:38:16 +02:00
Frédéric FRANCE
fafa7f18b1
reduce complexity libstatut fournisseur.commande;class.php
2018-09-15 22:24:57 +02:00
Frédéric FRANCE
d2bd16280e
reduce complexity of libstatut inventory.class.php
2018-09-15 22:20:47 +02:00
Frédéric FRANCE
5d87847b65
reduce complexity of libstatut product.class.php
2018-09-15 22:13:54 +02:00
Philippe Grand
1d82825afa
Update html.formsms.class.php
2018-09-15 21:34:55 +02:00
Frédéric FRANCE
c86e734299
remove superfluous space
2018-09-15 21:06:33 +02:00
Laurent Destailleur
edb3671cf3
Merge pull request #9502 from frederic34/contractHookFormConfirm
...
NEW add hook formconfirm to contractcard
2018-09-15 17:31:56 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018
...
Standardize and update code
2018-09-15 17:30:14 +02:00
Laurent Destailleur
75f3dd94c6
Merge pull request #9506 from frederic34/printing
...
printing remove no camelcaps function
2018-09-15 17:29:21 +02:00
Laurent Destailleur
e9159dda02
Merge pull request #9513 from ptibogxiv/patch-62
...
FIX link in connect mode
2018-09-15 17:28:35 +02:00
Laurent Destailleur
c587de4a3d
Merge branch 'develop' into stripetransac
2018-09-15 17:27:04 +02:00
Laurent Destailleur
4efab446d0
Merge pull request #9508 from frederic34/patch-15
...
reduce complexity of libstatut propal.class.php
2018-09-15 17:24:59 +02:00
Laurent Destailleur
ecfbe0a568
Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate
...
FIX #9497
2018-09-15 17:14:05 +02:00
Laurent Destailleur
1749c07ffe
Merge pull request #9496 from ptibogxiv/patch-61
...
Fix currency display in transaction.php
2018-09-15 17:07:27 +02:00
Laurent Destailleur
69a577f58d
Update transaction.php
2018-09-15 17:07:18 +02:00
Laurent Destailleur
ef2970a331
Merge pull request #9495 from ptibogxiv/patch-60
...
Fix currency display charge.php
2018-09-15 17:05:44 +02:00
Laurent Destailleur
2d0b4e5b5f
Merge pull request #9505 from frederic34/patch-14
...
Reduce complexity of libstatut asset.class.php
2018-09-15 17:02:16 +02:00
Laurent Destailleur
76cdbc8bf1
Merge branch 'develop' into testsqlAndScript
2018-09-15 17:01:23 +02:00
Laurent Destailleur
aacf5a0c86
Merge pull request #9490 from frederic34/patch-10
...
reduce complexity of libstatut loan.class.php
2018-09-15 17:00:04 +02:00
Laurent Destailleur
5eff159e27
Merge pull request #9489 from frederic34/patch-9
...
Completely comment unused code
2018-09-15 16:59:49 +02:00
Laurent Destailleur
5224f9ce56
Merge pull request #9488 from frederic34/patch-6
...
reduce complexity of libstatut don.class.php
2018-09-15 16:58:28 +02:00
Laurent Destailleur
f88dba91ab
Trans
2018-09-15 14:15:21 +02:00
Laurent Destailleur
bbfe4462dc
NEW Add lib for multiselect with checkboxes
...
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
Philippe GRAND
5c3a24a00c
Standardize and update code
2018-09-15 11:51:21 +02:00
Philippe GRAND
5910e1ddf8
Standardize and update code
2018-09-15 11:15:59 +02:00
Philippe GRAND
7deccb3215
Standardize and update code
2018-09-15 11:06:35 +02:00
Philippe GRAND
0654b7b0ef
Standardize and update code
2018-09-15 10:49:40 +02:00
Philippe GRAND
73c26a2d04
Standardize and update code
2018-09-15 10:47:50 +02:00
ptibogxiv
e0eb43909d
fix var
2018-09-14 17:57:47 +02:00
ptibogxiv
e9fb2387b0
link to stripe customer
2018-09-14 17:46:02 +02:00
ptibogxiv
362c9fd0b1
FIX link in connect mode
2018-09-14 15:38:38 +02:00
ptibogxiv
bf38f1a80f
fix url in connect mode
2018-09-14 15:27:43 +02:00
Philippe GRAND
fa1521d948
Standardize and update code
2018-09-14 15:09:23 +02:00
Philippe GRAND
ca9b1f155f
Standardize and update code
2018-09-14 14:05:19 +02:00
Philippe GRAND
6ec65ea580
Merge remote-tracking branch 'upstream/develop' into new_branch_14_09_2018
2018-09-14 13:54:46 +02:00
Laurent Destailleur
56b0a5f1ed
FIX Mixing tickets of different thirdparties
2018-09-14 13:07:27 +02:00
Philippe GRAND
33d9e24bd6
Standardize and update code
2018-09-14 11:58:49 +02:00
Laurent Destailleur
80fb1e0657
NEW Each user can set its prefered default calendar
2018-09-14 11:23:15 +02:00
ptibogxiv
5dcbfe0e56
fix $servicestatus
2018-09-14 11:18:37 +02:00
Philippe GRAND
18f4755a90
Standardize and update code
2018-09-14 10:20:21 +02:00
John BOTELLA
d1321e5a7b
change new PDF version
2018-09-14 09:54:39 +02:00
John BOTELLA
ec23cd0da4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files
2018-09-14 09:54:14 +02:00
John BOTELLA
477acb2e4c
change new PDF version
2018-09-14 09:48:15 +02:00
Philippe Grand
51ba970eaf
Update html.formsms.class.php
2018-09-14 09:33:16 +02:00
Laurent Destailleur
16ed582124
Add comment
2018-09-14 01:45:03 +02:00
Laurent Destailleur
961505d510
NEW Add filter on staff range in list of thirdparties
2018-09-14 01:29:03 +02:00
Frédéric FRANCE
bcc9a3d259
reduce complexity of libstatut propal.class.php
2018-09-13 21:45:46 +02:00
Frédéric FRANCE
effde65e4e
Update asset.class.php
2018-09-13 20:42:06 +02:00
Laurent Destailleur
78e983a1f5
CSS v9
2018-09-13 16:39:50 +02:00
gauthier
7838b75ec9
FIX : wrong var name
2018-09-13 16:11:42 +02:00
Philippe GRAND
3da762a59d
Standardize and update code
2018-09-13 15:06:06 +02:00
gauthier
b68523b9c1
FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product
2018-09-13 14:37:12 +02:00
Frédéric FRANCE
6744733730
add hook formconfirm to contractcard
2018-09-13 14:22:45 +02:00
Frédéric FRANCE
79cb1f5699
clean code
2018-09-13 13:57:01 +02:00
tarrsalah
08453a5337
FIX #9497
...
Extract $defaultcode and $defaulttxt from the value returned by
get_default_tva function .
2018-09-13 11:04:11 +01:00
ptibogxiv
c36ee72de0
Update transaction.php
2018-09-13 11:32:52 +02:00
ptibogxiv
fad2502525
Update transaction.php
2018-09-13 11:31:39 +02:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function
2018-09-13 11:13:32 +02:00
ptibogxiv
2ed0a72db5
Fix currency display in transaction.php
2018-09-13 11:10:58 +02:00
ptibogxiv
c620c64391
Fix currency display charge.php
2018-09-13 11:06:18 +02:00
Philippe GRAND
be3468241f
Standardize and update code
2018-09-13 10:55:05 +02:00
Philippe GRAND
ffad80eef6
Standardize and update code
2018-09-13 09:45:07 +02:00
Frédéric FRANCE
2c3e9e92b4
Update expedition.class.php
2018-09-12 22:59:15 +02:00
Frédéric FRANCE
05fc484d42
Update loan.class.php
2018-09-12 22:53:09 +02:00
Frédéric FRANCE
a128ea821e
Completely comment unused code
2018-09-12 22:49:32 +02:00
Frédéric FRANCE
c38239b6f9
Update don.class.php
2018-09-12 22:43:14 +02:00
Laurent Destailleur
ca85356b45
Merge pull request #9427 from frederic34/patch-6
...
deprecate Form::select_date
2018-09-12 22:07:23 +02:00
Laurent Destailleur
0b02673ba5
Merge pull request #9487 from frederic34/patch-5
...
Update categorie.class.php
2018-09-12 22:03:18 +02:00
Laurent Destailleur
b5b4410e75
Duplicate delete
2018-09-12 22:02:50 +02:00
Laurent Destailleur
b4264ee0a0
Use font awesome for sort image
2018-09-12 21:57:32 +02:00
Laurent Destailleur
765d8ec1fe
Better description
2018-09-12 21:33:48 +02:00
Laurent Destailleur
f46a137e25
Better description
2018-09-12 21:32:58 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Laurent Destailleur
c5e30b61c0
Fix translation
2018-09-12 21:25:14 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2
...
start changing phpcs:ignore
2018-09-12 21:14:34 +02:00
Laurent Destailleur
b1d9846969
Merge pull request #9486 from grandoc/new_branch_12_09_2018
...
New branch 12 09 2018
2018-09-12 21:13:32 +02:00
Laurent Destailleur
b978c4114c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 21:12:27 +02:00
Laurent Destailleur
b3dec042b5
Fix translation
2018-09-12 21:12:15 +02:00
Frédéric FRANCE
04d3c7f43b
Update categorie.class.php
2018-09-12 21:07:54 +02:00
Laurent Destailleur
3dca02d25b
Fix translation
2018-09-12 21:07:34 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop
...
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Laurent Destailleur
056ef802e4
Fix syntax error
2018-09-12 19:49:57 +02:00
ptibogxiv
ef4659c518
add capture option in payment function
...
Conflicts:
htdocs/stripe/class/stripe.class.php
2018-09-12 19:47:04 +02:00
Laurent Destailleur
b7eeaa952c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-12 19:41:02 +02:00
Laurent Destailleur
72f359fdc7
Revert "add capture option in payment function"
...
This reverts commit 849b7154a7
2018-09-12 19:40:43 +02:00
Philippe GRAND
06cde1c35f
Standardize and update code
2018-09-12 19:32:30 +02:00
Philippe GRAND
04017367f9
Standardize and update code
2018-09-12 19:24:45 +02:00
Laurent Destailleur
82580cadf6
Merge pull request #9458 from frederic34/patch-17
...
Update account.class.php
2018-09-12 19:07:19 +02:00
Laurent Destailleur
163bc55e4a
Merge pull request #9468 from jmarsac/numericextrafields9464
...
Convert localized numeric extrafields value before inserting/updating
2018-09-12 19:06:43 +02:00
Laurent Destailleur
7d726f9734
Merge pull request #9457 from frederic34/selectbarcodetype
...
Selectbarcodetype
2018-09-12 19:02:41 +02:00
ias-ceo
fece67b629
use correct resultset
2018-09-12 19:00:19 +02:00
Laurent Destailleur
cb174c3d1a
Merge pull request #9455 from IAS-SYSTEMS-CSC/develop
...
Fix : use correct resultset
2018-09-12 18:59:45 +02:00
Laurent Destailleur
ed2d215e19
Merge pull request #9467 from ptibogxiv/patch-59
...
update status display in charge list
2018-09-12 18:56:03 +02:00
Laurent Destailleur
71e4378bd2
Update charge.php
...
Charges can be done on different stripe account, even if doli thirdparty is same (if thirdparty has changed it stripe account). So keeping it in list seems usefull.
2018-09-12 18:51:03 +02:00
Laurent Destailleur
9efa3816c3
Update charge.php
2018-09-12 18:47:00 +02:00
Laurent Destailleur
23096354e0
Merge pull request #9463 from ptibogxiv/patch-57
...
add capture option in payment function
2018-09-12 18:38:10 +02:00
Laurent Destailleur
88192d1bae
Merge pull request #9456 from frederic34/stripeuser
...
add stripe user for actions
2018-09-12 18:37:31 +02:00
Laurent Destailleur
fb71edd35a
Update ipn.php
2018-09-12 18:37:24 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Laurent Destailleur
e89ff94d74
Update stripe.lang
2018-09-12 18:35:47 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
358bc7ab1b
Merge pull request #9454 from frederic34/patch-16
...
Update dolreceiptprinter.class.php
2018-09-12 18:28:10 +02:00
Laurent Destailleur
58ba1c3496
Merge pull request #9451 from hregis/7.0_price
...
FIX better compatibility with multicompany
2018-09-12 18:27:50 +02:00
Laurent Destailleur
e3a00c5dcd
Merge pull request #9450 from frederic34/patch-15
...
Update accountancycategory.class.php
2018-09-12 18:25:54 +02:00
Laurent Destailleur
ad54159c85
Merge pull request #9485 from frederic34/patch-9
...
remove superfluous space
2018-09-12 18:25:17 +02:00
Laurent Destailleur
e0613e04db
Merge pull request #9446 from frederic34/patch-14
...
Update myobject.class.php
2018-09-12 18:24:55 +02:00
Laurent Destailleur
de8496773d
Merge pull request #9441 from grandoc/new_branch_09_09_2018
...
New branch 09 09 2018
2018-09-12 18:24:34 +02:00
Laurent Destailleur
6291f18179
Merge pull request #9440 from frederic34/patch-5
...
Upper Lower Casing
2018-09-12 18:24:02 +02:00
Frédéric FRANCE
6c17edd1d1
remove superfluous space
2018-09-12 18:23:58 +02:00
Laurent Destailleur
3bf296c9cf
Merge pull request #9448 from frederic34/loadfichetitre
...
remove deprecated
2018-09-12 18:23:24 +02:00
Laurent Destailleur
64d99dd302
Merge pull request #9459 from frederic34/patch-18
...
Completely comment unused code
2018-09-12 18:21:51 +02:00
ptibogxiv
79dd5e84d2
V8 style
2018-09-12 18:21:06 +02:00
Laurent Destailleur
88e76b6127
Revert "V8 style"
2018-09-12 18:19:12 +02:00
Laurent Destailleur
71e8d4c728
Merge pull request #9453 from ptibogxiv/patch-56
...
V8 style
2018-09-12 18:18:45 +02:00
Laurent Destailleur
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018
...
New branch 11 09 2018
2018-09-12 18:15:03 +02:00
Laurent Destailleur
1ad8a3e190
Merge pull request #9466 from ptibogxiv/patch-58
...
Fix status display in transaction.php
2018-09-12 18:14:46 +02:00
Laurent Destailleur
b5d866f4d5
Merge pull request #9444 from frederic34/patch-11
...
Completely comment unused code
2018-09-12 18:14:22 +02:00
Laurent Destailleur
f5074f4962
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 18:12:17 +02:00
Laurent Destailleur
b341cb9245
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/tpl/objectline_view.tpl.php
2018-09-12 18:11:51 +02:00
Laurent Destailleur
a3968b86df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-09-12 18:05:47 +02:00
Laurent Destailleur
3662ebe3a3
Fix syntax error
2018-09-12 18:05:20 +02:00
Laurent Destailleur
a3881bfbce
NEW hidden constant to be able to use a thirdparty for donation
2018-09-12 18:04:33 +02:00
Laurent Destailleur
2974ea72c4
Fix sql error
2018-09-12 17:45:38 +02:00
Laurent Destailleur
10becd2046
Merge pull request #9483 from ptibogxiv/patch-54
...
New donation module
2018-09-12 17:34:21 +02:00
Laurent Destailleur
eb242d58f2
Merge pull request #9469 from atm-ph/fix_7.0_classname_colht
...
Fix classname liencolht to linecolht
2018-09-12 17:30:36 +02:00
Laurent Destailleur
da37302dc2
Merge pull request #9437 from grandoc/new_branch_08_09_2018
...
New branch 08 09 2018
2018-09-12 17:29:33 +02:00
Laurent Destailleur
bdcbc71ce9
Merge pull request #9443 from frederic34/patch-10
...
Completely comment unused code
2018-09-12 17:28:29 +02:00
Laurent Destailleur
f61afbab71
Merge pull request #9442 from frederic34/patch-9
...
completely comment unused code
2018-09-12 17:27:48 +02:00
ptibogxiv
50e40669bf
use thirdparty
2018-09-12 17:24:11 +02:00
Laurent Destailleur
77d7c97750
Fix typo
2018-09-12 17:18:27 +02:00
Laurent Destailleur
fd93a22dca
Fix missing field
2018-09-12 16:45:12 +02:00
Laurent Destailleur
48ae4de47b
FIX Add paypal error message in alert email
2018-09-12 16:11:10 +02:00
Laurent Destailleur
9cbba2dc7d
Add log
2018-09-12 15:28:59 +02:00
Laurent Destailleur
50478b1bd4
FIX capital must be empty and not 0 if undefined
2018-09-12 15:21:11 +02:00
Philippe GRAND
b8df44167a
Standardize and update code
2018-09-12 15:09:12 +02:00
Laurent Destailleur
729d03862f
Fix warning
2018-09-12 15:02:59 +02:00
Philippe GRAND
69bf43f851
Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018
2018-09-12 14:48:50 +02:00
Laurent Destailleur
5bd2c01411
Fix email missing in tooltip
2018-09-12 14:43:05 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Laurent Destailleur
72895bebbf
Add field twitter and facebook
2018-09-12 13:18:03 +02:00
Laurent Destailleur
53da80a79f
FIX Missing translation in predefined email to membership renewal
2018-09-12 12:55:10 +02:00
Maxime Kohlhaas
c94689e9a9
FIX remain to pay for credit note was wrong on invoice list
2018-09-12 11:53:57 +02:00
ptibogxiv
30c393d2da
better display/link of informations
2018-09-12 11:28:43 +02:00
Laurent Destailleur
aad6a0871f
FIX Lose filter on payment type or category after a sort on invoice list
...
Conflicts:
htdocs/compta/facture/list.php
2018-09-12 10:59:53 +02:00
Laurent Destailleur
7bea9f5ffb
FIX Lose filter on payment type or category after a sort on invoice list
2018-09-12 10:57:09 +02:00
Laurent Destailleur
af2e19eba8
Replace skype module with social networks module to support more fields
2018-09-12 10:55:45 +02:00
Philippe GRAND
c51a0ef901
Standardize and update code
2018-09-12 10:10:07 +02:00
delcroix Patrick
2a4c65726c
new: delete zip after download
...
and correct date 2.0
2018-09-11 22:14:58 +02:00
delcroix Patrick
e36bc24dee
fix:copyrights
2018-09-11 21:55:05 +02:00
delcroix Patrick
e3920edb79
correct for invoice supplier links
2018-09-11 21:53:47 +02:00
Jean-Marie Arsac
345c24990e
Correction of variable name
2018-09-11 20:51:54 +02:00
atm-ph
40c79cb7cd
Fix classname liencolht to linecolht
2018-09-11 17:56:11 +02:00
Philippe GRAND
05772f5327
Standardize and update code
2018-09-11 17:30:43 +02:00
Jean-Marie Arsac
2f2dff8155
Convert localized numeric extrafields value before inserting
...
- add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()
2018-09-11 14:57:31 +02:00
ptibogxiv
26a8b5ba4d
Update status display in charge list
2018-09-11 12:30:24 +02:00
ptibogxiv
7f3f0f3643
Fix status display in transaction.php
2018-09-11 12:10:48 +02:00
ptibogxiv
849b7154a7
add capture option in payment function
2018-09-11 10:59:25 +02:00
Philippe GRAND
b4cbb0561d
Standardize and update code
2018-09-11 10:36:39 +02:00
Frédéric FRANCE
2995208e5b
Completely comment unused code
2018-09-11 00:36:44 +02:00
Frédéric FRANCE
cdc5a174aa
Update account.class.php
2018-09-11 00:29:01 +02:00
Laurent Destailleur
45e769243d
Fix import web site
2018-09-11 00:11:14 +02:00
Frédéric FRANCE
a36f41728f
deprecate formbarcode:form_barcode_type
2018-09-10 23:58:57 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type
2018-09-10 23:50:48 +02:00
Laurent Destailleur
016bc6851b
Fix generation of tpl
2018-09-10 23:37:51 +02:00
Laurent Destailleur
a4a4b8ddff
Fix error management
2018-09-10 23:23:44 +02:00
Laurent Destailleur
b0be1ddadb
Fix files generated
2018-09-10 23:20:31 +02:00
Laurent Destailleur
d2c6c7ddff
Fix import
2018-09-10 22:58:34 +02:00
Laurent Destailleur
9e982e05df
Fix import
2018-09-10 22:58:20 +02:00
Laurent Destailleur
280f15e8bf
Fix fk_user
2018-09-10 21:55:03 +02:00
Laurent Destailleur
98c3657d45
Fix default status of website
2018-09-10 21:43:21 +02:00
Laurent Destailleur
5a279bfce0
Fix import
2018-09-10 21:25:30 +02:00
Frédéric FRANCE
a8cfc6be3f
add stripe user for actions
2018-09-10 20:57:45 +02:00
Frédéric FRANCE
afdf87603b
add stripe user for actions
2018-09-10 20:50:10 +02:00
Frédéric FRANCE
5f1b3fbc12
add stripe user for actions
2018-09-10 20:18:16 +02:00
Laurent Destailleur
3de8381c20
Website module
2018-09-10 19:36:46 +02:00
Laurent Destailleur
d011204624
Fix switch of extrafields between all and only one entity
2018-09-10 17:36:46 +02:00
ias-ceo
b4691df8d9
use correct resultset
2018-09-10 17:29:29 +02:00
Frédéric FRANCE
2589b23464
Update dolreceiptprinter.class.php
2018-09-10 17:25:35 +02:00
ptibogxiv
ccc415204e
V8 style
2018-09-10 16:46:16 +02:00
ptibogxiv
ff44e65c38
update api changelog
...
2018-09-06 introduce no change for dolibarr with 2018-08-23
2018-09-10 12:31:34 +02:00
Regis Houssin
43ac51b44c
FIX remove debug
2018-09-10 10:11:07 +02:00
Regis Houssin
8699866062
FIX better compatibility with multicompany
2018-09-10 10:08:04 +02:00
Laurent Destailleur
47cfda6734
Webiste
2018-09-10 09:09:51 +02:00
Laurent Destailleur
20fa294ff1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-10 01:22:16 +02:00
Laurent Destailleur
15aa99fc8e
Fix css
2018-09-10 01:22:01 +02:00
Laurent Destailleur
f9e2fb7a36
Style
2018-09-10 01:16:32 +02:00
Frédéric FRANCE
d8f77f040f
Update accountancycategory.class.php
2018-09-09 23:12:16 +02:00
Frédéric FRANCE
9d8a4e463b
Update accountancycategory.class.php
2018-09-09 23:09:52 +02:00
Frédéric FRANCE
aab617aeb3
remove deprecated
2018-09-09 18:38:48 +02:00
Frédéric FRANCE
0e0db9d1ee
remove deprecated
2018-09-09 15:52:55 +02:00
Frédéric FRANCE
bd07c34391
fix phpcs
2018-09-09 14:50:59 +02:00
Frédéric FRANCE
b7179fd500
fix phpcs
2018-09-09 14:47:33 +02:00
Frédéric FRANCE
dfc1153bb7
Merge remote-tracking branch 'upstream/develop' into patch-10
2018-09-09 14:45:56 +02:00
Frédéric FRANCE
2dd01011f8
Update myobject.class.php
2018-09-09 14:25:35 +02:00
Frédéric FRANCE
86e237f61f
Completely comment unused code
2018-09-09 14:18:26 +02:00
Laurent Destailleur
5719a38ea7
Work on website module. Support now links to company logos.
2018-09-09 14:05:23 +02:00
Frédéric FRANCE
fdd24a5a30
Update accountancycategory.class.php
2018-09-09 13:47:12 +02:00
Frédéric FRANCE
8c5a785797
completely comment unused code
2018-09-09 13:42:38 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
e73bd6da6b
completly comment unused code
2018-09-09 13:29:58 +02:00
Laurent Destailleur
6b47b63e61
Code comment
2018-09-09 13:23:41 +02:00
Laurent Destailleur
f0950e4cfb
Add last change date
2018-09-09 13:15:32 +02:00
Laurent Destailleur
700e3b9748
Standardize code for modulepart=mycompany like others modulepart.
2018-09-09 12:53:30 +02:00
Philippe GRAND
b40fe8e4c9
Standardize and update code
2018-09-09 12:07:14 +02:00
Laurent Destailleur
d9eeb43118
FIX translation no visible for access forbidden
2018-09-09 11:59:38 +02:00
Frédéric FRANCE
fa895b2c2d
replace select_date
2018-09-09 11:30:40 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Philippe GRAND
7fcbd0fe42
Standardize and update code
2018-09-09 11:10:32 +02:00
Frédéric FRANCE
8249756726
replace select_date
2018-09-09 10:40:00 +02:00
Frédéric FRANCE
c2ad09cc0e
replace select_date
2018-09-09 10:11:27 +02:00
Frédéric FRANCE
b2a58067d9
replace select_date
2018-09-09 09:56:33 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date
2018-09-09 09:36:12 +02:00
Frédéric FRANCE
4a7ea33008
replace select_date
2018-09-09 08:02:26 +02:00
Frédéric FRANCE
863886a621
Update salaries.php
2018-09-08 23:19:56 +02:00
Frédéric FRANCE
14bc8ed18d
Update multiprix.php
2018-09-08 23:19:11 +02:00
Frédéric FRANCE
ee8d56e047
Update card.php
2018-09-08 23:18:38 +02:00
Frédéric FRANCE
ef2ee8a6e4
Update card.php
2018-09-08 23:17:29 +02:00
Frédéric FRANCE
7b15a92318
Update card.php
2018-09-08 23:15:05 +02:00
Frédéric FRANCE
a01918a340
Upper-Lower-Casing
2018-09-08 23:13:33 +02:00
Laurent Destailleur
0db7f6b8f3
Clean code
2018-09-08 23:00:17 +02:00
Laurent Destailleur
f29720cc98
Fix scrutinizer bug
2018-09-08 18:40:36 +02:00
Laurent Destailleur
84bbe8684b
Fix scrutinizer
2018-09-08 18:38:24 +02:00
Laurent Destailleur
c2b3b0ce7b
Fix syntax error
2018-09-08 18:28:21 +02:00
Laurent Destailleur
4017a96aef
Debug website
2018-09-08 14:30:27 +02:00
Laurent Destailleur
ba71648c2d
Code comment
2018-09-08 14:10:29 +02:00
Laurent Destailleur
a5edd530d2
Fix delete of website
2018-09-08 14:10:07 +02:00
Laurent Destailleur
391bb9efc6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-08 13:55:38 +02:00
Laurent Destailleur
538a2cc647
NEW Add first template of website
2018-09-08 13:55:15 +02:00
Frédéric FRANCE
80880d8fb9
replace select_date by selectDate
2018-09-08 13:00:39 +02:00
Philippe GRAND
a6b25093e7
Standardize and update code
2018-09-08 12:57:11 +02:00
Frédéric FRANCE
ac8f568604
replace select_date by selectDate
2018-09-08 12:47:27 +02:00
Philippe GRAND
c65505fdca
Standardize clean and update code
2018-09-08 12:24:10 +02:00
Laurent Destailleur
a2b71d9a7a
NEW Can delete a website in experimental website module
2018-09-08 12:04:40 +02:00
Frédéric FRANCE
cb97a29fc0
introduce seletDate
2018-09-08 12:00:11 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Philippe GRAND
572eb35167
Standardize and update code
2018-09-08 10:30:10 +02:00
Laurent Destailleur
f0dafb7ae2
Merge pull request #9414 from grandoc/new_branch_03_09_2018
...
Standardize and update code
2018-09-07 19:40:14 +02:00
Laurent Destailleur
86cf289f14
Merge pull request #9430 from grandoc/new_branch_07_09_2018
...
New branch 07 09 2018
2018-09-07 19:38:57 +02:00
Laurent Destailleur
bcfb5fc42e
Merge pull request #9425 from atm-maxime/8.0
...
FIX : Homepage links were using wrong topmenus
2018-09-07 19:35:10 +02:00
Laurent Destailleur
e2df3fd4ad
Merge pull request #9423 from ptibogxiv/patch-55
...
Fix error when delete stripe customer
2018-09-07 19:34:45 +02:00
Laurent Destailleur
aa562c9c69
Merge pull request #9420 from frederic34/patch-5
...
Update holiday.class.php
2018-09-07 19:32:36 +02:00
Laurent Destailleur
33f71be6ef
Fix gradient ok for webview
2018-09-07 19:03:53 +02:00
Laurent Destailleur
7c5ceff569
Fix search on project
2018-09-07 15:01:34 +02:00
Philippe GRAND
035b2be2eb
Standardize and update call to langs
2018-09-07 14:58:22 +02:00
Philippe GRAND
af37b08da3
Merge remote-tracking branch 'upstream/develop' into new_branch_07_09_2018
2018-09-07 14:48:43 +02:00
Laurent Destailleur
0ef17fe581
FIX Problems with permissions of module to record payment of salaries
2018-09-07 13:32:56 +02:00
Laurent Destailleur
e5058a251d
Use colored gradient background on login page
2018-09-07 12:27:08 +02:00
Philippe GRAND
a6d13b06b0
Standardize and update call to
2018-09-07 10:40:36 +02:00
Frédéric FRANCE
7e0ef3ad7e
Update fiscalyear_card.php
2018-09-06 22:10:19 +02:00
Frédéric FRANCE
ab4ae0f7bb
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-06 21:28:30 +02:00
Frédéric FRANCE
70ba223788
move phpcs:ignore
2018-09-06 21:27:18 +02:00
Philippe GRAND
97c740f510
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
2018-09-06 19:28:10 +02:00
Philippe GRAND
e9c2a475bc
fix merge
2018-09-06 19:27:28 +02:00
Frédéric FRANCE
cbf4a20a13
move phpcs:ignore
2018-09-06 19:03:09 +02:00
Frédéric FRANCE
3ecf788438
move phpcs:ignore
2018-09-06 18:29:01 +02:00
Laurent Destailleur
ff05997f0a
FIX Several fixes on the management of minimal amount for orders
2018-09-06 17:37:02 +02:00
Maxime Kohlhaas
a5f4a74ecc
FIX : Homepage links were using wrong topmenus
2018-09-06 14:49:48 +02:00
Philippe GRAND
9025fd5891
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0
2018-09-06 14:33:46 +02:00
Philippe GRAND
844333688b
typo
2018-09-06 14:33:22 +02:00
ptibogxiv
da4e902645
Fix error when delete stripe customer
2018-09-06 11:35:19 +02:00
Laurent Destailleur
c5695db3e4
NEW Can disable meteo on smartphone only
2018-09-06 11:09:51 +02:00
Philippe GRAND
3c06527a7b
Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018
2018-09-06 09:50:12 +02:00
Laurent Destailleur
b25a0ca672
Fix no need of thumb when upload image for email
2018-09-05 23:25:17 +02:00
Laurent Destailleur
f7c87a9ad3
Clean cron init
2018-09-05 22:46:08 +02:00
Frédéric FRANCE
5a618c6808
Update holiday.class.php
2018-09-05 21:14:15 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 21:02:16 +02:00
Laurent Destailleur
2a471df828
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:42:55 +02:00
Laurent Destailleur
ed31eec5ee
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2018-09-05 20:39:38 +02:00
Frédéric FRANCE
85df267a5b
move phpcs:ignore
2018-09-05 20:36:44 +02:00
Laurent Destailleur
4ac67e6409
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:31:10 +02:00
Laurent Destailleur
e3339f5f95
Fix trad
2018-09-05 19:01:00 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 18:51:21 +02:00
Frédéric FRANCE
f7c3ca9d20
move phpcs:ignore
2018-09-05 18:49:06 +02:00
ptibogxiv
b630a97215
add payment link on admin gateway
2018-09-05 17:41:37 +02:00
ptibogxiv
6e209b550b
add payment link for donation
2018-09-05 17:40:26 +02:00
ptibogxiv
639f24a95b
Add online payment link
2018-09-05 17:36:28 +02:00
Laurent Destailleur
0bd4bc39dd
Fix responsive
2018-09-05 16:03:43 +02:00
Laurent Destailleur
ad92556a31
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 16:03:21 +02:00
Laurent Destailleur
cb89942bfb
Add option capture on input file for photo
2018-09-05 16:03:10 +02:00
Philippe GRAND
056b0b26cc
fix : Public member variable _fetched must not be prefixed with an underscore
2018-09-05 15:39:04 +02:00
Philippe GRAND
36e837207b
Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018
2018-09-05 15:35:42 +02:00
Laurent Destailleur
3650dc3ec9
FIX #8452
2018-09-05 15:25:47 +02:00
Laurent Destailleur
f1cb13634b
FIX Entering negative price on order
2018-09-05 14:55:45 +02:00
Laurent Destailleur
19431a94ba
Code style
2018-09-05 14:37:44 +02:00
Laurent Destailleur
1882043f19
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-05 14:26:24 +02:00
Laurent Destailleur
51901108ad
FIX #9412
2018-09-05 14:26:12 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10
...
Create index.html
2018-09-05 14:15:22 +02:00
Philippe GRAND
11d75573be
Standardize and update code
2018-09-05 12:21:13 +02:00
Philippe GRAND
38ca6096b2
Standardize and update code
2018-09-05 10:31:12 +02:00
Ferran Marcet
57be6a752e
Fix: Expedition not showing extrafields on creation
2018-09-05 10:00:33 +02:00
Frédéric FRANCE
aa74d2ac38
Update api_agendaevents.class.php
2018-09-04 23:53:37 +02:00
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
2015268b7e
Create index.html
2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html
2018-09-04 22:05:06 +02:00
Frédéric FRANCE
3847df1de6
move phpcs:ignore
2018-09-04 21:53:53 +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
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
aec0d4022b
Fix responsive
2018-09-04 19:59:20 +02:00
Laurent Destailleur
154e44e761
Fix responsive
2018-09-04 19:57:20 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop
2018-09-04 16:58:59 +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
707f8b7312
fix merge
2018-09-04 14:49:56 +02:00
Philippe GRAND
50a26aaf16
fix merge
2018-09-04 14:33:34 +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
Ferran Marcet
ba68a6373c
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-04 11:57:33 +02:00
Ferran Marcet
b658626e21
NEW: Highlight lines on lists when they are checked
2018-09-04 11:54:13 +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
9697bdf3b0
FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES
2018-09-04 10:38:09 +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
252335318f
Update pdf.lib.php
2018-09-04 09:57:01 +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
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
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
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
Marc de Lima Lucio
e285b42a18
FIX: PDF address: handle when contact thirdparty different from document thirdparty
2018-09-03 17:57:30 +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
1d644a33a3
Revert " New:Algerian Chart of accounts"
2018-09-03 11:42:01 +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
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
e0c1599bb1
whoops
2018-09-03 09:29:30 +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
Frédéric FRANCE
22b9632555
move phpcs:ignore
2018-09-02 21:08:57 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore
2018-09-02 20:37:12 +02:00
Frédéric FRANCE
b05c175a78
Merge remote-tracking branch 'upstream/develop' into testsqlAndScript
2018-09-02 19:00:43 +02:00
Frédéric FRANCE
801eba74c5
deprecated test_sql_and_script
2018-09-02 18:58:11 +02:00
Frédéric FRANCE
03a5aba8a2
move phpcs:ignore
2018-09-02 18:49:23 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-02 18:19:45 +02:00
Frédéric FRANCE
61c4e9831f
move phpcs:ignore
2018-09-02 18:18:10 +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
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
bb5fae0e46
Fix eol
2018-09-02 15:30:56 +02:00
Laurent Destailleur
32a03f3c0b
Fix eol
2018-09-02 14:25:52 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore
2018-09-02 14:01:37 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore
2018-09-02 13:38:11 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore
2018-09-02 11:12:07 +02:00
Philippe GRAND
3de16a145e
Standardize and update code
2018-09-02 11:08:41 +02:00
Frédéric FRANCE
b60f7db60a
move phpcs:ignore
2018-09-02 10:43:34 +02:00
Philippe GRAND
c4f05aff28
Standardize and update code
2018-09-02 10:42:31 +02:00
Frédéric FRANCE
0c16761f48
Update myobject.class.php
2018-09-02 10:23:00 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore
2018-09-02 09:57:19 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore
2018-09-02 09:27:59 +02:00
Frédéric FRANCE
71977514d7
Update actioncommreminder.class.php
2018-09-02 09:06:51 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore
2018-09-01 23:46:13 +02:00
Philippe GRAND
bb18982f78
Standardize and Update code
2018-09-01 23:24:59 +02:00
Philippe GRAND
db32d8903e
Standardize and Update code
2018-09-01 23:20:20 +02:00
Philippe GRAND
5cd9557318
Standardize and Update code
2018-09-01 23:12:20 +02:00
Philippe GRAND
ae2df6be11
Standardize and Update code
2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab
Standardize and Update code
2018-09-01 22:55:10 +02:00
Philippe GRAND
d86d7323fb
Update code
2018-09-01 22:46:35 +02:00
Philippe GRAND
091b8269a6
fix conflict
2018-09-01 22:42:42 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Laurent Destailleur
df26ae764e
Fix typo
2018-09-01 17:56:52 +02:00
Laurent Destailleur
0bf967ab10
Fix setup
2018-09-01 17:50:13 +02:00
Laurent Destailleur
5f2eeb552a
Fix setup of email
2018-09-01 17:48:35 +02:00
Laurent Destailleur
dfda029da4
FIX a removed option was still in setup
2018-09-01 17:44:07 +02:00
Frédéric FRANCE
ab9bf78ecf
replace test_sql_and_script_inject
2018-09-01 17:42:16 +02:00
Laurent Destailleur
ada6d2c963
More logs
2018-09-01 17:27:14 +02:00
Philippe Grand
df4a4aa6c9
Merge branch 'develop' into develop
2018-09-01 17:23:43 +02:00
Laurent Destailleur
32baec1c9a
Fix logs
2018-09-01 17:10:47 +02:00
Laurent Destailleur
c17233a409
More logs
2018-09-01 16:51:40 +02:00
Frédéric FRANCE
49a1e33fc9
Update html_cerfafr.modules.php
2018-09-01 16:23:30 +02:00
Laurent Destailleur
c3438b79c8
Fix merge
2018-09-01 15:39:11 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Frédéric FRANCE
ae52b737b3
Update doc_generic_user_odt.modules.php
2018-09-01 15:29:41 +02:00
Philippe GRAND
45cbc36a15
Standardize and update code
2018-09-01 15:27:55 +02:00
Frédéric FRANCE
beeaf9cf8a
Update dav.class.php
2018-09-01 15:27:51 +02:00
Philippe GRAND
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +02:00
Philippe GRAND
c013f9cf3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 15:13:04 +02:00
Laurent Destailleur
2301ecf1dc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:51:20 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm
...
NEW hook formConfirm always called if hooked
2018-09-01 14:50:08 +02:00
Philippe GRAND
8d7dfaf98c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:49:42 +02:00
Laurent Destailleur
fe7a0c894f
Merge pull request #9368 from atm-ph/fix_7.0_search_company_by_code
...
Fix search company by code
2018-09-01 14:42:32 +02:00
Laurent Destailleur
945e925399
Update html.form.class.php
2018-09-01 14:41:44 +02:00
Laurent Destailleur
e4e1bf5a1a
Merge pull request #9361 from frederic34/patch-19
...
Update discount.class.php
2018-09-01 14:30:16 +02:00
Philippe GRAND
b273587909
translations
2018-09-01 14:28:30 +02:00
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +02:00
Laurent Destailleur
359eebbbec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:26:48 +02:00
Laurent Destailleur
08bc81a7ab
Merge pull request #9370 from joseplluis/patch-5
...
NEW optional param to show a specific extrafield
2018-09-01 14:24:23 +02:00
Laurent Destailleur
bc71aef7b4
Code comment
2018-09-01 14:24:02 +02:00
Laurent Destailleur
5b6a44434c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:17:15 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Philippe GRAND
bd473059ae
precise label comment
2018-09-01 14:13:05 +02:00
Laurent Destailleur
26cff9e11f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/blockedlog.lang
htdocs/stripe/config.php
2018-09-01 14:13:01 +02:00
Laurent Destailleur
677d7dd0fb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-09-01 14:09:20 +02:00
Laurent Destailleur
123a66dc2a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/product/class/product.class.php
2018-09-01 14:09:00 +02:00
Philippe GRAND
7b47c79bc3
precise label comment
2018-09-01 14:06:58 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
b5ed4de6a6
Merge pull request #9367 from joseplluis/patch-4
...
FIX support of option PRODUCT_DISABLE_VOLUME
2018-09-01 13:37:38 +02:00
Laurent Destailleur
aa2655d604
Merge pull request #9374 from bafbes/abb80014
...
Fix: No link is shown to access for bank transfers.
2018-09-01 13:36:08 +02:00
Laurent Destailleur
fe06a0a021
Merge pull request #9365 from frederic34/patch-23
...
Update categorie.class.php
2018-09-01 13:31:42 +02:00
Laurent Destailleur
b6f4b1dff7
Merge pull request #9363 from frederic34/patch-21
...
Update modSociete.class.php
2018-09-01 13:31:23 +02:00
Frédéric FRANCE
2b5407c31d
Update export.php
2018-09-01 13:30:28 +02:00
Laurent Destailleur
0d3c34f2b3
Merge pull request #9364 from frederic34/patch-22
...
Update export.php
2018-09-01 13:29:41 +02:00
Laurent Destailleur
06355f7f08
Merge pull request #9362 from frederic34/patch-20
...
Update ldap.class.php
2018-09-01 13:28:32 +02:00
Laurent Destailleur
bb444c80d0
Merge pull request #9360 from frederic34/patch-18
...
Update ldap.php
2018-09-01 13:28:16 +02:00
Laurent Destailleur
1eeb567e67
Merge pull request #9359 from frederic34/patch-17
...
Update card.php
2018-09-01 13:27:49 +02:00
Philippe GRAND
7354e485b0
precise label comment
2018-09-01 13:22:08 +02:00
Laurent Destailleur
dee9442720
Fix regression
2018-09-01 13:12:09 +02:00
Philippe GRAND
d8e6492e93
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 13:07:30 +02:00
Philippe GRAND
0dc812cf10
precise label comment
2018-09-01 13:02:27 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Philippe GRAND
0e5d4206c9
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 12:47:34 +02:00
Josep Lluís
bfaf7ae473
Fix: undefined rights_class on modules
...
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-09-01 12:44:16 +02:00
Josep Lluís
79ee31df5c
Fix: undefined rights_class on modules
...
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-09-01 12:43:02 +02:00
Laurent Destailleur
8bd231adb0
Merge pull request #9357 from joseplluis/patch-3
...
FIX undefined rights_class on modules may lose setup when module disabled
2018-09-01 12:42:22 +02:00
Laurent Destailleur
007381907e
Merge pull request #9356 from ptibogxiv/patch-52
...
Add shipping_method label in fetch
2018-09-01 12:40:26 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
9f33d586ff
Merge pull request #9346 from frederic34/patch-16
...
Create index.html
2018-09-01 12:34:10 +02:00
Laurent Destailleur
b89202572e
Merge pull request #9342 from ptibogxiv/patch-51
...
fix multicompany and footer ticket public page
2018-09-01 12:33:55 +02:00
Laurent Destailleur
fc5ebc8099
Merge pull request #9340 from ptibogxiv/patch-49
...
Fix image if multicompany + no login in onlinesign
2018-09-01 12:32:38 +02:00
Laurent Destailleur
cbe89af8f3
Merge pull request #9339 from ptibogxiv/patch-48
...
add logo with multicompany
2018-09-01 12:31:56 +02:00
Laurent Destailleur
0913b871aa
Merge pull request #9338 from ptibogxiv/patch-47
...
Fix multicompany
2018-09-01 12:30:53 +02:00
Laurent Destailleur
ae36469166
FIX #9337
2018-09-01 12:28:36 +02:00
Laurent Destailleur
59a27085fd
Merge pull request #9336 from ptibogxiv/patch-45
...
fix multicompany in public ticket page
2018-09-01 12:20:06 +02:00
Laurent Destailleur
160a35f63f
Merge pull request #9335 from frederic34/patch-11
...
Update blockedlog.lang
2018-09-01 12:19:36 +02:00
Laurent Destailleur
bb22d5e083
Merge pull request #9341 from ptibogxiv/patch-50
...
header/footer uniformization in ticket public page
2018-09-01 12:19:18 +02:00
Laurent Destailleur
3b1cf41823
Fix eol
2018-09-01 12:17:52 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018
...
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Laurent Destailleur
9b8be2f7db
Merge pull request #9343 from frederic34/patch-13
...
Create index.html
2018-09-01 12:07:54 +02:00
Laurent Destailleur
b89f69df79
Merge pull request #9345 from frederic34/patch-15
...
Create index.html
2018-09-01 12:07:20 +02:00
Laurent Destailleur
14a64e438e
Merge pull request #9344 from frederic34/patch-14
...
Create index.html
2018-09-01 12:07:09 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace
...
PSR2 FunctionClosingBrace
2018-09-01 12:06:08 +02:00
Laurent Destailleur
81c4e6a764
FIX Force stripe api version to avoid trouble if we update stripe api
...
Conflicts:
htdocs/stripe/config.php
2018-09-01 12:03:44 +02:00
Laurent Destailleur
f0fc99ee4c
FIX Force stripe api version to avoid trouble if we update stripe api
2018-09-01 12:01:01 +02:00
Laurent Destailleur
28fe74bf13
FIX #9371
2018-09-01 11:57:18 +02:00
Laurent Destailleur
bb2f5ad588
Fix missing migration
2018-09-01 11:30:14 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix
2018-09-01 09:40:50 +02:00
Frédéric FRANCE
945eede4a5
doxygen fixs
2018-08-31 23:12:55 +02:00
Frédéric FRANCE
3b2e7732c2
function Comment Missing
2018-08-31 22:49:11 +02:00
Frédéric FRANCE
02b74afe5f
function Comment Missing
2018-08-31 22:41:51 +02:00
Frédéric FRANCE
c2e49c82f8
function Comment Missing
2018-08-31 22:34:02 +02:00
Frédéric FRANCE
b015d05f07
function Comment Missing
2018-08-31 22:25:11 +02:00
Frédéric FRANCE
e47059fa36
function Comment Missing
2018-08-31 22:14:09 +02:00
Frédéric FRANCE
4c0b083f45
function Comment Missing
2018-08-31 22:11:52 +02:00
Frédéric FRANCE
5d27318e3b
function Comment Missing
2018-08-31 22:03:12 +02:00
Frédéric FRANCE
df6eccc5dd
function Comment Missing
2018-08-31 22:01:13 +02:00
Frédéric FRANCE
a676f4f64f
function Comment Missing
2018-08-31 21:54:40 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing
2018-08-31 21:39:23 +02:00
Philippe GRAND
3a8bde227b
Standardize and update code
2018-08-31 19:26:08 +02:00
Abbes Bahfir
c288c42ee3
Fix: No link is shown to access for bank transfers.
2018-08-31 18:13:56 +01:00
Philippe GRAND
bb05e80a87
Standardize and update code
2018-08-31 18:47:25 +02:00
Laurent Destailleur
ca2e9f20f6
Fix missing extrafield table
2018-08-31 18:39:13 +02:00
Philippe GRAND
edaa575435
Standardize and update code
2018-08-31 18:36:15 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Philippe GRAND
2f307aae21
Standardize and update code
2018-08-31 18:06:17 +02:00
Philippe GRAND
9e880d3e72
Standardize and update code
2018-08-31 17:55:31 +02:00
Philippe GRAND
7973489f8a
fix display comment issue
2018-08-31 17:18:08 +02:00
Josep Lluís
78c0aa437f
NEW optional param to show a specific extrafield
...
Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas.
For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));
2018-08-31 17:16:27 +02:00
Laurent Destailleur
6af8f8f475
Fix trans
2018-08-31 16:57:50 +02:00
Philippe GRAND
c60c38dfb3
Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into new_branch_30_08_2018
2018-08-31 16:42:38 +02:00
Philippe GRAND
6474646e4b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_30_08_2018
2018-08-31 16:37:03 +02:00
Laurent Destailleur
b08971b03b
FIX vat rate code not return by get_product_vat_for_country
2018-08-31 14:52:34 +02:00
Laurent Destailleur
7b1a705be4
Clean duplicate code
2018-08-31 13:50:58 +02:00
atm-ph
102b698c76
Fix search company by code
2018-08-31 11:38:45 +02:00
Laurent Destailleur
e7d4956f5b
Clean not used function
2018-08-31 11:29:30 +02:00
Laurent Destailleur
07d5bd143a
Fix entity
2018-08-31 11:26:53 +02:00
Josep Lluís
a514b97837
FIX: add global PRODUCT_DISABLE_VOLUME on create
...
On update and view the global PRODUCT_DISABLE_VOLUME is used.
But on create it does not exists.
2018-08-31 10:57:01 +02:00
Laurent Destailleur
bdbe2c02ed
Sample
2018-08-31 10:51:32 +02:00
Frédéric FRANCE
5833e6c5d8
Update categorie.class.php
2018-08-31 08:56:00 +02:00
Frédéric FRANCE
d8441619ed
Update export.php
2018-08-31 08:29:51 +02:00
Frédéric FRANCE
2eade6ea68
Update modSociete.class.php
2018-08-30 23:22:06 +02:00
Frédéric FRANCE
26c0244dbb
Update ldap.class.php
2018-08-30 23:13:16 +02:00
Frédéric FRANCE
4ad5201a16
Update discount.class.php
2018-08-30 23:10:09 +02:00
Frédéric FRANCE
f61450ffa8
Update ldap.php
2018-08-30 23:04:32 +02:00
Frédéric FRANCE
9c44f80746
Update card.php
2018-08-30 23:03:03 +02:00
Laurent Destailleur
8dc208c961
Fix missing legal ids in source address
2018-08-30 19:19:43 +02:00
Laurent Destailleur
9cc6533d11
Fix td alignement
2018-08-30 18:57:30 +02:00
Josep Lluís
d70e548f94
Fix: undefined rights_class on modules
...
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-08-30 18:12:02 +02:00
Laurent Destailleur
151d84405a
FIX trans on null object
2018-08-30 17:01:49 +02:00
Laurent Destailleur
d14bd829fb
FIX trans on null object
2018-08-30 17:01:22 +02:00
Philippe Grand
5ec22d9fad
Update accountingaccount.class.php
2018-08-30 14:25:25 +02:00
Philippe Grand
e96e3bdf42
Update accountancycategory.class.php
2018-08-30 14:19:21 +02:00
ptibogxiv
49729c3118
Add shipping_method label
2018-08-30 13:54:10 +02:00
Philippe GRAND
ba6a48360e
Standardize and update code
2018-08-30 12:26:59 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018
2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650
WTF...
2018-08-30 12:03:20 +02:00
Laurent Destailleur
4d22c4f9f9
Typo
2018-08-30 11:37:06 +02:00
ksar-ksar
49d3bea192
Remove the test
...
After discussion with Frederic, the best solution is to remove the test
2018-08-30 11:27:48 +02:00
Frédéric FRANCE
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-30 10:42:47 +02:00
Frédéric FRANCE
57207794c2
tabs added
2018-08-30 10:30:52 +02:00
Frédéric FRANCE
1bdc33f286
tabs added
2018-08-30 10:02:31 +02:00
Frédéric FRANCE
4196febb67
tabs added
2018-08-30 09:40:04 +02:00
atm-greg
f8fef61075
remove useless db begin
2018-08-30 09:19:44 +02:00
Frédéric FRANCE
302179c739
Create index.html
2018-08-30 08:10:51 +02:00
Frédéric FRANCE
663745b787
Create index.html
2018-08-30 08:09:03 +02:00
Frédéric FRANCE
82302e5516
Create index.html
2018-08-30 08:08:01 +02:00
Frédéric FRANCE
f34455291f
Create index.html
2018-08-30 08:06:46 +02:00
ptibogxiv
de73f1545f
fix multicompany and footer
...
- fix viewimage and multicompany + no login
- delete ticket footer for common payment.lib.php footer
2018-08-30 02:42:14 +02:00
ptibogxiv
7a6df60cb0
header/footer uniformization in ticket public page
2018-08-30 02:38:50 +02:00
ptibogxiv
fc804d8eeb
Fix image if multicompany + no login in onlinesign
2018-08-30 02:37:11 +02:00
ptibogxiv
d2859276b5
add logo with multicompany
...
this fix push entity to viewimage.php
2018-08-30 02:35:42 +02:00
ptibogxiv
e512f1082f
Fix multicompany
...
we can need to use multicompany with evry modulepart ex. newpayment.php, ticket, onlinesign...
2018-08-30 02:33:22 +02:00
ptibogxiv
9cf67c4d5f
fix multicompany in public ticket page
2018-08-30 01:13:06 +02:00
Frédéric FRANCE
285e231ea1
Update blockedlog.lang
2018-08-29 23:08:13 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Laurent Destailleur
3e0b2d0281
Fix phpcs
2018-08-29 21:51:49 +02:00
Laurent Destailleur
2cf37f621c
Merge pull request #9267 from torvista/develop
...
Installer: set protocol of autofill of main url to match installer protocol
2018-08-29 21:47:31 +02:00
Laurent Destailleur
872273ef95
Update fileconf.php
2018-08-29 21:46:39 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
f146572b81
ident
2018-08-29 21:18:47 +02:00
ptibogxiv
eaa49e773d
fix deletion of stripe customer
2018-08-29 21:13:45 +02:00
Laurent Destailleur
e2865ff75f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-29 21:13:10 +02:00
Laurent Destailleur
c071e751f7
Merge pull request #9329 from ptibogxiv/patch-44
...
FIX deletion of stripe customer
2018-08-29 21:12:53 +02:00
Laurent Destailleur
7211aff016
Update dispatch.php
2018-08-29 21:11:28 +02:00
Laurent Destailleur
a8bb55c66d
Merge branch '8.0' into 7.0_new_dispatch
2018-08-29 21:08:51 +02:00
Laurent Destailleur
6ca9854a34
Fix to avoid fetch when no accounting account defined
2018-08-29 21:07:00 +02:00
Laurent Destailleur
88044a3d75
Update dispatch.php
2018-08-29 20:42:19 +02:00
Laurent Destailleur
489e766cbf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/ticket/class/ticket.class.php
2018-08-29 20:24:01 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
d40e1a0d0b
FIX #9258
2018-08-29 20:12:38 +02:00
Laurent Destailleur
8b291b2053
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
README.md
2018-08-29 19:55:10 +02:00
Laurent Destailleur
46fe19bed5
Code comment
2018-08-29 18:56:57 +02:00
Laurent Destailleur
0c11007e34
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
README.md
htdocs/comm/propal/card.php
2018-08-29 18:53:39 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Laurent Destailleur
34ceec7067
FIX #9328
2018-08-29 18:40:12 +02:00
Laurent Destailleur
4e7e290624
FIX #9328
2018-08-29 18:38:58 +02:00
Laurent Destailleur
428354303c
FIX #9328
2018-08-29 18:29:42 +02:00
Laurent Destailleur
d8bd76b8ce
FIX #9328
2018-08-29 18:27:39 +02:00
Laurent Destailleur
275b9a9960
Merge pull request #9325 from frederic34/patch-12
...
Fix allow barcode with special char
2018-08-29 18:01:15 +02:00
Laurent Destailleur
86d8513138
Merge pull request #9309 from frederic34/trimtrailing2
...
last trimtrailing
2018-08-29 17:57:05 +02:00
ptibogxiv
b9179f27a0
Fix multicompany in ticket/list.php
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2018-08-29 17:55:55 +02:00
Laurent Destailleur
8fc289b7bb
Merge pull request #9324 from ptibogxiv/patch-43
...
Fix multicompany in ticket/list.php
2018-08-29 17:53:28 +02:00
Laurent Destailleur
a5a629fd0f
Fix phpcs
2018-08-29 17:44:44 +02:00
Laurent Destailleur
7bf48b8d77
Fix date_start and date_end not saved on supplier invoice
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2018-08-29 17:26:41 +02:00
ptibogxiv
4de8b8bfd9
fix deletion of stripe customer
2018-08-29 17:25:37 +02:00
Laurent Destailleur
2daa5b3ae0
Fix phpcs
2018-08-29 17:09:58 +02:00
Laurent Destailleur
98356c6ed0
Fix date_start and date_end not saved on supplier invoice
2018-08-29 17:03:18 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +02:00
Laurent Destailleur
74b3e3e814
Fix for compatibility with lines with no prices (some external modules)
2018-08-29 14:50:12 +02:00
atm-quentin
76cb9f60c7
NEW hook on dispatch order fourn
2018-08-29 14:26:04 +02:00
ptibogxiv
25be9f5989
fix if null
2018-08-29 13:19:03 +02:00
Frédéric FRANCE
24be0b7305
Update viewimage.php
...
code may have rich content (qrcode, datamatrix,...)
2018-08-29 13:08:52 +02:00
Philippe GRAND
46b00705b3
Fix white spaces
2018-08-29 12:54:03 +02:00
Frédéric FRANCE
7b2bfb28c2
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 12:48:12 +02:00
Philippe Grand
0ab593fdb1
Merge branch 'develop' into new_branch_29_08_2018
2018-08-29 12:47:01 +02:00
Philippe GRAND
d948c9e2db
Fix white spaces
2018-08-29 12:42:55 +02:00
Philippe GRAND
660f02f5a6
Fix white spaces
2018-08-29 12:35:56 +02:00
Philippe GRAND
32a9e35a6a
Fix white spaces
2018-08-29 12:31:36 +02:00
Philippe GRAND
4b7dd5ace3
Fix white spaces
2018-08-29 12:29:05 +02:00
Philippe GRAND
88ad651743
Fix white spaces
2018-08-29 12:26:47 +02:00
ptibogxiv
5f94bffa25
Fix multicompany in ticket/list.php
2018-08-29 12:26:31 +02:00
Philippe GRAND
9681dfca1b
Fix white spaces
2018-08-29 12:23:03 +02:00
Philippe GRAND
a1f31120ba
Fix white spaces
2018-08-29 12:20:35 +02:00
Philippe GRAND
b29721df61
Fix white spaces
2018-08-29 12:17:59 +02:00
Philippe GRAND
79988282af
Fix white spaces
2018-08-29 12:14:07 +02:00
Philippe GRAND
e92b96acfd
try to fix space errors
2018-08-29 12:00:53 +02:00
Laurent Destailleur
b648a28893
Fix regression
2018-08-29 11:57:43 +02:00
Philippe GRAND
d3ccf4e2b3
try to fix space errors
2018-08-29 11:55:52 +02:00
Laurent Destailleur
0eb4f8bb96
NEW Can set the datestart and dateend of cron job into module descriptor
2018-08-29 11:47:20 +02:00
Philippe GRAND
4395d04132
try to fix space errors
2018-08-29 11:44:57 +02:00
Frédéric FRANCE
846778657f
fix syntax error
2018-08-29 11:44:26 +02:00
Philippe GRAND
263af3c8e7
Merge branch 'new_branch_29_08_2018' of github.com:grandoc/dolibarr into new_branch_29_08_2018
2018-08-29 11:40:54 +02:00
Philippe GRAND
5b0425706c
try to fix space errors
2018-08-29 11:39:38 +02:00
Philippe Grand
65f9013634
Update api_contracts.class.php
2018-08-29 11:35:51 +02:00
Philippe GRAND
881ab54cf0
typo and translation
2018-08-29 11:06:20 +02:00
Philippe GRAND
8785c10ad8
typo
2018-08-29 10:52:27 +02:00
Philippe GRAND
84a9ca3f68
fix : Parse error: ./htdocs/comm/mailing/cibles.php:644
2018-08-29 10:40:30 +02:00
Philippe GRAND
e902d0c2f5
Merge remote-tracking branch 'upstream/develop' into develop
2018-08-29 10:27:47 +02:00
Laurent Destailleur
1b542d5be3
Fix translation
2018-08-28 18:36:46 +02:00
Laurent Destailleur
b5c2383f65
Fix type of invoice encoded twice
2018-08-28 18:34:53 +02:00
Laurent Destailleur
d2d28ab109
Fix trans
2018-08-28 18:28:09 +02:00
Laurent Destailleur
bc31fa7fbf
Fix translation
2018-08-28 18:18:04 +02:00
gauthier
61a57e619f
FIX : $fk_account is always empty, must be $soc->fk_account
2018-08-28 16:54:04 +02:00
Laurent Destailleur
fde9c94b1c
Fix regression in media editor in websites
2018-08-28 14:21:58 +02:00
ptibogxiv
289dfc7fbe
update API version
...
We need to downgrade this change to V8 because some breaks occur if Stripe API is updated in dashboard to 2018-08-23
2018-08-28 13:37:17 +02:00
ptibogxiv
90de2698c3
Fix for new stripe API 2018-08-23
...
Fix break of change API
2018-08-28 13:34:59 +02:00
ptibogxiv
523b03e132
Fix for new stripe API 2018-08-23
...
Fix break with change API
2018-08-28 13:32:38 +02:00
Laurent Destailleur
bbc6255925
Fix missing language
2018-08-28 13:07:48 +02:00
Philippe Grand
fa992c3e6d
Update modules_import.php
2018-08-28 10:44:18 +02:00
Philippe Grand
6fc813254b
Update html.formmail.class.php
2018-08-28 10:43:13 +02:00
Philippe Grand
b73fd487c0
Update ctyperesource.class.php
2018-08-28 10:41:54 +02:00
Philippe Grand
1856fb8946
Update ctyperesource.class.php
2018-08-28 10:41:26 +02:00
Philippe Grand
b7bc34963a
Update paymentsalary.class.php
2018-08-28 10:41:05 +02:00
Philippe Grand
1337d85a29
Update bankcateg.class.php
2018-08-28 10:40:41 +02:00
Philippe Grand
405f3ca858
Update categorie.class.php
2018-08-28 10:40:03 +02:00
Philippe Grand
32d63aa50c
Update asset.class.php
2018-08-28 10:39:11 +02:00
Philippe Grand
df05eb785b
Update accountingjournal.class.php
2018-08-28 10:38:42 +02:00
Philippe Grand
34ea3d479f
Update accountingaccount.class.php
2018-08-28 10:38:01 +02:00
Philippe Grand
c352bbbd18
Update accountancycategory.class.php
2018-08-28 10:37:16 +02:00
Philippe GRAND
65af8f902f
Update and standardize code
2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing
2018-08-28 08:33:02 +02:00
Steve
642f5fd343
Merge pull request #2 from Dolibarr/develop
...
update 28/8/2018
2018-08-28 08:29:09 +02:00
Laurent Destailleur
b875abb27b
Fix logo on public page of survey
2018-08-28 03:03:05 +02:00
Laurent Destailleur
2349f99eb9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-28 02:58:51 +02:00
Laurent Destailleur
7df5993ee0
Fix logo in public survey page
2018-08-28 02:58:14 +02:00
Laurent Destailleur
50d50c2e10
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info
...
NEW On customer/supplier card, add simple tooltip to amount boxes
2018-08-28 02:48:05 +02:00
Laurent Destailleur
b1fc45fe3d
Merge branch 'develop' into develop
2018-08-28 02:43:04 +02:00
Laurent Destailleur
45e30271b3
Merge
2018-08-28 02:37:06 +02:00
Laurent Destailleur
9c6ce4b29d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-28 02:36:15 +02:00
Laurent Destailleur
9a14611d55
Merge pull request #8996 from grandoc/new_branch_20_06_2018
...
clean and update code
2018-08-28 02:35:59 +02:00
Laurent Destailleur
2db84a679e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
32ef9695a7
Merge pull request #9282 from frederic34/patch-19
...
Update card.php
2018-08-28 02:28:35 +02:00
Laurent Destailleur
7462a1ae1d
Update card.php
2018-08-28 02:27:56 +02:00
Laurent Destailleur
2306f8a7c2
Merge pull request #9265 from grandoc/new_branch_18_08_2018
...
Typo
2018-08-28 02:25:24 +02:00
Laurent Destailleur
0a7ce338f9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-08-28 02:23:34 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
...
Update and standardize code
2018-08-28 02:13:28 +02:00
Laurent Destailleur
4369be7b39
Merge pull request #9284 from frederic34/patch-20
...
Update commondocgenerator.class.php
2018-08-28 02:11:50 +02:00
Laurent Destailleur
d725c5db1e
Merge pull request #9303 from jtraulle/develop
...
NEW REST API improvements
2018-08-28 02:09:42 +02:00
Laurent Destailleur
998dca9b9f
Update api_thirdparties.class.php
2018-08-28 02:05:37 +02:00
Laurent Destailleur
d90eed3098
Merge pull request #9291 from frederic34/patch-23
...
typo
2018-08-28 01:55:44 +02:00
Laurent Destailleur
f8811f1b6d
Merge pull request #9275 from frederic34/patch-18
...
align parameters
2018-08-28 01:44:55 +02:00
Laurent Destailleur
0d138b8fc0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-28 01:43:35 +02:00
Laurent Destailleur
6f427cbed3
Merge pull request #9293 from frederic34/patch-25
...
NEW Add __DAY_TEXT__ and __MONTH_TEXT__ substitutions vars
2018-08-28 01:42:35 +02:00
Laurent Destailleur
5185d32cc9
Merge pull request #9286 from frederic34/patch-22
...
Update propal.lib.php
2018-08-28 01:40:58 +02:00
Laurent Destailleur
fc897a8b99
Merge pull request #9285 from frederic34/patch-21
...
Update actions_ticket.class.php
2018-08-28 01:40:33 +02:00
Laurent Destailleur
14dc748523
Update actions_ticket.class.php
2018-08-28 01:40:27 +02:00
Laurent Destailleur
b4652ea24b
Merge pull request #9292 from frederic34/patch-24
...
Create index.html
2018-08-28 01:37:48 +02:00
Laurent Destailleur
1f807b9216
Merge pull request #9305 from atm-gauthier/7.0_fix_altertable_charges
...
FIX : table llx_chargessociales doesn't exists
2018-08-28 01:37:31 +02:00
Laurent Destailleur
ad0cc098ee
Fix alter forgot
2018-08-28 01:37:25 +02:00
Laurent Destailleur
534eadb7a2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-28 01:35:43 +02:00
ptibogxiv
6556ace2bc
Fix sync user->member
...
add more fields
2018-08-28 01:35:05 +02:00
ptibogxiv
ca8a22a3ad
fix sync user/member
...
add more fields to sync
2018-08-28 01:35:01 +02:00
Frédéric FRANCE
faa29f9ae0
Update antivir.class.php
2018-08-28 01:34:42 +02:00
Norbert Penel
f9c1dd8edd
There is a begin transaction without rollback
...
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
2018-08-28 01:32:55 +02:00
Laurent Destailleur
aadc278fb4
Merge pull request #9294 from homer8173/patch-3
...
FIX There is a begin transaction without rollback
2018-08-28 01:32:21 +02:00
Laurent Destailleur
751fc512af
Merge pull request #9301 from frederic34/patch-26
...
FIX sql error
2018-08-28 01:30:25 +02:00
Laurent Destailleur
e00d6eda7e
Update productlot_list.php
2018-08-28 01:29:33 +02:00
Laurent Destailleur
004b352e8e
Merge pull request #9279 from frederic34/patch-11
...
FIX Error message when sending a file with .virus extension
2018-08-28 01:26:04 +02:00
Laurent Destailleur
61254dd5c6
Merge pull request #9288 from ptibogxiv/patch-39
...
FIX sync user->member
2018-08-28 01:21:51 +02:00
Laurent Destailleur
3032ba4acf
Merge pull request #9287 from ptibogxiv/patch-38
...
FIX sync member->user
2018-08-28 01:21:23 +02:00
Steve
6ecc6b8b48
Merge pull request #1 from Dolibarr/develop
...
update fork
2018-08-28 00:10:26 +02:00
Laurent Destailleur
0300991389
Fix trans
2018-08-27 23:42:47 +02:00
Laurent Destailleur
90c3f8afce
Fix trans
2018-08-27 23:39:11 +02:00
Laurent Destailleur
d2154e72c0
Fix trans
2018-08-27 23:23:49 +02:00
Marc de Lima Lucio
d09f9b2543
FIX: customer/supplier card: add simple tooltip to amount boxes
2018-08-27 18:19:42 +02:00
gauthier
79aa390fe8
FIX : table llx_chargessociales doesn't exists
2018-08-27 15:07:19 +02:00
Laurent Destailleur
8cacda1c1e
Fix error message
2018-08-27 14:45:20 +02:00
atm-ph
d9beb3f882
Fix tms missing in fetch propal
2018-08-27 10:19:07 +02:00
atm-quentin
ec9eeb5201
FIX check !empty exclude select element
2018-08-27 10:17:18 +02:00
Jean Traullé
e0c2dd0c3c
Fix of an oversight when swapping parameters
2018-08-26 21:57:07 +02:00
Jean Traullé
d348ac83bb
Fix Travis CI Code reported coding style issues
2018-08-26 20:16:21 +02:00
Jean Traullé
e035a688f0
Keep params order in sync between @parm, @url annotations and function signature.
2018-08-26 19:41:32 +02:00
Jean Traullé
cc7ca8c7fa
Opening brakets should be on new lines
2018-08-26 18:15:14 +02:00
atm-ph
eb4e42bc40
Fix datec and tms missing in fetch method for API
2018-08-26 18:08:10 +02:00
Jean Traullé
d8e15e529c
New REST API improvements to thirdparties bank accounts and gateways
...
- API endpoints has been added and documented to allow user to add, update and delete payment gateways like the one used by Stripe module (stored in table llx_societe_account)
- API endpoints for CompanyBankAccounts has been slightly modified to be harmonized with other API endpoints (this should not be a problem since these methods are not yet in Dolibarr latest stable version (aka 8.0))
- Some documentation has been improved (to be shown in REST explorer)
- societeaccount.class.php has been slightly modified to include missing $login member ; notnull value of member fk_website is now -1 to put it to NULL when updating the record.
2018-08-26 17:29:04 +02:00
Jean Traullé
c0f98ab4c8
New REST API Explorer branding and improvements
...
- Header of REST API Explorer has been Dolibarr colored
- API Methods are now sorted alphabetically
- API endpoints with same names are now sorted in this order (GET, POST, PUT, PATCH, DELETE)
2018-08-26 17:13:19 +02:00
Frédéric FRANCE
27978ed9a0
Update productlot_list.php
...
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series
2018-08-26 07:47:33 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-25 09:07:04 +02:00
ksar-ksar
a844855ade
Update hook formConfirm
...
The hook should be called when the $formconfirm is not empty
2018-08-24 16:40:26 +02:00
Laurent Destailleur
a896fb419f
Fix preselected language
2018-08-24 15:28:53 +02:00
Laurent Destailleur
e67e32c023
Add forcecombo on select language
2018-08-24 15:25:18 +02:00
Laurent Destailleur
b22d9db1a5
Fix tdclass
2018-08-24 15:18:19 +02:00
Laurent Destailleur
4885e61240
Fix tdclass
2018-08-24 15:16:03 +02:00
Laurent Destailleur
9f92974e98
Fix tdclass
2018-08-24 15:13:34 +02:00
Laurent Destailleur
32bde2c375
Add tdclass to form confirm for more control
2018-08-24 15:12:47 +02:00
Laurent Destailleur
d2a7c9976b
Fix syntax error
2018-08-24 15:05:57 +02:00
Laurent Destailleur
07407f46a7
Remove colspan
2018-08-24 15:02:19 +02:00
Laurent Destailleur
79aa0bbd1c
Fix duplicate load
2018-08-24 12:28:44 +02:00
Laurent Destailleur
a153b2f121
Fix bad link
2018-08-24 11:54:04 +02:00
Laurent Destailleur
085f8cf604
Fix bad link
2018-08-24 11:51:06 +02:00
Laurent Destailleur
89d55f3b46
Fix lib in modulebuilder
2018-08-24 11:45:22 +02:00
Laurent Destailleur
32594e8048
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-24 10:47:10 +02:00
Laurent Destailleur
a82d86cec4
FIX warning for late template invoices to remove when suspended
2018-08-24 10:46:47 +02:00
Frédéric FRANCE
85ae8f3901
Update card.php
2018-08-24 09:29:17 +02:00
Laurent Destailleur
64427dafb6
Fix back to page when canceling an edit in the module template
2018-08-23 20:21:27 +02:00
Laurent Destailleur
781a55429a
FIX API template to delete a record
2018-08-23 20:03:41 +02:00
Laurent Destailleur
7a35b560a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-23 19:51:52 +02:00
Laurent Destailleur
499d93b8c4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/projet/class/task.class.php
htdocs/projet/tasks/task.php
2018-08-23 19:50:58 +02:00
Laurent Destailleur
62b2981e42
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-08-23 19:47:31 +02:00
Laurent Destailleur
019ff534a0
FIX api template for list in module builder
2018-08-23 19:46:08 +02:00
Laurent Destailleur
8757392e6b
FIX remove internal property isextrafieldmanaged from API returns
2018-08-23 19:24:00 +02:00
Laurent Destailleur
e6acacee4b
Fix cleandata method of modulebuilder template of AAPI
2018-08-23 19:19:25 +02:00
Philippe GRAND
30992f2730
Standardize and update code
2018-08-23 18:52:47 +02:00
Philippe GRAND
87067b2bc9
Standardize and update code
2018-08-23 18:35:45 +02:00
Philippe GRAND
215677c972
Standardize and update code
2018-08-23 18:17:09 +02:00
Laurent Destailleur
e2e09f8534
Fix hookmanager var
2018-08-23 17:56:16 +02:00
Laurent Destailleur
61ced8220b
Fix sample doc
2018-08-23 17:49:14 +02:00
Norbert Penel
92b0668e3e
There is a begin transaction without rollback
...
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
2018-08-23 17:40:40 +02:00
Frédéric FRANCE
6abd5d478a
Update functions.lib.php
2018-08-23 17:15:14 +02:00
Philippe GRAND
2fa82edd39
Standardize and update code
2018-08-23 17:07:27 +02:00
Philippe GRAND
74ce0bfea6
Standardize and update code
2018-08-23 16:54:24 +02:00
Frédéric FRANCE
58d339597b
Create index.html
2018-08-23 15:44:33 +02:00
Frédéric FRANCE
343e6ce8b3
typo
2018-08-23 14:34:27 +02:00
Philippe GRAND
80b7229174
Standardize and update code
2018-08-23 11:34:55 +02:00
Philippe GRAND
9e900e583d
Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018
2018-08-23 11:13:54 +02:00
Philippe GRAND
aafa16afa5
Update and standardize code
2018-08-23 11:11:46 +02:00
Philippe Grand
f98d2078e2
Merge branch 'develop' into new_branch_20_06_2018
2018-08-23 10:41:34 +02:00
ptibogxiv
bcd7833af0
Fix sync user->member
...
add more fields
2018-08-23 10:16:33 +02:00
Philippe Grand
20e7fc0969
Update livraison.class.php
2018-08-23 10:11:40 +02:00
Philippe Grand
b817517997
Update fournisseur.product.class.php
2018-08-23 10:08:17 +02:00
ptibogxiv
b2a438b384
fix sync user/member
...
add more fields to sync
2018-08-23 10:06:32 +02:00
Philippe Grand
0e3c9ffd51
Update fournisseur.facture.class.php
2018-08-23 10:05:02 +02:00
Philippe Grand
e09f7bedd0
Update commonobject.class.php
2018-08-23 09:57:19 +02:00
Frédéric FRANCE
692352e0e4
Update propal.lib.php
2018-08-22 22:55:12 +02:00
Frédéric FRANCE
f815915318
Update actions_ticket.class.php
2018-08-22 22:51:09 +02:00
Philippe Grand
3309badd8d
Update accountingaccount.class.php
2018-08-22 22:43:17 +02:00
Philippe Grand
9b2e754b46
Update advtargetemailing.class.php
2018-08-22 22:41:22 +02:00
Philippe Grand
eeaa257f11
Update cactioncomm.class.php
2018-08-22 22:39:51 +02:00
Philippe Grand
c626dcb710
Update actioncomm.class.php
2018-08-22 22:38:00 +02:00
Philippe Grand
4066af99e0
Update bookmark.class.php
2018-08-22 22:37:02 +02:00
Philippe Grand
d03900c6f8
Update bookmark.class.php
2018-08-22 22:36:07 +02:00
Philippe Grand
92cb9c4204
Update adherentstats.class.php
2018-08-22 22:35:04 +02:00
Philippe Grand
ec8422af73
Update accountingaccount.class.php
2018-08-22 22:31:54 +02:00
Philippe Grand
25b1b08d92
Update accountancysystem.class.php
2018-08-22 22:30:09 +02:00
Philippe Grand
137b715868
Update deplacementstats.class.php
2018-08-22 22:28:33 +02:00
Philippe GRAND
0c75c41e7b
Update and standardize code
2018-08-22 19:56:24 +02:00
Philippe GRAND
06da7f54a2
Update and standardize code
2018-08-22 18:48:53 +02:00
Philippe GRAND
504b0e3d16
Update and standardize code
2018-08-22 18:34:50 +02:00
Philippe GRAND
449ef9c464
Update and standardize code
2018-08-22 18:12:44 +02:00
Frédéric FRANCE
96f16b7497
Update commondocgenerator.class.php
2018-08-22 17:29:05 +02:00
Frédéric FRANCE
0334409d18
Update card.php
2018-08-22 13:43:30 +02:00
Laurent Destailleur
b650f7ac17
Fix tab
2018-08-22 13:37:18 +02:00
Laurent Destailleur
de2cdfc70f
FIX Language selection lost if error during creation of email template
2018-08-22 13:23:46 +02:00
Laurent Destailleur
c7a241a5db
FIX Get templates in a forced language
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2018-08-22 13:22:49 +02:00
Laurent Destailleur
c20d556265
FIX Get templates in a forced language
2018-08-22 13:16:55 +02:00
Philippe GRAND
6542dcf0bd
Update and standardize code
2018-08-22 12:04:50 +02:00
Frédéric FRANCE
d1d6d81f8f
Update antivir.class.php
2018-08-22 11:53:08 +02:00
Philippe GRAND
e0462b975b
Update and standardize code
2018-08-22 11:48:26 +02:00
Philippe GRAND
95349365ba
Update and standardize code
2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
a36061079b
Update and standardize code
2018-08-22 11:11:59 +02:00
Philippe GRAND
d91b1fd895
Update and standardize code
2018-08-22 11:06:34 +02:00
Philippe GRAND
29f15b4ae6
Update and standardize code
2018-08-22 10:51:55 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
c76a33fb4f
remove superfluous spaces
2018-08-21 20:12:27 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Laurent Destailleur
3f4714416d
Clean comment
2018-08-21 18:58:10 +02:00
Laurent Destailleur
f8b3ec7b87
Fix PHPCS
2018-08-21 18:57:34 +02:00
Frédéric FRANCE
41ac5dfd29
Merge branch 'develop' into patch-18
2018-08-21 16:02:43 +02:00
Laurent Destailleur
4d8e5ab0e6
Fix PHPCS
2018-08-21 14:58:20 +02:00
Laurent Destailleur
cd09052e80
FIX badge on time spent on project and tasks
2018-08-21 14:52:22 +02:00
Laurent Destailleur
3cfc47a732
Fix urls in project module
2018-08-21 14:41:59 +02:00
Frédéric FRANCE
ca6461ea2d
align parameters
2018-08-21 14:30:06 +02:00
Laurent Destailleur
21a9fd625f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-21 14:15:22 +02:00
Laurent Destailleur
5f6c165fb6
Module builder is stable
2018-08-21 14:14:27 +02:00
Laurent Destailleur
b86d54cab3
Trad
2018-08-21 14:05:53 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
9dbb0eaab0
Fix cron task label
2018-08-21 14:01:03 +02:00
Laurent Destailleur
243cbbc11d
Fix missing trans
2018-08-21 13:58:24 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
4fdd521d61
Merge pull request #8671 from ATM-Nicolas/fix_comments_on_tasks
...
FIX : Fetch task will now fetch comments
2018-08-21 13:36:20 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123
...
New : Add total price on dashboard
2018-08-21 13:33:33 +02:00
Laurent Destailleur
edb210d7cc
Update index.php
2018-08-21 13:33:07 +02:00
Laurent Destailleur
39f7d4a011
Merge pull request #8975 from atm-greg/Add_hook_on_replenish
...
add hooks on stock replenish
2018-08-21 13:28:18 +02:00
Laurent Destailleur
0ee7befa19
Update replenish.php
2018-08-21 13:27:49 +02:00
Laurent Destailleur
5effcd222f
Merge pull request #9150 from frederic34/variant
...
code cleaning
2018-08-21 13:21:11 +02:00
Laurent Destailleur
5e09d5160f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-21 13:17:20 +02:00
Laurent Destailleur
0f1e5a78c6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-21 13:17:11 +02:00
Laurent Destailleur
7103bfd7aa
Merge pull request #9253 from frederic34/patch-11
...
Update list.php
2018-08-21 13:11:26 +02:00
Laurent Destailleur
009424cd67
Merge pull request #9226 from atm-greg/Fix_project_delete_tasks
...
Fix project delete tasks
2018-08-21 13:11:00 +02:00
Laurent Destailleur
91bfa4be6c
Update project.class.php
2018-08-21 13:10:20 +02:00
Laurent Destailleur
3523c2b3d2
Update project.class.php
2018-08-21 13:09:06 +02:00
Frédéric FRANCE
fb3754af59
Update fichinter.class.php
2018-08-21 12:54:25 +02:00
Frédéric FRANCE
9a5f839e63
Update actions_printing.inc.php
2018-08-21 12:54:02 +02:00
Laurent Destailleur
a414aeb29e
Merge pull request #9266 from frederic34/patch-21
...
Update propal.lib.php
2018-08-21 12:53:37 +02:00
Laurent Destailleur
f5e82365c3
Merge pull request #9263 from frederic34/patch-20
...
Update fichinter.class.php
2018-08-21 12:53:10 +02:00
Laurent Destailleur
866f9c4cf7
Merge pull request #9259 from frederic34/patch-18
...
Update actions_printing.inc.php
2018-08-21 12:52:54 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018
...
standardize code
2018-08-21 12:52:34 +02:00
Laurent Destailleur
8032c314d4
Merge pull request #9252 from bugness-chl/8.0-2
...
FIX adding GROUP BY for PostgreSQL
2018-08-21 12:51:56 +02:00
Laurent Destailleur
cd7c46794a
Merge pull request #9260 from frederic34/patch-19
...
FIX propal.class.php
2018-08-21 12:49:25 +02:00
Laurent Destailleur
93be5fe7c0
Merge pull request #9270 from ptibogxiv/patch-37
...
fix duration display for service in list.php
2018-08-21 12:15:57 +02:00
Laurent Destailleur
c25a968c72
Update list.php
2018-08-21 12:15:47 +02:00
Laurent Destailleur
a10b4da6ac
Update list.php
2018-08-21 12:13:07 +02:00
Laurent Destailleur
a73d2447d9
Update list.php
2018-08-21 12:10:05 +02:00
Laurent Destailleur
a369822e5a
Fix export/import web site
2018-08-20 21:00:45 +02:00
Laurent Destailleur
36c7007aaa
Add control to avoid duplicate aliases
2018-08-20 19:10:33 +02:00
Laurent Destailleur
27e2810e10
Fix date format
2018-08-20 17:14:03 +02:00
ptibogxiv
d5aed3394d
fix duration display for service in list.php
2018-08-20 09:52:59 +02:00
Laurent Destailleur
26d34422b0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-19 03:01:26 +02:00
Laurent Destailleur
795b2f3d58
FIX Delete file on smartphone
2018-08-19 03:00:11 +02:00
Laurent Destailleur
547a0aaac7
FIX Look and feel v8
2018-08-19 02:43:45 +02:00
Laurent Destailleur
116f4a1a09
Fix responsive
2018-08-19 02:22:12 +02:00
Laurent Destailleur
d8365e9260
Module DAV
2018-08-19 02:17:12 +02:00
Laurent Destailleur
cca0f4bf22
Fix translation
2018-08-19 02:01:18 +02:00
Laurent Destailleur
38f3452f0c
Fix trans
2018-08-19 01:51:45 +02:00
torvista
710ce6a9f7
Add description to database prefix field to avoid confusion when not specifying a database prefix.
2018-08-19 00:09:34 +02:00
torvista
8426f0e6cb
Main url auto-filled field was hardcoded as http: easy to overlook this when running installer via https.
...
This sets protocol to be the same as the installer page.
2018-08-18 23:45:20 +02:00
Philippe Grand
ccdae4c597
Update html.formadvtargetemailing.class.php
2018-08-18 19:15:25 +02:00
Frédéric FRANCE
391995c09b
Update propal.lib.php
2018-08-18 17:26:42 +02:00
Philippe GRAND
c8c8af55a0
Typo
2018-08-18 15:56:23 +02:00
Laurent Destailleur
9a82cc3261
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-18 02:55:49 +02:00
Laurent Destailleur
dedfd6d493
Fix missing translation
2018-08-18 02:55:22 +02:00
Philippe GRAND
da951e61f2
Update and standardize code
2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +02:00
Philippe GRAND
edb566501d
Update and standardize code
2018-08-17 18:54:41 +02:00
Philippe GRAND
78e9e05f95
Update and standardize code
2018-08-17 18:35:51 +02:00
Philippe GRAND
a31ad5af3d
standardize code
2018-08-17 17:55:00 +02:00
Frédéric FRANCE
c8ad215840
Update fichinter.class.php
2018-08-17 15:56:23 +02:00
Frédéric FRANCE
71d3af8b07
Update propal.class.php
2018-08-17 13:44:07 +02:00
Frédéric FRANCE
3afcf50d07
Update actions_printing.inc.php
2018-08-17 11:21:02 +02:00
Laurent Destailleur
8ac3b01f04
NEW Can export/import a website template
2018-08-16 23:57:19 +02:00
Laurent Destailleur
ab22c9d0de
Work on import
2018-08-16 21:48:16 +02:00
Cédric
fe6779c223
Erreur de syntaxe ( + au lieu de . )
2018-08-16 17:20:38 +02:00
Frédéric FRANCE
d68f176e7e
replace obsolete phpcs tags
2018-08-16 14:59:06 +02:00
Laurent Destailleur
4e02b134da
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-16 14:50:04 +02:00
Laurent Destailleur
4c52384609
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-08-16 14:47:56 +02:00
Laurent Destailleur
7075fdf8f5
NEW Can add autorefresh=X in any URLs to refresh page after X seconds
2018-08-16 14:47:12 +02:00
Laurent Destailleur
f7da76e1c0
Use session cache for stats
2018-08-16 14:24:59 +02:00
Frédéric FRANCE
e63a748a70
Update list.php
2018-08-16 11:59:58 +02:00
Laurent Destailleur
1b1258b2ef
Fix url in tooltip
2018-08-16 11:19:22 +02:00
Laurent Destailleur
71c1d2275b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-16 11:18:18 +02:00
Laurent Destailleur
bbd19010d0
Fix url in tooltip
2018-08-16 11:18:03 +02:00
Laurent Destailleur
9f5cc2d05f
Fix menu entry
2018-08-16 10:33:20 +02:00
Laurent Destailleur
1922c3d881
Fix menu entry
2018-08-16 10:32:42 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Chl
9e8485c279
FIX adding GROUP BY for PostgreSQL
2018-08-16 01:14:42 +02:00
Laurent Destailleur
2719c4eb43
Fix escape
2018-08-16 01:01:38 +02:00
Laurent Destailleur
4b7889b295
Fix left join broken
2018-08-16 01:00:38 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
...
return comment
2018-08-16 00:35:39 +02:00
Laurent Destailleur
55bfe4e821
Merge pull request #9245 from grandoc/new_branch_14_08_2018
...
Standardize code
2018-08-16 00:33:33 +02:00
Laurent Destailleur
2a69fa39d6
error message
2018-08-16 00:18:08 +02:00
Laurent Destailleur
4610b193bb
Add error message
2018-08-16 00:13:13 +02:00
Laurent Destailleur
ae9867eead
Work on website import
2018-08-16 00:03:19 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Laurent Destailleur
7d6e25789c
Fix popup customer
2018-08-15 15:07:23 +02:00
Laurent Destailleur
15144a2473
Prepare 8.0.1
2018-08-15 14:42:34 +02:00
Laurent Destailleur
5a1a6ac095
Fix error message
2018-08-15 14:42:03 +02:00
Frédéric FRANCE
7bb781eea8
function declaration
2018-08-15 14:28:34 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Laurent Destailleur
b88c657a4a
Work on website import
2018-08-15 14:24:33 +02:00
Philippe GRAND
57f51fda3e
Standardize
2018-08-15 12:48:13 +02:00
Laurent Destailleur
37ca3ff230
Fix separator
2018-08-14 20:51:24 +02:00
Frédéric FRANCE
2bb4c30aac
remove superfluous space
2018-08-14 15:59:15 +02:00
Frédéric FRANCE
c0478cb42f
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-14 15:54:40 +02:00
Frédéric FRANCE
5146ab9177
trim
2018-08-14 15:34:44 +02:00
Frédéric FRANCE
d25fa61998
return comment
2018-08-14 13:14:55 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
florian HENRY
20309665e6
fix : ODT project substitution
2018-08-14 10:45:08 +02:00
Frédéric FRANCE
3210181a3d
rule for private function is different
2018-08-14 10:21:34 +02:00
Philippe GRAND
e35da2f84d
Standardize code
2018-08-14 09:55:58 +02:00
atm-greg
ba6f7d4b0a
fix infinite loop
2018-08-14 09:32:43 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-14 09:02:12 +02:00
Laurent Destailleur
7c6f41e04f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-13 23:58:18 +02:00
Laurent Destailleur
fa4a12be41
Merge pull request #9208 from ptibogxiv/patch-33
...
fix connect mode for v8 release
2018-08-13 23:56:42 +02:00
Laurent Destailleur
848fcc4b17
Update actions_setnotes.inc.php
2018-08-13 23:53:48 +02:00
Laurent Destailleur
f382d8f0bb
Update actions_setnotes.inc.php
2018-08-13 23:52:33 +02:00
Laurent Destailleur
b98ee516d0
Merge pull request #9235 from grandoc/new_branch_13_08_2018
...
standardize code
2018-08-13 23:47:00 +02:00
Laurent Destailleur
b4a4ab4fa0
Merge pull request #9233 from grandoc/new_branch_12_08_2018
...
standardize code
2018-08-13 23:46:37 +02:00
Laurent Destailleur
3039e0e5ef
Merge pull request #9237 from CelineDesign/develop
...
NEW #9236 Allow to import expedtion lines via API
2018-08-13 23:44:26 +02:00
delcroix Patrick
3b9266060c
Fix #9205 quote in Label/number on supplier payment
...
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
2018-08-13 23:42:18 +02:00
Laurent Destailleur
e325da9339
Merge pull request #9244 from delcroip/patch-16
...
Fix #9205 quote in Label/number on supplier payment
2018-08-13 23:41:02 +02:00
Laurent Destailleur
577d2d728c
Merge pull request #9238 from ptibogxiv/patch-35
...
Fix dolibarr_set_const
2018-08-13 23:39:42 +02:00
Laurent Destailleur
5e762fe712
Fix cloning website switch on new web site
2018-08-13 23:22:20 +02:00
Laurent Destailleur
2cbbb6e622
Prepare 8.0.0 release
2018-08-13 23:04:58 +02:00
delcroix Patrick
cbdd1949df
Fix #9205 quote in Label/number on supplier payment
...
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
2018-08-13 20:39:20 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
0b5a87a443
Update modules_holiday.php
2018-08-13 17:25:41 +02:00
Laurent Destailleur
33f0172603
Fix select zip/town
2018-08-13 16:44:49 +02:00
Laurent Destailleur
f96dd391fa
Fix error in foreign key pointing to old table
2018-08-13 16:11:23 +02:00
Laurent Destailleur
df57bd176b
Fix translation
2018-08-13 14:53:04 +02:00
ptibogxiv
d0666a9583
Fix incorrect entity
2018-08-13 14:34:54 +02:00
Laurent Destailleur
b977c3a9f5
Fix translation
2018-08-13 14:04:10 +02:00
ptibogxiv
c6adeabb55
Fix dolibarr_set_const
2018-08-13 12:22:51 +02:00
Sébastien Couragier
e58c03d7b9
#9236 Allow to import expedtion lines via API
2018-08-13 11:59:55 +02:00
Philippe GRAND
e9adc9fc8e
Standardize code
2018-08-13 11:25:48 +02:00
Philippe GRAND
f1f64db4dc
standardize code
2018-08-13 10:20:21 +02:00
Frédéric FRANCE
5d0d8d10fc
remove superfluous spaces
2018-08-13 09:00:22 +02:00
Frédéric FRANCE
1b27cca91c
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-13 08:53:07 +02:00
Laurent Destailleur
d92096f74a
Fix menu payment not required if only module bank on
2018-08-13 02:04:38 +02:00
Laurent Destailleur
6a8ed56c3d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-13 01:23:43 +02:00
Laurent Destailleur
31c42c9a32
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/societe/canvas/actions_card_common.class.php
2018-08-13 01:23:03 +02:00
Laurent Destailleur
21555a7435
Fix firstname/lastname
2018-08-13 01:10:51 +02:00
Philippe GRAND
dc3a2ac26e
standardize code
2018-08-12 22:40:47 +02:00
Laurent Destailleur
d09850522b
Fix migration
2018-08-12 22:27:54 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Frédéric FRANCE
6113b536a0
remove superfluous spaces
2018-08-12 19:59:39 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 19:54:03 +02:00
ptibogxiv
4d34725b23
Define introduce principal entity
...
define which entity must be use as principal with no fee and everything else (cf stripe API)
2018-08-12 19:42:07 +02:00
ptibogxiv
dd9751c9cf
Fix statement descriptor $soc->name
2018-08-12 19:36:41 +02:00
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Laurent Destailleur
61a5be6e2a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-08-12 19:19:21 +02:00
Laurent Destailleur
234b0d3120
Merge pull request #9230 from ATM-Nicolas/fix_withdraw_pagination
...
FIX : Pagination on withdraw request list
2018-08-12 19:18:57 +02:00
Laurent Destailleur
b81b6b651f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-08-12 19:17:26 +02:00
Jan
ddbfaf0788
wrong position of counter reset
...
extrafields will work now ;) and not the first product gets the last extrafields values
2018-08-12 19:16:49 +02:00
Laurent Destailleur
1ca17fb781
Merge pull request #9229 from Conspir3D/patch-2
...
fix: wrong position of counter reset
2018-08-12 19:16:15 +02:00
Laurent Destailleur
b11d5c2f71
Merge pull request #9228 from atm-florian/8.0
...
fix : remove comment on commit
2018-08-12 19:13:07 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description
...
NEW Can record the supplier product description
2018-08-12 18:56:27 +02:00
Laurent Destailleur
719c5c8e2f
Update stripe.class.php
2018-08-12 18:34:28 +02:00
Laurent Destailleur
be7a764de7
Merge pull request #9202 from atm-florian/7.0
...
fix bad use of test_sql_and_script_inject return int not value tested
2018-08-12 18:24:54 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
2f559a7edb
Merge pull request #9199 from atm-quentin/FIX_hook_update_price
...
NEW Add hook changeRoundingMode in update_price
2018-08-12 18:17:52 +02:00
Laurent Destailleur
35c22b231f
Merge pull request #9223 from grandoc/new_branch_08_08_2018
...
Standardize
2018-08-12 18:12:18 +02:00
Laurent Destailleur
56d8935976
Merge pull request #9181 from ATM-Nicolas/fix_dolGetFirstLastname
...
FIX : Wrong position of firstname lastname
2018-08-12 18:11:36 +02:00
Laurent Destailleur
6954ab00f9
Update functions.lib.php
2018-08-12 18:11:27 +02:00
Laurent Destailleur
4c269f321c
Merge pull request #9222 from pa-de-solminihac/develop
...
FIX massaction builddoc: include PDF files created from an ODT template
2018-08-12 18:02:55 +02:00
Laurent Destailleur
9e170c89b8
Update actions_massactions.inc.php
...
Try another change to include PDF generated from ODX without including files uploaded manually.
2018-08-12 18:02:40 +02:00
Laurent Destailleur
8d03d58d54
Merge pull request #9209 from ptibogxiv/patch-34
...
Fix 3D secure
2018-08-12 17:42:42 +02:00
Laurent Destailleur
3d4d42462c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
gauthier
391230babc
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281)
2018-08-10 15:39:49 +02:00
ATM-Nicolas
d8d54d246c
FIX : Pagination on withdraw request list
2018-08-10 15:05:21 +02:00
Laurent Destailleur
39f4eae07e
Fix look and feel v8
2018-08-09 23:11:49 +02:00
Laurent Destailleur
1af9700a58
Fix responsive
2018-08-09 22:52:43 +02:00
Laurent Destailleur
2dbb6e258b
FIX Can filter on month in export of blockedlog
...
FIX Fingerprint correct in popup
2018-08-09 22:29:02 +02:00
Jan
c007ea62a7
wrong position of counter reset
...
extrafields will work now ;) and not the first product gets the last extrafields values
2018-08-09 20:57:32 +02:00
florian HENRY
f0a32a2dea
fix : remove comment on commit
2018-08-09 20:41:15 +02:00
Laurent Destailleur
9b50bc2197
Fix css
2018-08-09 19:29:48 +02:00
florian HENRY
06189f8153
Merge branch '6.0' into 6.0_fhe
2018-08-09 18:31:59 +02:00
florian HENRY
9024ed9e61
Merge branch '7.0' into 7.0_fhe
2018-08-09 17:47:21 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3
2018-08-09 14:46:00 +02:00
atm-greg
3d84adbd76
fix recurcivity
2018-08-09 12:21:48 +02:00
atm-greg
4e16f64af0
Fix project::delete to delete children tasks before parent tasks
2018-08-09 12:13:06 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3
2018-08-09 11:31:48 +02:00
Frédéric FRANCE
b00164ca39
test phpcs v3
2018-08-09 11:03:50 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-08-08 17:31:23 +02:00
Laurent Destailleur
63898b205e
Clean ckeditor menu
2018-08-08 17:09:51 +02:00
Laurent Destailleur
d79778a67e
Fix reponsive
2018-08-08 17:00:16 +02:00
Laurent Destailleur
de1386c83c
Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0
2018-08-08 16:49:09 +02:00
Philippe GRAND
5b8b4a1415
Standardize
2018-08-08 12:29:36 +02:00
pa-de-solminihac
fc5481fb1d
FIX massaction builddoc: include PDF files created from an ODT template too
2018-08-08 12:04:10 +02:00
Juanjo Menent
948bb47040
Merge pull request #9207 from atm-florian/dev_showadressinthirdpartylistoption
...
NEW: Add option to display thirdparty adress in combolist
2018-08-08 11:14:22 +02:00
Juanjo Menent
ca7666793b
Merge pull request #9213 from fmarcet/develop
...
New: Sales representative column on Propal List
2018-08-08 11:11:20 +02:00
Juanjo Menent
e2499392a9
Merge pull request #9215 from fmarcet/7.0
...
Fix: Bad position when document have incoterms/notes
2018-08-08 11:10:47 +02:00
Juanjo Menent
b840152bcd
Merge pull request #9217 from ATM-Nicolas/fix_undefined_index_notnull
...
FIX : PHP warning, undefined index notnull
2018-08-08 11:10:17 +02:00
Juanjo Menent
1dbec93144
Merge pull request #9216 from atm-gauthier/NEW_tag_fourn
...
NEW : tag odt line_product_ref_fourn for supplier doc lines
2018-08-08 11:09:01 +02:00
Juanjo Menent
229a5d3532
Merge pull request #9203 from grandoc/new_branch_04_08_2018
...
comment translation
2018-08-08 11:07:18 +02:00
Juanjo Menent
edc67f62a9
Merge pull request #9200 from hregis/develop_accounting
...
FIX better compatibility with Multicompany
2018-08-08 11:05:12 +02:00
ptibogxiv
ba943bcbaa
fix spaces
2018-08-08 10:13:28 +02:00
ptibogxiv
78edd035f8
add statement descriptor as newpayment.php
2018-08-08 10:12:25 +02:00
Frédéric FRANCE
5f4d54ede5
correct space
2018-08-07 17:17:58 +02:00
Frédéric FRANCE
69321c47be
correct space
2018-08-07 17:11:41 +02:00
Frédéric FRANCE
cb53366955
Merge remote-tracking branch 'upstream/develop' into variant
2018-08-07 16:55:50 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
gauthier
a2a8929d0e
NEW : tag odt line_product_ref_fourn for supplier doc lines
2018-08-07 11:45:56 +02:00
Ferran Marcet
5ce31f65a4
Fix: Bad position when document have incoterms/notes
2018-08-07 11:40:11 +02:00
Philippe GRAND
68de0ba93b
clean and update code
2018-08-07 10:56:59 +02:00
Philippe GRAND
42fe2b78de
clean and update code
2018-08-07 10:44:26 +02:00
atm-greg
294045daed
update description without multicurrency
2018-08-07 10:16:04 +02:00
Ferran Marcet
c74ffade7d
New: Sales representative column on Propal List
2018-08-07 10:05:50 +02:00
atm-greg
be63f0dc89
add migration for desc_fourn
2018-08-07 09:49:57 +02:00
ATM-Nicolas
5b15e688af
FIX : PHP warning, undefined index notnull
2018-08-07 09:38:18 +02:00
atm-greg
ad5f59822e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
c1de7fe8ac
fix update_buyprice
2018-08-07 09:15:30 +02:00
ptibogxiv
e84018ac15
Fix 3D secure
...
convett to dolibarr standard stripe payment metadata
2018-08-06 19:21:12 +02:00
atm-greg
08273612d9
create field without migration
2018-08-06 17:21:20 +02:00
atm-greg
7063850034
add sql field
2018-08-06 16:32:25 +02:00
atm-greg
a8b33a1710
New fields desc_supplier on product_fourn_prices
2018-08-06 16:26:25 +02:00
ptibogxiv
e926efe022
fix connect mode for v8 release
2018-08-06 12:39:50 +02:00
ptibogxiv
f6e5b71f21
Fix and compatibility for V8 and connect
...
fix for V8 release and optimal functionnality with connect mode
2018-08-06 12:29:38 +02:00
Philippe GRAND
094fc6b699
Standardize
2018-08-06 11:53:33 +02:00
florian HENRY
74d05da149
fix : display if error
2018-08-06 11:28:34 +02:00
florian HENRY
847d5bfb92
add config
2018-08-06 10:55:28 +02:00
florian HENRY
45a52a955e
NEW: Add optoin to display thirdparty adress in combolist
2018-08-06 10:52:10 +02:00
Philippe GRAND
4e3898d357
standardize
2018-08-05 17:21:59 +02:00
Philippe GRAND
de5281e587
standerdize
2018-08-05 10:56:39 +02:00
Philippe GRAND
59cd0a5e5e
uniformize
2018-08-04 15:58:05 +02:00
ptibogxiv
3c15da9dde
Fix payment in connect mode
...
I know that it's not an optimal fix but it's functionnal for dolibarr 8.0.0 release
2018-08-04 14:30:52 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
florian HENRY
0d85eb52c5
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
2018-08-03 17:10:26 +02:00
florian HENRY
615ed11534
fix bad use of test_sql_and_script_inject return int not value tested
2018-08-03 17:09:58 +02:00
atm-quentin
09dfcc6016
FIX exclude element of the select
2018-08-03 14:54:21 +02:00
Regis Houssin
b1a340b193
FIX "account_parent" is linked with "account_number" instead rowid
2018-08-03 14:01:00 +02:00
Regis Houssin
fa32e48b8a
FIX change column "account_parent" and missing modify column
2018-08-03 13:53:12 +02:00
atm-quentin
c97e2db089
Merge branch '7.0' of github.com:Dolibarr/dolibarr into FIX_hook_update_price
2018-08-03 11:49:00 +02:00
atm-quentin
6662bf05ba
FIX hook on update price AND fix id on line
2018-08-03 11:47:43 +02:00
Philippe
61e1f0508d
FIX : Search on Ref project on order list
2018-08-03 11:08:09 +02:00
ATM-Nicolas
342a3ef663
NEW : Withdraw request massaction
2018-08-03 09:57:29 +02:00
ATM-Nicolas
70adfb135d
FIX : Missing behavior
2018-08-03 09:51:29 +02:00
Laurent Destailleur
b01f07efda
Merge branch 'develop' into FIX_project_overview
2018-08-02 18:43:55 +02:00
Laurent Destailleur
e106fda5e6
Merge pull request #9113 from torvista/export-import
...
Fix for Warning: A non-numeric value encountered in bank.lib.php on line 359
2018-08-02 18:38:46 +02:00
Laurent Destailleur
0e3473701a
Update bank.lib.php
2018-08-02 18:38:33 +02:00
Laurent Destailleur
6010d9de4b
Merge pull request #9158 from atm-gauthier/7.0_missing_hook
...
FIX : missing hook to edit sql
2018-08-02 18:36:25 +02:00
Laurent Destailleur
51effef629
Reset pagination when current page too high
2018-08-02 18:22:08 +02:00
Laurent Destailleur
17ed19503c
Code comment
2018-08-02 17:51:04 +02:00
Laurent Destailleur
12fdbcce59
Fix trigger name
2018-08-02 17:49:05 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters
...
FIX : page must always be 0 when we search
2018-08-02 17:48:35 +02:00
Laurent Destailleur
b5a0e14ffe
Merge pull request #9185 from atm-john/fix_situation_total_calcul
...
Important: fix situation line's total
2018-08-02 17:45:44 +02:00
ATM-Nicolas
f3090e4819
FIX : Wrong variable and trigger name
2018-08-02 16:05:54 +02:00
Philippe GRAND
ccabd2b859
Uniformize
2018-08-02 14:03:50 +02:00
Juanjo Menent
94ffda8862
Merge pull request #9188 from ptibogxiv/patch-30
...
update to Stripe Requirements and Best Practices
2018-08-02 11:37:49 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018
...
standardize
2018-08-02 11:27:02 +02:00
Juanjo Menent
5b3c6de06c
Merge pull request #9184 from atm-gauthier/7.0_fix_extrafieldkey
...
FIX : extrafieldkey
2018-08-02 11:24:19 +02:00
Juanjo Menent
1fbbaf2895
Merge pull request #9180 from atm-florian/7.0
...
FIX: keep context filter on contact list on change column displayed
2018-08-02 11:20:25 +02:00
Juanjo Menent
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3
...
NEW : Add project on salaries
2018-08-02 11:19:34 +02:00
Juanjo Menent
ce49230d71
Merge pull request #9177 from ATM-Nicolas/fix_preselect_project
...
FIX : Keep same project when creating shipping from order
2018-08-02 11:18:39 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
Juanjo Menent
03963dfe8a
Merge pull request #9163 from frederic34/nolink
...
fix no link in order list
2018-08-02 11:02:39 +02:00
Juanjo Menent
79a13403ae
Merge pull request #9162 from frederic34/extratotalize
...
NEW: Extrafield totalizable
2018-08-02 10:59:46 +02:00
Juanjo Menent
738caa605f
Merge pull request #9160 from hregis/develop_api
...
FIX compatibility with multicompany transverse mode
2018-08-02 10:57:27 +02:00
Juanjo Menent
e86a970332
Merge pull request #9156 from frederic34/patch-20
...
Update list.php
2018-08-02 10:56:01 +02:00
Juanjo Menent
f93519bc2e
Merge pull request #9155 from frederic34/patch-19
...
Update element_resource.php
2018-08-02 10:54:30 +02:00
Juanjo Menent
929d8fa66e
Merge pull request #9153 from frederic34/patch-17
...
Update payment.php
2018-08-02 10:52:07 +02:00
Juanjo Menent
ca717a7ce1
Merge pull request #9152 from frederic34/patch-12
...
Update card-rec.php
2018-08-02 10:50:50 +02:00
Juanjo Menent
82bdbd6f6e
Merge pull request #9151 from frederic34/patch-11
...
Update card.php
2018-08-02 10:50:05 +02:00
ptibogxiv
40b19b8e1d
update to Stripe Requirements and Best Practices
...
cf https://stripe.com/docs/partners/requirements
2018-08-01 11:50:43 +02:00
ptibogxiv
d50a95c89b
update to straipe
...
cf https://stripe.com/docs/building-plugins#setappinfo
2018-08-01 11:40:12 +02:00
Alexandre SPANGARO
ee61a88540
Small fix
2018-08-01 07:46:17 +02:00
florian HENRY
ceb85cfa45
fix : odt project and task extrafields management
2018-07-31 17:29:08 +02:00
gauthier
cadf931e8d
FIX : extrafieldkey
2018-07-31 15:02:51 +02:00
John BOTELLA
4ddca02bb9
fix situation line's total
2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b
FIX : Wrong position of firstname lastname
2018-07-31 12:15:18 +02:00
florian HENRY
5d19361782
fix: keep context filter on contact list on change column displayed
2018-07-31 11:39:54 +02:00
atm-quentin
37a4a0c488
fix for travis
2018-07-31 10:02:36 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3
2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0
New : Add project on salaries
2018-07-31 07:45:03 +02:00
STAGIAIRE-PC\Pierre
61995a3e02
Ajout d'une colonne indispensable dans la requete json
2018-07-30 17:34:43 +02:00
Philippe GRAND
d673848028
standardize
2018-07-30 17:28:44 +02:00
ATM-Nicolas
1536bbc65e
FIX : Keep same project when creating shipping from order
2018-07-30 15:16:53 +02:00
STAGIAIRE-PC\Pierre
ff8d31925b
ajout du parametre companyBankid
2018-07-30 09:37:41 +02:00
Philippe GRAND
fb565b15c5
standardize
2018-07-29 19:16:28 +02:00
Philippe GRAND
d1f100b0c9
standardize
2018-07-29 17:17:29 +02:00
tarrsalah
8278a9fa52
FIX filter supplier invoice list by societe name.
2018-07-29 13:18:05 +01:00
Philippe GRAND
de70bf983e
standardize
2018-07-29 13:40:35 +02:00
Philippe GRAND
69feb3af14
standardize
2018-07-29 11:33:52 +02:00
Philippe GRAND
892174cbf8
standardize
2018-07-29 10:29:12 +02:00
Frédéric FRANCE
7dada7ae8e
fix #8820
2018-07-29 09:15:42 +02:00
Philippe GRAND
36ea20b7d4
standardize
2018-07-28 18:03:14 +02:00
Philippe GRAND
9cc40fcb21
standardize
2018-07-28 17:26:56 +02:00
Philippe GRAND
f17275845d
standardize
2018-07-28 14:29:28 +02:00
Philippe GRAND
5a4524451c
standardize
2018-07-28 14:02:33 +02:00
All-3kcis
e9267c54ce
add include productfournisseur
2018-07-27 15:04:16 +02:00
Philippe GRAND
541e919ae0
Clean and update code
2018-07-27 14:49:33 +02:00
All-3kcis
a00150a3fb
Revert "Enable auto update PDF on update note"
...
This reverts commit 4c10efb7d3
2018-07-27 14:48:31 +02:00
All-3kcis
8d23aa305f
Move code into "htdocs/core/actions_setnotes.inc.php"
2018-07-27 14:47:22 +02:00
Regis Houssin
e1877625a0
FIX clean code
2018-07-27 13:42:44 +02:00
Laurent Destailleur
8ab03c469a
Fix migration
2018-07-27 13:42:32 +02:00
Laurent Destailleur
7af42c66cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
2018-07-27 12:54:45 +02:00
Laurent Destailleur
894f484de8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-07-27 12:34:02 +02:00
Laurent Destailleur
83ae27d122
FIX Deletion of files in migration
2018-07-27 12:33:36 +02:00
Philippe GRAND
4eacad52f2
Clean and update code
2018-07-27 10:06:56 +02:00
Frédéric FRANCE
b90d125fda
trim trailing
2018-07-26 20:19:52 +02:00
Frédéric FRANCE
526ea496ee
trim trailing
2018-07-26 19:26:03 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Frédéric FRANCE
8312d95174
trim trailing
2018-07-26 18:22:16 +02:00
Frédéric FRANCE
c991a4d204
trim trailing
2018-07-26 18:05:20 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
atm-quentin
1297470c99
FIX project overview (can use any fields as fk_projet)
2018-07-26 15:05:32 +02:00
Frédéric FRANCE
fa2de55109
test include
2018-07-26 11:50:54 +02:00
Frédéric FRANCE
3f4db55614
test include
2018-07-26 11:34:51 +02:00
Frédéric FRANCE
0952cf5e2b
fix no link in order list
2018-07-26 10:43:50 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable
2018-07-26 09:41:44 +02:00
Philippe GRAND
efa6ad0659
Clean and update code
2018-07-25 19:05:40 +02:00
Regis Houssin
e48eec583d
FIX compatibility with multicompany transverse mode
2018-07-25 17:00:49 +02:00
Philippe GRAND
ff04cb64c0
Clean and update code
2018-07-25 15:36:50 +02:00
Philippe GRAND
7d5464cfbc
Clean and update code
2018-07-25 15:25:23 +02:00
Frédéric FRANCE
53469ee424
Update card-rec.php
2018-07-25 11:45:52 +02:00
gauthier
c95d6271a9
FIX : missing hook to edit sql
2018-07-25 11:15:13 +02:00
Frédéric FRANCE
08c4baad24
Update list.php
2018-07-25 10:15:34 +02:00
Frédéric FRANCE
cddb82f9be
Update element_resource.php
2018-07-25 10:11:44 +02:00
Frédéric FRANCE
f79415e740
Update payment.php
2018-07-25 10:08:01 +02:00
Frédéric FRANCE
c7ad6c9a7c
Update card-rec.php
2018-07-25 10:04:44 +02:00
Frédéric FRANCE
cac596037f
Update card.php
2018-07-25 09:50:04 +02:00
Frédéric FRANCE
b87c3b80af
code cleaning
2018-07-25 09:36:34 +02:00
Laurent Destailleur
0c0c9269d5
Merge pull request #9148 from hregis/develop_api
...
FIX clean code
2018-07-24 21:41:41 +02:00
Laurent Destailleur
e024ea9c05
Merge pull request #9146 from grandoc/new_branch_24_07_2018
...
Clean and update code
2018-07-24 21:41:12 +02:00
Philippe
d7f58d0087
FIX search on ref project on propal list
2018-07-24 20:28:49 +02:00
Regis Houssin
ff733c5ad7
FIX clean code
2018-07-24 20:10:27 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
7821e21e5b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:51 +02:00
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
927727edf3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-07-24 19:22:12 +02:00
Laurent Destailleur
20f178fdfe
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Laurent Destailleur
f672e8bf02
Fix trans
2018-07-24 19:12:35 +02:00
Philippe GRAND
2a6f050e32
Clean and update code
2018-07-24 18:28:56 +02:00
Laurent Destailleur
f50aa03187
Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish
...
FIX: stock replenish with multientity
2018-07-24 18:10:00 +02:00
Laurent Destailleur
e9eb8da61b
Update replenish.php
2018-07-24 18:09:50 +02:00
Laurent Destailleur
77c121b15c
Merge pull request #9099 from ATM-Nicolas/7.0
...
NEW Set contactCivName substitution key
2018-07-24 18:02:21 +02:00
Laurent Destailleur
ece655a84a
Merge pull request #9128 from atm-john/fix_situation_invoice_status
...
Fix situation invoice status
2018-07-24 17:49:53 +02:00
Laurent Destailleur
869a97c8d1
Update card.php
2018-07-24 17:49:10 +02:00
Laurent Destailleur
a469f841f7
Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf
...
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
2018-07-24 17:47:37 +02:00
Laurent Destailleur
bb9c53b41f
Merge pull request #9118 from bugness-chl/8.0
...
corr. "group by" for PostgreSQL
2018-07-24 17:43:36 +02:00
Laurent Destailleur
08a5b499fe
Merge pull request #9139 from bugness-chl/8.0-translation
...
Translation: adding 'Enable' term in main
2018-07-24 17:41:53 +02:00
Laurent Destailleur
b992c4b260
Merge pull request #9117 from frederic34/patch-11
...
remove commented log
2018-07-24 17:37:46 +02:00
Laurent Destailleur
9d1b7e25f7
Merge pull request #9127 from IAS-SYSTEMS-CSC/develop
...
Fix if time spent minutes was zero
2018-07-24 17:35:33 +02:00
Laurent Destailleur
dc34794ef1
Merge pull request #9120 from grandoc/new_branch_18_07_2018
...
clean and update code
2018-07-24 17:33:22 +02:00
Laurent Destailleur
71deb9ea60
Merge pull request #9143 from hregis/8.0_dict
...
FIX field is autoincrement but not "rowid"
2018-07-24 17:22:53 +02:00
Laurent Destailleur
68ad5d780c
Merge pull request #9142 from hregis/8.0_pg
...
FIX missing drop old postgresql unique key
2018-07-24 17:16:55 +02:00
Laurent Destailleur
438cdfc004
FIX #9141
2018-07-24 17:16:21 +02:00
Laurent Destailleur
2b7735ec71
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 17:06:55 +02:00
Laurent Destailleur
7e9a2c5ec7
Fix #9092
2018-07-24 17:06:41 +02:00
Frédéric FRANCE
bde30b85ad
use defaut currency for supplier order
2018-07-24 17:06:12 +02:00
Laurent Destailleur
c1002e7b41
Merge pull request #9123 from atm-maxime/new_timespent_numeric
...
NEW Allow to enter a timespent with a numeric value
2018-07-24 16:58:24 +02:00
Laurent Destailleur
42e8bcb832
Merge pull request #9122 from grandoc/new_branch_19_07_2018
...
Clean and update code
2018-07-24 16:56:38 +02:00
Laurent Destailleur
3bdf7d411d
Merge pull request #9125 from atm-john/fix_php7_warning_mysql
...
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
2018-07-24 16:56:10 +02:00
Laurent Destailleur
a65c4ebecd
Merge pull request #9130 from hregis/8.0_bug
...
FIX disable/enable foreign key checking for avoid errors
2018-07-24 16:55:37 +02:00
Laurent Destailleur
8866b8eb1d
Merge pull request #9133 from frederic34/patch-12
...
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
2018-07-24 16:54:04 +02:00
Laurent Destailleur
3e54ee5df7
Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop
...
Fix chromephp firephp Syslog infinite loop
2018-07-24 16:53:32 +02:00
Laurent Destailleur
aa5319fc4d
Merge pull request #9137 from grandoc/new_branch_23_07_2018
...
clean and update code
2018-07-24 16:51:25 +02:00
Regis Houssin
20a1ffe810
FIX field is autoincrement but not "rowid"
2018-07-24 12:15:54 +02:00
Regis Houssin
25c93de801
FIX missing drop old postgresql unique key
2018-07-24 11:23:44 +02:00
Laurent Destailleur
ccd7332647
Fix default value of joinfile when creating a new email template
2018-07-24 01:46:14 +02:00
Laurent Destailleur
a1bdc6022d
Website module
2018-07-24 01:10:38 +02:00
Chl
0f115dafee
2 bugfix for PDF generated by Templates/Cron: DueDate and translation
...
When launching Cron on a facturerec with auto_validate at 1, the
generated PDF doesn't contain the DueDate, and some tokens like
__INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not
translated (tested with fr_FR).
2018-07-24 00:39:21 +02:00
Chl
4995a0feb1
Translation: adding 'Enable' term in main
...
compta/facture/fiche-rec.php uses 'Enable' / 'Disable' in a button text
but no translation is available for 'Enable'.
Another option would be to change 'Enable' to 'Activate' in
fiche-rec.php but I guess this word will probably be useful in other
places.
2018-07-24 00:38:48 +02:00
Philippe GRAND
442ffb95ba
clean and update code
2018-07-23 17:57:11 +02:00
Philippe GRAND
3297554102
clean and update code
2018-07-23 17:45:38 +02:00
Philippe GRAND
e755fde52a
clean and update code
2018-07-23 17:35:30 +02:00
Philippe GRAND
365ed9c5de
clean and update code
2018-07-23 17:28:19 +02:00
Philippe GRAND
1dd39a4c5c
clean and update code
2018-07-23 17:21:51 +02:00
Laurent Destailleur
18125d56e5
css
2018-07-23 14:10:59 +02:00
Laurent Destailleur
174394c476
Work on website module
2018-07-23 14:08:20 +02:00
Laurent Destailleur
df7a3598a8
Trans
2018-07-23 10:56:28 +02:00
Frédéric FRANCE
4341e367d2
remove % in supplier order pdf
2018-07-23 10:30:28 +02:00
Frédéric FRANCE
d582f72bd9
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
2018-07-22 17:27:02 +02:00
Laurent Destailleur
45c7a47d7f
Module website
2018-07-22 17:18:35 +02:00
Laurent Destailleur
e9fccec055
Fix website deletion
2018-07-22 16:56:11 +02:00
Laurent Destailleur
c4e207e8b7
Fix dol_string_onlythesehtmltags
2018-07-22 15:51:19 +02:00
fappels
b697307bac
Fix chromephp firephp Syslog infinite loop.
...
When chromephp/firephp not found ->trans causes infinite loop. Can
happen when files moved to other server or location.
2018-07-22 10:41:39 +02:00
Laurent Destailleur
2c7029850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2018-07-21 20:28:26 +02:00
Laurent Destailleur
1d8c42265c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2018-07-21 20:26:19 +02:00
Laurent Destailleur
a1180f79bd
Fix missing customer code and ref customer
2018-07-21 12:56:18 +02:00
Regis Houssin
5cdc9db1f8
FIX add html comment
2018-07-20 18:45:52 +02:00
Regis Houssin
719db2574e
FIX check if "confirmed" mode
2018-07-20 18:39:18 +02:00
Regis Houssin
e9d9954380
FIX do not convert llx_const if mysql encrypt/decrypt is used
2018-07-20 18:33:14 +02:00
Regis Houssin
984a8e3720
FIX disable/enable foreign key checking for avoid errors
2018-07-20 17:28:32 +02:00
John BOTELLA
0c01f6e139
Fix situation invoice status
2018-07-20 15:53:32 +02:00
ias-ceo
84bfe2965b
if time spent minutes zero
2018-07-20 16:16:27 +03:00
Laurent Destailleur
f419964c76
Fix Debug website module
2018-07-20 15:01:50 +02:00
John BOTELLA
1e986bc39a
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP)
2018-07-20 11:51:01 +02:00
Laurent Destailleur
8247bb683c
Debug website module
2018-07-19 21:35:21 +02:00
Maxime Kohlhaas
22d94a570a
Allow to enter a timespent with a numeric value
2018-07-19 19:04:07 +02:00
Philippe GRAND
010c5af245
Clean and update code
2018-07-19 16:48:20 +02:00
Laurent Destailleur
445db58966
FIX website in inline edit mode
2018-07-19 16:06:48 +02:00
Laurent Destailleur
e362a0e9df
FIX website in inline edit mode
2018-07-19 16:06:06 +02:00
Laurent Destailleur
efa5cdeab1
More complete list of allowed html tags
2018-07-19 15:24:48 +02:00
STAGIAIRE-PC\Pierre
df6ad44261
correction de l'année
2018-07-19 15:15:54 +02:00
STAGIAIRE-PC\Pierre
d8b212897b
ajout de credits
2018-07-19 15:13:55 +02:00
STAGIAIRE-PC\Pierre
294f14ab63
Generation of the mandate file from the api
2018-07-19 15:09:32 +02:00
Philippe GRAND
74704acbcb
clean and update code
2018-07-18 16:13:13 +02:00
Laurent Destailleur
5523312f87
Fix missing email
2018-07-18 15:36:07 +02:00
Laurent Destailleur
7273cb97b2
Fix trans
2018-07-18 14:32:51 +02:00
Laurent Destailleur
38de5a8f2a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-18 14:25:19 +02:00
Laurent Destailleur
bef777e19d
Fix default order for bank entry list
2018-07-18 14:24:58 +02:00
Laurent Destailleur
19bb8a5091
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2018-07-18 14:12:28 +02:00
Laurent Destailleur
33d67ea332
Fix ref on list
2018-07-18 14:09:44 +02:00
Laurent Destailleur
4beca8d989
Fix restore look and feel
2018-07-18 13:00:38 +02:00
Laurent Destailleur
6ad0cd37b0
Translation
2018-07-18 11:57:49 +02:00
Laurent Destailleur
66f9153490
Fix css
2018-07-18 11:33:53 +02:00
Chl
b306394c15
corr. group by pour PostgreSQL
2018-07-17 23:57:21 +02:00
Laurent Destailleur
f60e04dcb4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 22:33:36 +02:00
Laurent Destailleur
cecb0f8829
Fix missing lib
2018-07-17 22:33:20 +02:00
Laurent Destailleur
4b044779dc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 22:31:58 +02:00
Laurent Destailleur
969aea98e1
Fix label of copy must not be same
2018-07-17 22:31:28 +02:00
Laurent Destailleur
47cb1f920e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 21:43:08 +02:00
Laurent Destailleur
7662f8f25c
Fix balance
2018-07-17 21:39:41 +02:00
Laurent Destailleur
c68b9493e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 21:21:20 +02:00
Laurent Destailleur
a7853211d6
Fix balance when sorting of value date desc
2018-07-17 21:20:38 +02:00
Laurent Destailleur
45b298a5d0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-07-17 18:17:36 +02:00
Laurent Destailleur
34c2facff1
Fix missing link on bank account
2018-07-17 18:16:30 +02:00
Laurent Destailleur
7dc552a54e
Fix alignement
2018-07-17 18:10:42 +02:00
Laurent Destailleur
cbc4a04465
Fix nowrap on smartphone
2018-07-17 18:05:49 +02:00
Frédéric FRANCE
1a58a40f77
remove commented log
2018-07-17 16:48:34 +02:00
Laurent Destailleur
26507ee712
Code comment
2018-07-17 14:02:08 +02:00
Laurent Destailleur
7fcec5f6c3
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:50:26 +02:00
Laurent Destailleur
d4a5491753
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:48:08 +02:00
Laurent Destailleur
508133b336
Clean code
2018-07-17 13:04:54 +02:00
Steve
9d3a0442c0
dolibarr-develop, php 7.2.7
...
On third party, add bank account. After spanish account has been added, on summary screen
..../htdocs/societe/paymentmodes.php
a correct account number causes the error:
Warning: A non-numeric value encountered in .......\public_html\dolibarr-develop\htdocs\core\lib\bank.lib.php on line 359
This is
`$sum += $values[$i] * substr($InumCta, $i, 1);`
Since substr returns a string it cannot be summed (I assume).
I changed it to
`$sum += $values[$i] * (int)substr($InumCta, $i, 1)`
2018-07-16 17:10:33 +02:00
Laurent Destailleur
651ba74007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-16 15:45:50 +02:00
Laurent Destailleur
f747cefda3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec
NEW Can enable a module, even external module, from command line
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-16 15:35:00 +02:00
gauthier
33aa373362
FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing
2018-07-16 15:27:37 +02:00
Laurent Destailleur
e5f2fbf8db
Fix trans
2018-07-16 15:21:29 +02:00
Laurent Destailleur
8df834bd2a
Debug module ticket
2018-07-16 12:13:34 +02:00
Laurent Destailleur
37e16b5ff2
Trans
2018-07-16 11:55:59 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
e92ab19a06
Fix var not defined
2018-07-16 11:26:23 +02:00
Laurent Destailleur
c477ca8266
Fix scrutinizer
2018-07-16 11:25:21 +02:00
Laurent Destailleur
4128cee3ee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-16 11:21:29 +02:00
Laurent Destailleur
e3d9e609d5
Fix var not defined
2018-07-16 11:20:54 +02:00
ATM-Nicolas
3c5998e697
FIX : Refactoring
2018-07-16 11:16:55 +02:00
Laurent Destailleur
d3cc2c81eb
Better detail for time elapsed
2018-07-16 11:14:39 +02:00
Philippe Grand
e913d854d0
Fix PR
2018-07-16 11:00:39 +02:00
Laurent Destailleur
89cc048fff
FIX Init of contact in combo list when thirdparty not yet known
2018-07-16 10:46:10 +02:00
Laurent Destailleur
c94437c3cf
Fix file in wrong dir
2018-07-16 10:14:51 +02:00
Laurent Destailleur
35ed89a517
Fix scrutinizer
2018-07-16 10:11:52 +02:00
Laurent Destailleur
76c6f28d85
Merge pull request #9035 from grandoc/new_branch_29_06_2018
...
update code
2018-07-16 10:09:46 +02:00
Laurent Destailleur
6bf4ef5ef4
Fix double "
...
Fix double "
2018-07-16 10:09:13 +02:00
Laurent Destailleur
e72e56ce2d
Merge pull request #9041 from grandoc/new_branch_02_07_2018
...
update description code
2018-07-16 10:03:54 +02:00
Laurent Destailleur
3eac1f410d
Merge pull request #8983 from atm-greg/Add_hook_on_replenish
...
Add hook on replenish
2018-07-16 10:02:26 +02:00
Laurent Destailleur
3710f95719
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/exports.lang
2018-07-16 10:01:23 +02:00
Laurent Destailleur
6846ff7d21
Fix problem in some vars as reported in #8955
2018-07-16 09:57:45 +02:00
ATM-Nicolas
9d60b0a8c6
Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0
2018-07-16 09:47:16 +02:00
Steve
2cf28e055b
more minor grammar corrections
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/companies.lang
htdocs/langs/en_US/exports.lang
htdocs/langs/en_US/mails.lang
htdocs/langs/en_US/products.lang
htdocs/langs/en_US/sms.lang
2018-07-16 09:43:19 +02:00
ATM-Nicolas
de8fd3d12c
NEW : Contact substitutions keys
2018-07-16 09:33:14 +02:00
Laurent Destailleur
387abf2da8
Merge pull request #9057 from inoveaconseil/checkRightOnLink
...
ADD Check right on link
2018-07-16 09:31:21 +02:00
Laurent Destailleur
ae76e61885
Merge pull request #9108 from torvista/misc-texts
...
more minor grammar corrections
2018-07-16 09:23:10 +02:00
Steve
bd9149e03b
more minor grammar corrections
2018-07-16 07:28:22 +02:00
Laurent Destailleur
d968a61445
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-15 20:17:17 +02:00
Laurent Destailleur
1e42db0641
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-15 20:16:54 +02:00
Laurent Destailleur
f3b7bc53bd
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2018-07-15 20:16:08 +02:00
Laurent Destailleur
e92052353d
Merge pull request #9026 from inoveaconseil/FixExtrafieldResource
...
Fix extrafields resource
2018-07-15 20:13:24 +02:00
Laurent Destailleur
9b644fb92f
Merge pull request #9054 from grandoc/new_branch_05_07_2018
...
docs: complete comments
2018-07-15 20:12:21 +02:00
Laurent Destailleur
b690306b70
Merge pull request #9027 from hregis/7.0_price
...
Fix: avoid a non numeric value !!
2018-07-15 20:11:50 +02:00
Laurent Destailleur
bff4ed8103
Merge pull request #9098 from atm-florian/develop
...
fix list of event of thirdparty and unformize code
2018-07-15 20:10:19 +02:00
Laurent Destailleur
a5442033ac
Code comment
2018-07-15 20:09:51 +02:00
Laurent Destailleur
ba36d1aef0
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes
...
fix sql error functions.lib.php
2018-07-15 20:00:54 +02:00
Laurent Destailleur
0ca9f6f522
Update functions.lib.php
2018-07-15 20:00:43 +02:00
Laurent Destailleur
b796c10534
Merge pull request #9101 from hregis/develop_api
...
NEW can add documents on agenda events using API REST
2018-07-15 19:59:52 +02:00
Laurent Destailleur
4279ba66e1
Merge pull request #9103 from grandoc/new_branch_13_07_2018
...
fix: breacking link
2018-07-15 19:59:10 +02:00
Laurent Destailleur
29c76a3f56
Merge pull request #9090 from grandoc/new_branch_10_07_2018
...
New branch 10 07 2018
2018-07-15 19:52:07 +02:00
Laurent Destailleur
0ce101f395
Merge pull request #9096 from grandoc/new_branch_12_07_2018
...
update code and typo
2018-07-15 19:48:05 +02:00
Laurent Destailleur
20e360e918
Start to introduce array fields for products
2018-07-15 18:22:26 +02:00
Laurent Destailleur
a45ac4519a
Fix translation
2018-07-15 18:03:31 +02:00
Philippe GRAND
9ae7e55fea
fix: breaking link
2018-07-13 19:54:37 +02:00
Laurent Destailleur
988b6a49d2
Fix warning php 7.3
2018-07-13 18:40:54 +02:00
Regis Houssin
e1dabe3924
NEW add agenda documents in API REST
2018-07-13 16:07:19 +02:00
ATM-Nicolas
170a668b2b
FIX : Set contactCivName substitution key
2018-07-13 11:09:56 +02:00
Laurent Destailleur
1e775ffa6e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:12:01 +02:00
Laurent Destailleur
c27dd8d301
Fix phpcs
2018-07-13 09:11:46 +02:00
Laurent Destailleur
e4be3ab954
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:09:51 +02:00
Laurent Destailleur
1b33703cd8
Fix missing country code
2018-07-13 09:08:42 +02:00
florian HENRY
09fe2f83fa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2018-07-12 18:27:22 +02:00
florian HENRY
1fa13fc747
fix list of event unformize code
2018-07-12 18:27:09 +02:00
Laurent Destailleur
ebe5325f2b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-12 18:06:26 +02:00
Laurent Destailleur
52dee71b39
Responsive
2018-07-12 18:06:06 +02:00
Laurent Destailleur
872895c0b6
Code comment
2018-07-12 11:17:21 +02:00
Philippe GRAND
6945680e03
update code and typo
2018-07-12 10:11:42 +02:00
ias-ceo
740f35966c
installation default port number if missing
2018-07-12 05:15:09 +03:00
ias-ceo
076bf0a3a7
fix sql error
2018-07-12 05:09:36 +03:00
atm-ph
0c252d9778
Fix user rights overrided by user group rights
2018-07-11 18:09:29 +02:00
gauthier
80ff7fa86f
FIX : case when we valid form with keyboard
2018-07-11 15:18:30 +02:00
Laurent Destailleur
22ab4c54a6
Merge pull request #9089 from atm-florian/dev_addcactiontrigger
...
Add DELETE Trigger action into admin event agenda log
2018-07-11 10:56:35 +02:00
Laurent Destailleur
b203421ac6
Fix log
2018-07-11 10:54:42 +02:00
Laurent Destailleur
2e36e5afa5
Some fix with dolistore api
2018-07-11 10:47:55 +02:00
Laurent Destailleur
6eb9f13ec2
Fix warning
2018-07-11 10:01:26 +02:00
gauthier
103c7e6d06
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
2018-07-11 09:51:36 +02:00
Laurent Destailleur
4c65f4d498
Log
2018-07-11 09:38:40 +02:00
Regis Houssin
f52187e829
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price
2018-07-11 08:22:13 +02:00
Philippe GRAND
72adc485f0
Docs : Update and complete
2018-07-10 22:32:55 +02:00
florian HENRY
2f2ca16e2b
Add DELETE Trigger action into admin event agenda log
2018-07-10 16:44:14 +02:00
Laurent Destailleur
4c363d1d4f
Trans
2018-07-10 15:08:51 +02:00
Philippe GRAND
0d10722a7f
Docs : Update and complete
2018-07-10 14:57:23 +02:00
Laurent Destailleur
f3de1af601
Finish webdav experimental module
2018-07-10 14:56:04 +02:00
Laurent Destailleur
64517d4c0b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/en_US/admin.lang
2018-07-10 14:06:51 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-07-10 13:57:24 +02:00
Laurent Destailleur
aeb5f5e4f3
Fix phpcs
2018-07-10 13:56:03 +02:00
Laurent Destailleur
a55abb4da7
Fix version
2018-07-10 13:54:20 +02:00
Laurent Destailleur
cbc17d4658
Fix ecm when using multicompany
2018-07-10 12:03:51 +02:00
Laurent Destailleur
b6180fcb58
Fix fetch index in ecm when using multicompany
2018-07-10 12:00:09 +02:00
Laurent Destailleur
bda142d82d
Update commande.class.php
2018-07-10 11:10:55 +02:00
Laurent Destailleur
c0d6aee040
Update propal.class.php
2018-07-10 11:10:01 +02:00
Laurent Destailleur
ed3023f7d9
Update propal.class.php
2018-07-10 11:09:08 +02:00
Laurent Destailleur
dc7fcc009b
Update propal.class.php
2018-07-10 10:56:45 +02:00
Laurent Destailleur
8e0a663b7c
Code comment
2018-07-10 10:53:59 +02:00
Laurent Destailleur
3231f0031c
Merge pull request #9085 from grandoc/new_branch_10_07_2018
...
Docs : Update and complete
2018-07-10 10:43:32 +02:00
Laurent Destailleur
f33beb287c
Merge pull request #9080 from grandoc/new_branch_09_07_2018
...
Docs : update and complete comments
2018-07-10 10:42:47 +02:00
Laurent Destailleur
c01975a40b
Merge pull request #9084 from torvista/texts-setup-en_US
...
Texts corrections /langs/en_US
2018-07-10 10:41:28 +02:00
Laurent Destailleur
31d5b739e7
Merge pull request #9048 from hregis/8.0_rights
...
NEW possibility to add all rights of all modules in one time
2018-07-10 10:38:17 +02:00
Philippe GRAND
243bc49a90
Docs : Typo
2018-07-10 09:38:05 +02:00
Philippe GRAND
b92190ac69
Docs : Update and complete
2018-07-10 09:32:55 +02:00
Laurent Destailleur
86ee37e885
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-09 20:16:42 +02:00
Laurent Destailleur
bd1e430a28
Synch transifex
2018-07-09 20:15:14 +02:00
Philippe GRAND
df1bead49b
Docs : update and complete comments
2018-07-09 19:04:50 +02:00
Steve
e45e74a3bd
spelling and some grammar corrections to en_US
2018-07-09 17:38:28 +02:00
Marc de Lima Lucio
2ba7c07574
FIX: propal: correctly preset project when creating with origin/originid
2018-07-09 17:34:31 +02:00
Philippe GRAND
b4b3e33e3e
Docs : update and complete comments
2018-07-09 17:22:34 +02:00
Laurent Destailleur
e0c3d176ed
Merge pull request #9067 from torvista/install-texts-en_US
...
spelling and some grammar corrections for installation texts en_US
2018-07-09 17:11:58 +02:00
Laurent Destailleur
3cda462faf
Merge pull request #9065 from aspangaro/9.0_a1
...
Add customer accountancy code on deposit slips export
2018-07-09 17:08:13 +02:00
Laurent Destailleur
19c652ce06
Merge pull request #9066 from hregis/8.0_product
...
Fix: differentiate customer prices from supplier prices sharing with getEntity("productsupplierprice")
2018-07-09 17:05:36 +02:00
Laurent Destailleur
d5cb2fc4cd
Update productcustomerprice.class.php
2018-07-09 17:04:50 +02:00
Laurent Destailleur
551e2efe86
Update productcustomerprice.class.php
2018-07-09 17:03:55 +02:00
Laurent Destailleur
2ef78bee0b
Revert "FIX side nav height."
...
This reverts commit 78ba8bc3b5
2018-07-09 16:16:07 +02:00
Laurent Destailleur
754ec22cfe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-09 15:40:11 +02:00
Laurent Destailleur
699df860d8
Code comment
2018-07-09 15:39:59 +02:00
Laurent Destailleur
959a75c51e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-09 15:38:54 +02:00
Laurent Destailleur
f5d9403c7d
Fix permission to see HR tab on user. All HR on same tabs.
2018-07-09 15:38:00 +02:00
Laurent Destailleur
052d86f3ca
Merge pull request #9073 from tarrsalah/fix-side-nav-css
...
FIX side nav height.
2018-07-09 15:37:03 +02:00
Laurent Destailleur
ba6566867e
Merge pull request #9064 from grandoc/new_branch_06_07_2018
...
fix : typo and update code
2018-07-09 15:33:25 +02:00
Laurent Destailleur
2d74f03d34
Merge pull request #9077 from grandoc/new_branch_09_07_2018
...
Docs : update and complete
2018-07-09 15:32:34 +02:00
Laurent Destailleur
70114a8d7d
Merge pull request #9072 from hregis/8.0_multicompany
...
FIX missing entity field
2018-07-09 15:31:22 +02:00
Laurent Destailleur
8184eff66c
Fix for #9079
2018-07-09 15:25:14 +02:00
Laurent Destailleur
c33aaa076d
FIX #8984 button create expense report
2018-07-09 14:35:22 +02:00
Laurent Destailleur
e427496ddf
FIX Injection
2018-07-09 14:13:01 +02:00
Philippe GRAND
2c4d7c4835
Docs : update and complete
2018-07-09 14:06:59 +02:00
Laurent Destailleur
d3d1b6d513
NEW Can enable a module, even external module, from command line
2018-07-09 13:02:01 +02:00
Philippe GRAND
12d4880e7b
Docs : update and complete
2018-07-09 10:08:27 +02:00
John BOTELLA
1daba56bbc
Fix count(): Parameter must be an array or an object that implements Countable
2018-07-09 10:05:53 +02:00
Laurent Destailleur
291f149a9b
NEW Can set a tooltip help text on extrafields
2018-07-08 20:26:48 +02:00
Laurent Destailleur
41f21f3867
Translation
2018-07-08 20:06:24 +02:00
Laurent Destailleur
8ec9257302
Fix translation
2018-07-08 20:03:14 +02:00
tarrsalah
78ba8bc3b5
FIX side nav height.
2018-07-08 14:07:06 +01:00
Regis Houssin
3e5271967b
FIX missing entity field
2018-07-08 12:11:22 +02:00
Steve
65e42522d3
minor html and css corrections (as shown by browser validation and phpstorm inspections)
2018-07-07 23:50:41 +02:00
Philippe GRAND
47e80123d5
Docs : update code
2018-07-07 11:36:46 +02:00
Philippe GRAND
4b1e9e3faf
Docs : translation
2018-07-07 11:03:22 +02:00
Philippe GRAND
fe5bfe3aaf
Docs : update comments
2018-07-07 10:51:09 +02:00
Philippe GRAND
1e1ed485f5
Docs : update comments
2018-07-07 10:47:56 +02:00
Regis Houssin
e8afd7e833
Fix: use "supplier" instead "reseller"
2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d
Fix: differentiate customer prices from supplier prices sharing
2018-07-07 08:43:59 +02:00
Steve
5944c161bc
spelling and some grammar corrections for installation texts en_US
2018-07-07 08:41:17 +02:00
Alexandre SPANGARO
655d55eae6
Add customer accountancy code on deposit slips export
2018-07-07 02:46:56 +02:00
Philippe GRAND
1e565486d8
fix : typo and update code
2018-07-06 19:17:11 +02:00
Laurent Destailleur
a62fd8ef84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:45 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
4db7e04523
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/loan/index.php
2018-07-06 16:09:32 +02:00
Laurent Destailleur
997ae76899
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-06 16:06:27 +02:00
Laurent Destailleur
ed6ec8138d
Fix filter on invoice status
2018-07-06 16:06:15 +02:00
Laurent Destailleur
2a676b414a
Merge pull request #9024 from atm-maxime/fix_link_create_event
...
Fix link to create event had no socid if from thirdparty card
2018-07-06 14:26:38 +02:00
Laurent Destailleur
2113965b57
Update html.formactions.class.php
2018-07-06 14:26:21 +02:00
Laurent Destailleur
67a831ad5f
Merge pull request #9045 from hregis/8.0_multicompany
...
Fix: check if multicompany object exists
2018-07-06 14:23:59 +02:00
Laurent Destailleur
2cdd9adc6e
Merge pull request #9023 from atm-maxime/fix_stocklist
...
Fix filters not saved when ordering
2018-07-06 14:23:10 +02:00
Laurent Destailleur
a725ceaf42
Merge pull request #9049 from grandoc/new_branch_04_07_2018
...
docs: complete comments
2018-07-06 14:21:47 +02:00
Laurent Destailleur
05ed721a8c
Fix name of constant for module TICKET
2018-07-06 13:09:07 +02:00
Laurent Destailleur
e61f0ef7e4
Merge pull request #9060 from atm-maxime/fix_mod_ticket
...
Fix mod ticket
2018-07-06 13:05:42 +02:00
Laurent Destailleur
303fb94acb
Fix trans
2018-07-06 13:04:37 +02:00
Laurent Destailleur
3b8ecb18ab
Merge pull request #9044 from hregis/7.0_loan
...
Fix: missing "paid" field
2018-07-06 13:03:37 +02:00
Laurent Destailleur
fb84211714
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 12:45:44 +02:00
Laurent Destailleur
6c5264fabb
Fix label
2018-07-06 12:45:20 +02:00
Inovea Conseil
7f137adef9
ADD check user's rights
2018-07-06 08:07:38 +02:00
delcroix Patrick
5f7a308552
Merge branch 'develop' into comptafiles
2018-07-05 22:35:40 +02:00
patrick Delcroix
a90974378e
FIX: credit / debit
2018-07-05 22:31:29 +02:00
Laurent Destailleur
af3ab84ebb
Fix backward compatibility with old multicompany module
2018-07-05 22:15:55 +02:00
delcroix Patrick
e88dd77ea5
no change
2018-07-05 21:42:34 +02:00
patrick Delcroix
0e7ba92784
New: Accounting dossier file checks page
...
Page to check to attachement of those operation
invoice, invoicesupplier, salary, donation, Expense, tax
2018-07-05 21:34:36 +02:00
Inovea Conseil
5011f252c1
ADD check user's rights
2018-07-05 19:00:41 +02:00
Philippe GRAND
988130d2a1
docs: complete comments
2018-07-05 17:04:11 +02:00
Philippe GRAND
4cbe3a5bc7
docs: complete comments
2018-07-05 17:01:47 +02:00
Laurent Destailleur
b369585e61
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/product/stats/commande.php
htdocs/product/stats/commande_fournisseur.php
htdocs/product/stats/contrat.php
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
htdocs/product/stats/propal.php
htdocs/product/stats/supplier_proposal.php
2018-07-05 15:57:27 +02:00
Laurent Destailleur
0587e73272
FIX Pagination on related item pages
2018-07-05 15:53:28 +02:00
Maxime Kohlhaas
badcbd78d8
Rename ticketsup public directory
2018-07-05 15:20:38 +02:00
Maxime Kohlhaas
39f890d84a
Fix TICKETSUP var name
2018-07-05 14:51:00 +02:00
Maxime Kohlhaas
74b9f87cab
Fix ticket : missing file for numbering
2018-07-05 14:35:12 +02:00
BENKE Charlene
bfe7cd0d9f
Update propal.class.php
2018-07-05 12:11:20 +02:00
BENKE Charlene
5a6cfd5efe
Update commande.class.php
2018-07-05 12:08:59 +02:00
BENKE Charlene
9539adfffb
Update index.php
2018-07-05 12:02:38 +02:00
BENKE Charlene
c169ff4b97
Update facture.class.php
2018-07-05 12:01:48 +02:00
BENKE Charlene
633bf3034f
new add total price on dashboard
2018-07-05 11:52:58 +02:00
Inovea Conseil
30cff2bb36
ADD check user's rights
2018-07-05 11:52:41 +02:00
ATM-Nicolas
59220c05e4
FIX : Select first mail model by default
2018-07-05 11:18:28 +02:00
Laurent Destailleur
3a593f88f1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-05 10:28:24 +02:00
Philippe GRAND
1cc73ae8ca
docs: complete comments
2018-07-05 10:16:20 +02:00
Inovea Conseil
d53f03b596
Update after comment
2018-07-05 09:14:36 +02:00
Laurent Destailleur
5883899bc7
Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-07-05 02:33:39 +02:00
Regis Houssin
d796199ed0
Fix: avoid warning with multicompany tranverse mode
2018-07-04 14:48:00 +02:00
Philippe GRAND
afd3868a8a
docs: complete comments
2018-07-04 14:38:56 +02:00
Laurent Destailleur
9842978b85
Fix trim config values
2018-07-04 11:16:45 +02:00
Laurent Destailleur
91b7ee5fc2
NEW Add function isValidMXRecord
2018-07-04 11:07:28 +02:00
Laurent Destailleur
64e778a78f
Fix pgsql migration
2018-07-04 10:26:25 +02:00
Laurent Destailleur
a2f517685e
Fix pgsql migration
2018-07-04 10:21:42 +02:00
Regis Houssin
ca13d7b560
NEW possibility to add all rights of all modules in one time
2018-07-03 21:46:20 +02:00
Laurent Destailleur
d4d9a8d75a
Fix 8.0 not 9.0
2018-07-03 20:13:30 +02:00
Laurent Destailleur
38cd5180d9
FIX for migration from old versions
2018-07-03 20:11:59 +02:00
Laurent Destailleur
275f981545
FIX for migration from old versions
2018-07-03 20:08:55 +02:00
Laurent Destailleur
5583600066
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 17:37:50 +02:00
Laurent Destailleur
50df452b9e
Fix status "Supplier" not always visible.
2018-07-03 17:37:23 +02:00
Laurent Destailleur
dfc42e56d3
Better log
2018-07-03 17:15:52 +02:00
Regis Houssin
0bb7f84f87
Fix: check if multicompany object exists
2018-07-03 14:11:00 +02:00
Laurent Destailleur
f7b8e09268
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
2018-07-03 13:53:34 +02:00
Laurent Destailleur
f93f5bd6e0
Fix travis
2018-07-03 13:49:41 +02:00
Regis Houssin
875cee84c7
Fix: missing "paid" field
2018-07-03 13:47:53 +02:00
Laurent Destailleur
2a8f98be65
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:48:26 +02:00
Laurent Destailleur
da7b433cd0
Trans
2018-07-03 12:46:22 +02:00
Laurent Destailleur
e1e813b895
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:26 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Laurent Destailleur
cfb41d4329
FIX: If module workflow disabled, we must disable autoclassification too
2018-07-03 11:43:50 +02:00
Laurent Destailleur
7ef6b16d31
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/step1.php
2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-03 10:01:30 +02:00
Laurent Destailleur
01e8f78c30
Trans
2018-07-03 09:58:36 +02:00
Laurent Destailleur
c2499f298c
Fix bad name of field
2018-07-02 18:08:55 +02:00
Laurent Destailleur
0f77e3c05c
Fix bad name of field
2018-07-02 17:57:32 +02:00
Philippe GRAND
2023a58397
fix : Typo
2018-07-02 17:32:42 +02:00
Laurent Destailleur
3c176adb38
Fix more complete fix for bad label in creating invoice from other obj
2018-07-02 16:46:30 +02:00
Laurent Destailleur
cae7cabe6d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-02 16:22:55 +02:00
Laurent Destailleur
b22754c60b
FIX label of source object
2018-07-02 16:22:40 +02:00
Laurent Destailleur
e72107422b
Merge pull request #9040 from defrance/patch-122
...
add holliday_admin_prepare_head
2018-07-02 16:18:25 +02:00
Laurent Destailleur
4e7f9b1b4d
Merge pull request #9038 from hregis/8.0_multicompany
...
Fix: possibility to overload permissions (multicompany sharing)
2018-07-02 16:12:40 +02:00
Laurent Destailleur
5138a09db3
Fix sql of time spent per day
2018-07-02 15:54:21 +02:00
Laurent Destailleur
7c5aa148d9
Fix fetch
2018-07-02 15:26:01 +02:00
Philippe GRAND
0aa58537bb
update code comment
2018-07-02 15:07:00 +02:00
Philippe GRAND
74c45fa876
update code comment
2018-07-02 14:30:30 +02:00
Philippe GRAND
f43cce34c8
update code comment
2018-07-02 13:34:21 +02:00
Philippe GRAND
8497f56a04
update description code
2018-07-02 12:35:06 +02:00
Laurent Destailleur
9c5d34fc5f
Fix translation
2018-07-02 12:26:32 +02:00
Laurent Destailleur
a2c89d8110
Fix page code in pdf
2018-07-02 12:25:09 +02:00
Laurent Destailleur
63f3143718
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-02 12:18:34 +02:00
Laurent Destailleur
dc69960b00
Code comment
2018-07-02 12:17:34 +02:00
Laurent Destailleur
7bf33b1bac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
af21222c30
Fix translation
2018-07-02 11:47:04 +02:00
Laurent Destailleur
e8b97b0be4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-07-02 11:33:49 +02:00
Laurent Destailleur
11021353da
Fix text in payment area of crabe pdf
2018-07-02 11:33:33 +02:00
Regis Houssin
9709207a4f
Fix: superadmin can show all users in master entity
2018-07-02 10:18:16 +02:00
Regis Houssin
df718cca5c
Fix: better sql request with multicompany transverse mode
2018-07-02 10:09:56 +02:00
Laurent Destailleur
fec9a96ad1
Fix travis
2018-07-02 09:34:34 +02:00
Laurent Destailleur
93184c5f66
Fix travis
2018-07-01 23:57:54 +02:00
Regis Houssin
233ad2945c
Fix: missing hook parameter
2018-07-01 20:03:08 +02:00
Regis Houssin
26495fb698
Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!
2018-07-01 18:49:37 +02:00
Regis Houssin
f13dd9c9bd
Fix: missing hook parameter
2018-07-01 18:22:18 +02:00
Regis Houssin
8f124efc15
Fix: wrong mysql resource name
2018-07-01 17:48:01 +02:00
BENKE Charlene
43c5d7abdc
add holliday_admin_prepare_head
...
sorry eldy i forget it
2018-07-01 17:33:35 +02:00
Regis Houssin
05c666c18b
Fix: use numbering model corresponding to the entity of the object
2018-07-01 17:06:19 +02:00
Regis Houssin
80adac12c0
Fix: use object entity ID instead current entity
2018-07-01 16:01:30 +02:00
Regis Houssin
df55bee8ae
Fix: missing "$disableremove" global
2018-07-01 15:33:10 +02:00
Regis Houssin
c0c8a70dd5
Fix: permissions
2018-07-01 12:21:51 +02:00
Regis Houssin
d699667722
Fix: possibility to overload permissions (multicompany sharing)
2018-07-01 11:06:47 +02:00
Laurent Destailleur
e06eb9e2fc
Fix phpcs
2018-06-30 18:38:23 +02:00
Laurent Destailleur
751ddb46d2
Update pdf_blochet.class.php
2018-06-30 18:31:32 +02:00
Laurent Destailleur
a502271029
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-06-30 18:30:16 +02:00
Laurent Destailleur
d8c7c61951
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
...
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
2018-06-30 18:29:08 +02:00
Regis Houssin
598f90486f
Fix: syntax error (Travis)
2018-06-30 17:05:34 +02:00
Laurent Destailleur
ee2d543781
Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist
...
NEW support selllist in the module builder
2018-06-30 15:33:17 +02:00
Laurent Destailleur
edd2e12b8d
css
2018-06-30 14:35:33 +02:00
Laurent Destailleur
982a1ffbaf
NEW Automatic position of scroll when creating an extrafield
2018-06-30 14:22:05 +02:00
Philippe GRAND
640f7697e4
update code
2018-06-30 11:45:49 +02:00
Regis Houssin
f3d213bab8
Fix: remove old code
2018-06-30 11:05:13 +02:00
Regis Houssin
debec3d175
Fix: remove old code of canvas
...
Conflicts:
htdocs/product/list.php
2018-06-30 11:03:02 +02:00
Regis Houssin
62a55e10b7
Fix: remove not used list template
2018-06-30 10:58:28 +02:00
Regis Houssin
718cbce8eb
Fix: use "visible" field name instead "checked"
2018-06-30 10:58:08 +02:00
Regis Houssin
96faf7cb0f
Fix: use the new title
2018-06-30 10:55:15 +02:00
Regis Houssin
5b491a4d57
Fix: remove duplicate code
2018-06-30 10:55:01 +02:00
Regis Houssin
ebfd1846a3
Fix: add new field "checked"
2018-06-30 10:54:46 +02:00
Regis Houssin
4c90ff9917
NEW add "checked" field for new list engine compatibility
2018-06-30 10:54:22 +02:00
Regis Houssin
3a26443546
Fix: remove unused code
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:53:40 +02:00
Regis Houssin
e392610f46
Fix: missing banner
2018-06-30 10:52:51 +02:00
Regis Houssin
f998f64db0
Works on use new list engine instead template for canvas
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:52:26 +02:00
Regis Houssin
4925624ed9
Fix: avoid NULL value when "subprice" is 0
2018-06-30 10:38:30 +02:00
Regis Houssin
964f11491f
Revert "Fix: avoid a non numeric value !!"
...
This reverts commit 2824afa75c
2018-06-30 10:26:50 +02:00
Laurent Destailleur
df96c5ca81
Merge pull request #8796 from defrance/patch-113
...
introduce serial and document for holiday module
2018-06-30 02:09:28 +02:00
Laurent Destailleur
e01d748527
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-30 02:05:13 +02:00
Laurent Destailleur
16b4d2aee7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-06-30 02:04:24 +02:00
Laurent Destailleur
f6774de773
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-30 02:00:46 +02:00
Laurent Destailleur
400d400b32
Fix bad constructor
2018-06-30 01:59:54 +02:00
Laurent Destailleur
8d3fff5568
Merge pull request #8738 from atm-quentin/NEW_triggers_commercial_add
...
NEW triggers add commercial and del commercial
2018-06-30 01:44:10 +02:00
Laurent Destailleur
0f62408700
Remove duplicated code
2018-06-30 01:34:51 +02:00
Laurent Destailleur
31396739f9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-30 01:26:59 +02:00
Laurent Destailleur
7fab2ca1f8
Add new field
2018-06-30 01:26:33 +02:00
Laurent Destailleur
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop
...
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-30 01:26:08 +02:00
Laurent Destailleur
c6b650a7bb
Merge pull request #8789 from defrance/patch-116
...
NEW Add CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY and CONTRACT_HIDE_UNSELECTABLES by SELECT_HIDE_UNSELECTABLES
2018-06-30 01:23:09 +02:00
Laurent Destailleur
a9e78f27d9
Merge branch 'develop' into patch-115
2018-06-30 01:21:58 +02:00
Laurent Destailleur
202ab93c5f
Update 7.0.0-8.0.0.sql
2018-06-30 01:20:57 +02:00
Laurent Destailleur
7984316142
Update 7.0.0-8.0.0.sql
2018-06-30 01:20:44 +02:00
Laurent Destailleur
f9b46ee0fa
Merge pull request #8818 from wdammak/patch-6
...
NEW Add link to inventory code
2018-06-30 01:19:50 +02:00
Laurent Destailleur
3112244529
Merge pull request #8884 from defrance/patch-117
...
New : fichinter models (like factureRec)
2018-06-30 01:19:03 +02:00
Laurent Destailleur
08175fffe6
Merge pull request #9028 from atm-ph/new_select_multiple
...
New parameter to transform select into multiselect
2018-06-30 01:18:20 +02:00
Laurent Destailleur
e4388e63fa
Merge pull request #8891 from inoveaconseil/develop
...
NEW: ADD url to see the last version of a external module
2018-06-30 01:17:10 +02:00
Laurent Destailleur
bc632c9ab7
Merge pull request #9019 from atm-gauthier/6.0_fix_getentity
...
FIX : getEntity project and not projet
2018-06-30 01:15:23 +02:00
Laurent Destailleur
fba9caab5d
Merge pull request #8944 from bafbes/abb7008
...
New: Option to see line numbers in modules page
2018-06-29 20:05:19 +02:00
Laurent Destailleur
75e9f1bf9a
Update modules.php
2018-06-29 20:05:12 +02:00
Laurent Destailleur
b1d94af439
Merge pull request #8931 from ruistrecht-alt/MAIN_DOCUMENTS_DESCRIPTION_FIRST
...
NEW Add hidden option MAIN_DOCUMENTS_DESCRIPTION_FIRST
2018-06-29 20:04:24 +02:00
Laurent Destailleur
292d7967c3
Merge pull request #9021 from grandoc/8.0
...
Fix : Notice: A non well formed numeric value encountered line 509
2018-06-29 20:02:54 +02:00
Laurent Destailleur
9004a51880
Update conf.class.php
2018-06-29 20:02:40 +02:00
Laurent Destailleur
03306fa56e
Merge pull request #9022 from atm-maxime/7.0
...
Fix : division by 0 on homepage if nothing to do
2018-06-29 19:58:48 +02:00
Laurent Destailleur
4ace9dd12d
Merge pull request #9015 from hregis/8.0_bug
...
Fix: remove unused and blocking field
2018-06-29 19:58:25 +02:00
Laurent Destailleur
a011140243
Merge pull request #9025 from atm-quentin/FIX_missing_type_element
...
Fix missing type element
2018-06-29 19:57:16 +02:00
Laurent Destailleur
a850e91bcb
Merge pull request #9017 from grandoc/new_branch_27_06_2018
...
clean and update code
2018-06-29 19:41:22 +02:00
Laurent Destailleur
a6c6bbe16d
Merge pull request #9029 from hregis/6.0_multicompany
...
Fix: broken feature with edit in place
2018-06-29 19:40:17 +02:00
Laurent Destailleur
3f2b3c0840
FIX #9032
2018-06-29 19:38:12 +02:00
Laurent Destailleur
c4143763be
Update step1.php
2018-06-29 19:23:17 +02:00
Laurent Destailleur
eb71810bdc
Merge pull request #8999 from dolibarr95/patch-46
...
NEW Add supplier ref in item reception page
2018-06-29 19:18:20 +02:00
Laurent Destailleur
569291763f
Update dispatch.php
2018-06-29 19:17:44 +02:00
Laurent Destailleur
932ff0be18
Trans
2018-06-29 19:16:29 +02:00
Laurent Destailleur
ca8144c5ea
Fix error message
2018-06-29 19:08:35 +02:00
Laurent Destailleur
2175a012e1
Fix lang
2018-06-29 18:23:59 +02:00
Regis Houssin
41709f07d0
Fix : #9032 Vulnerability
2018-06-29 18:18:10 +02:00
Regis Houssin
2d13b5b59d
Fix: broken feature with edit in place
2018-06-29 15:57:34 +02:00
Laurent Destailleur
69e535cfc7
Trans
2018-06-29 12:47:06 +02:00
atm-ph
41a516f1c4
New parameter to transform select into multiselect
2018-06-29 11:48:54 +02:00
Regis Houssin
2824afa75c
Fix: avoid a non numeric value !!
2018-06-29 11:25:30 +02:00
Laurent Destailleur
20c72c1ae4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/main.inc.php
2018-06-29 00:22:15 +02:00
Laurent Destailleur
346bf7bdd6
Fix param dol_invisible_topmenu
...
Conflicts:
htdocs/main.inc.php
2018-06-29 00:21:14 +02:00
Laurent Destailleur
3b4fca6756
Fix param dol_invisible_topmenu
2018-06-29 00:19:43 +02:00
Laurent Destailleur
198deb92f6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-29 00:09:12 +02:00
Laurent Destailleur
5775dced37
Fix dol_invisible_topmenu must differs from dol_hide_topmenu
2018-06-29 00:08:46 +02:00
Laurent Destailleur
66f0ee9e18
Fix hack with hook to solve a problem to let a chance of external
...
modules to be visible to android webview.
2018-06-28 22:59:53 +02:00
Laurent Destailleur
60c62895bf
WIP Can add tooltips on extrafields
2018-06-28 19:13:23 +02:00
Laurent Destailleur
f5ea130562
Prepare v9
2018-06-28 18:39:24 +02:00
Laurent Destailleur
0490807f9b
Prepare 9.0
2018-06-28 18:36:08 +02:00
Inovea Conseil
c4513a755d
Fix extrafields resource
2018-06-28 16:39:37 +02:00
atm-quentin
9125586692
FIX need element type on select filter
2018-06-28 15:52:40 +02:00
Maxime Kohlhaas
5756955d55
Fix link to create event had no socid if from thirdparty card
2018-06-28 14:27:59 +02:00
Laurent Destailleur
5de650435a
Fix filter on country/zip
2018-06-28 14:06:23 +02:00
Maxime Kohlhaas
3babdb9798
Fix filters not saved when ordering
2018-06-28 13:45:30 +02:00
Maxime Kohlhaas
7ebf54fbea
Fix : division by 0 on homepage if nothing to do
2018-06-28 12:54:19 +02:00
Philippe GRAND
a4ccb47b78
Fix : Notice: A non well formed numeric value encountered line 509
2018-06-28 12:18:03 +02:00
Laurent Destailleur
da138db528
FIX combo into popup become crazy with IE10
...
Conflicts:
htdocs/asset/card.php
htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
ed2ec78332
FIX combo of stock in popup are crazy in IE
2018-06-28 12:11:00 +02:00
Laurent Destailleur
055d818069
FIX dashboard with IE10 not supporting flex
2018-06-28 12:09:13 +02:00
Laurent Destailleur
3ea2d81279
FIX combo into popup become crazy with IE10
2018-06-28 12:05:02 +02:00
Laurent Destailleur
55d5d01cfe
FIX combo of stock in popup are crazy in IE
2018-06-28 11:53:52 +02:00
gauthier
d8ca9f2947
FIX : we must see number of all shared projects
2018-06-27 17:26:04 +02:00
gauthier
86a58def3b
FIX : getEntity project and not projet
2018-06-27 17:13:50 +02:00
All3kcis
4c10efb7d3
Enable auto update PDF on update note
...
Generate order/invoice PDF on update public note
2018-06-27 15:32:22 +02:00
Philippe GRAND
a952b46d8b
clean and update code
2018-06-27 12:37:31 +02:00
Laurent Destailleur
6fc6a743c8
Fix template email message html/nohtml
2018-06-27 12:11:49 +02:00
Laurent Destailleur
9eaca045e4
Fix default message with online payment link must be hidden when no
...
online payment mode exists.
2018-06-27 11:34:40 +02:00
STAGIAIRE-PC\Pierre
19eaa3df66
ajout de la modification dans la base de données
2018-06-27 11:29:46 +02:00
STAGIAIRE-PC\Pierre
8a780b3910
Code refactorisation
2018-06-27 11:01:20 +02:00
STAGIAIRE-PC\Pierre
a94eeaa500
adding the possibility to personnalize ent_to_end and ustrd of a bank levy
2018-06-27 10:53:45 +02:00
STAGIAIRE-PC\Pierre
62f2108101
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-27 10:33:57 +02:00
Regis Houssin
48ad03c56d
Fix: remove unused and blocking field
2018-06-27 09:33:21 +02:00
Regis Houssin
775e11ce33
Fix: wrong table name
2018-06-27 09:33:09 +02:00
Laurent Destailleur
a076d4b461
Fix translation during install
2018-06-27 01:53:36 +02:00
Laurent Destailleur
f292c1c662
Option to solve autovalidation
2018-06-27 01:33:02 +02:00
Laurent Destailleur
ac758e02a9
Fix error message with old usage of childtables
2018-06-27 01:32:54 +02:00
Laurent Destailleur
ff6ffa4738
Fix data in tooltip
2018-06-27 00:38:42 +02:00
Laurent Destailleur
a30789e423
Fix table name
2018-06-27 00:34:45 +02:00
Laurent Destailleur
4170e754d6
Fix trad
2018-06-26 18:16:25 +02:00
Laurent Destailleur
aa37786596
Fix migration errors reported by Softaculous
2018-06-26 11:51:49 +02:00
Laurent Destailleur
8147152ec8
Fix look and feel v8
2018-06-26 11:25:28 +02:00
Laurent Destailleur
969b272576
Rename menu entries and report title for better understanding
2018-06-26 11:18:31 +02:00
John
008163628a
New pdf documents using new column system
2018-06-26 08:03:25 +02:00
Laurent Destailleur
cbe682582e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-26 01:25:24 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
7f8570f720
Fix lang loading
2018-06-26 00:48:43 +02:00
Laurent Destailleur
52eddbf809
Sync transifex
2018-06-26 00:29:50 +02:00
Laurent Destailleur
9f77ea0ece
Code comment
2018-06-25 17:05:15 +02:00
Laurent Destailleur
9b46ae50f0
Fix left join on expensereport lines
2018-06-25 16:25:37 +02:00
Laurent Destailleur
36402c22ee
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
2018-06-25 14:06:09 +02:00
Laurent Destailleur
16ea078615
Merge pull request #9010 from grandoc/new_branch_24_06_2018
...
update and clean code
2018-06-25 12:28:00 +02:00
Laurent Destailleur
9f1cfbdb72
For better compatibility
2018-06-25 12:25:43 +02:00
Regis Houssin
a78ba20c9b
Fix: update price format
2018-06-25 12:20:08 +02:00
Regis Houssin
3d9b191806
Fix: restore and update example data
2018-06-25 12:16:02 +02:00
Laurent Destailleur
d9fc1e0b5d
Fix param to avoid to create holiday or expense report in wrong entity.
2018-06-25 10:09:01 +02:00
Laurent Destailleur
97976fbb43
Fix type of parameter must be string
2018-06-25 09:19:45 +02:00
Regis Houssin
a6729b0bd1
Fix: change field name and remove obsolete data
2018-06-25 09:10:24 +02:00
Laurent Destailleur
bc71685258
Fix migration error
2018-06-25 08:30:37 +02:00
Laurent Destailleur
2520ebcfae
Fix line
2018-06-24 18:56:49 +02:00
Laurent Destailleur
c664d0c2fd
Fix phpunit
2018-06-24 18:26:35 +02:00
Laurent Destailleur
8693775fc5
Fix phpunit
2018-06-24 18:15:49 +02:00
Laurent Destailleur
459fe7189d
Fix phpunit
2018-06-24 17:55:03 +02:00
Philippe GRAND
1bb91c7860
update and clean code
2018-06-24 16:20:27 +02:00
Laurent Destailleur
3615b7b45d
Fix missing translation
2018-06-24 15:44:13 +02:00
Laurent Destailleur
2649c136cf
Fix SYSLOG_FILE_ONEPERSESSION
2018-06-24 14:31:03 +02:00
Laurent Destailleur
638595fa59
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-24 13:59:56 +02:00
Laurent Destailleur
848c8cdc4b
Fix mode SYSLOG_FILE_ONEPERSESSION to work as expected
2018-06-24 13:59:37 +02:00
Laurent Destailleur
af9d2c3b5a
Merge pull request #9008 from grandoc/new_branch_22_06_2018
...
clean and update code
2018-06-24 13:47:26 +02:00
Laurent Destailleur
25b1d063ae
Fix length of hidden password
2018-06-24 11:45:10 +02:00
Laurent Destailleur
5819333b80
Css
2018-06-24 11:30:44 +02:00
Philippe Grand
21ca374c27
Update cibles.php
...
Fixes
2018-06-24 10:57:53 +02:00
Philippe Grand
b528368a8b
Update cibles.php
2018-06-24 10:56:06 +02:00
Laurent Destailleur
1b5c5cfafb
Fix select status
2018-06-24 10:42:07 +02:00
Laurent Destailleur
c405181393
Merge pull request #8987 from a-schild/develop
...
Added mailing by thirdparty filtering by prospect type and status
2018-06-24 10:31:09 +02:00
Laurent Destailleur
a50b62d7e7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-24 10:26:24 +02:00
Laurent Destailleur
4f533be01a
For #9006
2018-06-24 10:26:08 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
2018-06-24 10:24:26 +02:00
Laurent Destailleur
e9b4141dd9
Fix syntax error
2018-06-23 17:11:19 +02:00
Laurent Destailleur
3fa5649040
Fix bad test (dev journal visible when dev option on)
2018-06-23 15:22:39 +02:00
Laurent Destailleur
2db2ea3627
Fix colspan
2018-06-23 15:13:39 +02:00
Laurent Destailleur
00165871bd
CSS
2018-06-23 15:10:44 +02:00
Laurent Destailleur
16f940b637
Prepare 7.0.4
2018-06-23 14:55:33 +02:00
Laurent Destailleur
0170906524
Look and feel
2018-06-23 14:39:24 +02:00
Laurent Destailleur
6dba88ab6e
Several fixes in look and feel
2018-06-23 14:23:07 +02:00
Laurent Destailleur
dbb90e80a3
Fix syntax error
2018-06-23 12:57:41 +02:00
Laurent Destailleur
eb88f1e5c9
Fix look and feel v8
2018-06-23 12:41:03 +02:00
Laurent Destailleur
06342ff80c
FIX contextpage on contact list
2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f
Fix the "back to list" link also restore the contextpage
2018-06-23 11:55:04 +02:00
Laurent Destailleur
f2ac5dab4a
Fix contextpage of some menu entries
2018-06-23 10:28:06 +02:00
Laurent Destailleur
604a5a3568
trans
2018-06-23 00:19:47 +02:00
Laurent Destailleur
c871e81a52
Trans
2018-06-23 00:15:57 +02:00
Laurent Destailleur
7daee6dc6b
A lot of fix of css and look and feel v8
2018-06-23 00:07:56 +02:00
Laurent Destailleur
83f4cf67e6
css
2018-06-22 23:21:16 +02:00
Laurent Destailleur
be2309c70f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-22 22:54:11 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Laurent Destailleur
ca04ffe420
Load lang
2018-06-22 17:07:49 +02:00
Philippe GRAND
afda5288a8
clean and update code
2018-06-22 16:27:11 +02:00
Laurent Destailleur
02fbe4a84c
Merge pull request #8991 from hregis/develop_product
...
Fix: avoid Warning: A non-numeric value encountered
2018-06-22 15:52:05 +02:00
Laurent Destailleur
6f1101a2d6
Update card.php
2018-06-22 15:51:26 +02:00
Laurent Destailleur
d458b383ad
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-06-22 15:29:44 +02:00
Laurent Destailleur
533c19cc2c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/lib/functions.lib.php
2018-06-22 15:29:26 +02:00
Laurent Destailleur
8414ceaddb
Merge pull request #9000 from ATM-Marc/FIX_7.0_propal_contact_SHIPPING
...
FIX: proposal: missing contact type translation key
2018-06-22 15:16:56 +02:00
Laurent Destailleur
1bf0432a72
Merge pull request #8997 from ptibogxiv/patch-29
...
add minute to duration services
2018-06-22 15:12:57 +02:00
Laurent Destailleur
1cef4c1563
Merge pull request #8995 from ATM-Marc/FIX_develop_PR8841
...
FIX PR #8841
2018-06-22 15:10:33 +02:00
Laurent Destailleur
ac19a6e211
Merge pull request #8993 from hregis/develop_pgsql
...
Fix: wrong field name, use "type" instead "llx_c_type_fees"
2018-06-22 15:09:31 +02:00
Laurent Destailleur
bd7277431f
Merge pull request #8986 from atm-greg/fix_desired_stock
...
FIX bad result on fetch ProductStockEntrepot
2018-06-22 15:01:19 +02:00
Laurent Destailleur
11d4241221
Merge pull request #9002 from grandoc/new_branch_21_06_2018
...
clean and update code
2018-06-22 14:55:11 +02:00
Laurent Destailleur
430dea917e
Merge pull request #9005 from dolibarr95/patch-47
...
FIX: Add rights check in shipping
2018-06-22 14:54:47 +02:00
Laurent Destailleur
0f80508be1
Fix canvas on list is a feature going in the wall so i clean this.
2018-06-22 14:51:47 +02:00
Laurent Destailleur
cfc8e8b0ef
Merge pull request #8972 from fmarcet/7.0
...
FIX Avoid converting into reduction twice and draft invoice
2018-06-22 14:35:26 +02:00
Laurent Destailleur
5bee324578
Update paiement.class.php
2018-06-22 14:34:59 +02:00
Laurent Destailleur
77e7b5793f
Fix translation
2018-06-22 14:31:45 +02:00
dolibarr95
45451f08b0
Add rights check
...
Add rights check when edit parcel informations(weight, tracking...) of a shipping
2018-06-22 12:25:14 +02:00
atm-quentin
d8ebb5da8d
FIX trans
2018-06-22 11:02:20 +02:00
Laurent Destailleur
81497687e9
Fix missing oldcopy in trigger call
2018-06-22 10:55:36 +02:00
atm-quentin
d53aa71673
NEW advance target filtering can be used everywhere with tpl and fk_element
2018-06-22 10:54:00 +02:00
Laurent Destailleur
88d3bf0148
FIX creation of tasks must hide closed project
2018-06-21 18:47:02 +02:00
Philippe GRAND
da2f07c848
clean and update code
2018-06-21 15:01:45 +02:00
Laurent Destailleur
cfcedc1170
Fix remove old unique key constraint
2018-06-21 00:11:37 +02:00
Laurent Destailleur
1a8afeff2a
Fix error message
2018-06-20 23:50:50 +02:00
Laurent Destailleur
2d89d9634b
Fix search on extrafields
2018-06-20 23:16:06 +02:00
Laurent Destailleur
a3b9d4f01b
Fix tooltip on subsidiary list
2018-06-20 22:02:36 +02:00
Laurent Destailleur
07c514b85c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
htdocs/projet/class/projectstats.class.php
2018-06-20 21:56:10 +02:00
Laurent Destailleur
828a9296b4
Fix stats on project
2018-06-20 21:52:06 +02:00
Laurent Destailleur
714057d435
Fix stats on project. Must use assignement on project as filter.
2018-06-20 21:31:37 +02:00
Laurent Destailleur
90b2314d98
Code comment
2018-06-20 21:24:57 +02:00
Laurent Destailleur
9f2437fa04
Fix missing field
2018-06-20 17:59:01 +02:00
Marc de Lima Lucio
2fab4d7f76
FIX: proposal: missing contact type translation key
2018-06-20 14:56:24 +02:00
dolibarr95
3b33dad8fd
Add supplier ref
...
Hi
In all common case the supplier send a receipt with the parcel on which is writen his product ref (because this is his reference) with the quantity in the parcel and if he is smart/nice our reference.
By adding the supplier ref column the supplier order dispatch is easier.
Tks.
2018-06-20 14:40:32 +02:00
ptibogxiv
a6151ee11e
add minute to duration services
...
add minute for duration description (more compliant thant 0,166667h for billing services by minute
2018-06-20 12:10:25 +02:00
Philippe GRAND
4f554ab52a
clean and update code
2018-06-20 12:09:47 +02:00
Marc de Lima Lucio
dc951029cd
Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm
2018-06-20 10:31:35 +02:00
Marc de Lima Lucio
babc99465c
FIX PR #8841
2018-06-20 10:22:43 +02:00
Marc de Lima Lucio
9fa9a716d5
FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts
2018-06-20 10:22:43 +02:00
Regis Houssin
8fc2f7441c
Fix: to avoid deleting line breaks
2018-06-20 09:06:16 +02:00
Regis Houssin
e1db5ab433
Fix: wrong field name, use "type" instead "llx_c_type_fees"
2018-06-19 19:56:39 +02:00
Laurent Destailleur
a73296e212
Fix reseller not saved
2018-06-19 19:34:23 +02:00
Regis Houssin
b9fe6f8624
Fix: avoid warning
2018-06-19 19:00:23 +02:00
Regis Houssin
2c927dba01
Fix: wrong var name "shownav"
2018-06-19 18:33:22 +02:00
Regis Houssin
b9893bde1d
Fix: avoid Warning: A non-numeric value encountered
2018-06-19 18:26:37 +02:00
Laurent Destailleur
19e40466b1
css
2018-06-19 13:26:30 +02:00
Laurent Destailleur
fb2e820329
Fix menu not visible on jmobile
2018-06-19 13:17:46 +02:00
Laurent Destailleur
b364412a4a
FIX Menu scheduled jobs not visible on jmobile conf
2018-06-19 13:10:13 +02:00
a-schild
baba0757d7
Added filtering by prospect type and status
...
Added filtering by prospect type and status
2018-06-19 11:46:03 +02:00
a-schild
211bb87e46
Moved functionality to select by categories
...
Moved functionality to select by categories
2018-06-19 11:45:27 +02:00
atm-greg
df056980b5
fix bad result on fetch ProductStockEntrepot
2018-06-19 10:46:07 +02:00
Laurent Destailleur
edd7499375
Fix clone with new architecture
2018-06-19 09:21:23 +02:00
Laurent Destailleur
e402f68593
Clean code
2018-06-19 08:51:25 +02:00
Laurent Destailleur
75dee7538b
Fix add protection to avoir fatal error 500
2018-06-19 01:15:37 +02:00
Laurent Destailleur
5d5083199f
FIX better text content for multipart email
2018-06-18 23:26:21 +02:00
Laurent Destailleur
f9f7d3655d
FIX better text content for multipart email
2018-06-18 23:24:31 +02:00
Laurent Destailleur
c3f64ed36e
FIX better text content for multipart email
2018-06-18 23:18:22 +02:00
Laurent Destailleur
da16805b00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-18 16:27:36 +02:00
Laurent Destailleur
d81398e72d
Fix info on tooltip
2018-06-18 16:27:25 +02:00
Laurent Destailleur
62307b74e7
Merge pull request #8981 from grandoc/new_branch_18_06_2018
...
clean and upsdate code
2018-06-18 15:14:29 +02:00
Laurent Destailleur
b64b4abf07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-18 14:46:47 +02:00
Laurent Destailleur
4f877e7970
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/accountancy/supplier/lines.php
2018-06-18 14:46:30 +02:00
Laurent Destailleur
31067b6250
FIX picto for type in product link in accountany list is wrong
2018-06-18 14:43:32 +02:00
Laurent Destailleur
ce5514bd68
Fix sql begin at wrong place
2018-06-18 14:37:16 +02:00
Laurent Destailleur
5b019eb985
Merge pull request #8982 from hregis/7.0_bug6
...
Fix: "libelle" is deprecated, use "label" instead
2018-06-18 14:32:35 +02:00
Laurent Destailleur
5d6d43d539
Merge pull request #8964 from atm-gauthier/6.0_accounting_entity
...
FIX : need to filter on aa.entity for same accounting accounts available in several entities
2018-06-18 14:30:55 +02:00
Philippe GRAND
41a0175827
clean and upsdate code
2018-06-18 14:17:43 +02:00
Regis Houssin
54a333c374
Fix: use label instead libelle
2018-06-18 13:54:14 +02:00
Regis Houssin
494d6dcfef
Fix: libelle is deprecated, use label instead
2018-06-18 13:50:58 +02:00
Laurent Destailleur
ad2df304b4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/fourn/commande/card.php
htdocs/societe/class/societe.class.php
2018-06-18 13:31:29 +02:00
Laurent Destailleur
16fee19b6f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-06-18 13:20:11 +02:00
Laurent Destailleur
102f9aa84f
FIX Problems in accountancy module when using multicompany module.
2018-06-18 13:19:46 +02:00
Philippe GRAND
62586c7c5d
clean and upsdate code
2018-06-18 12:47:17 +02:00
a-schild
3e9bc75c9c
Added mailings to thirdparties
...
Allows to select third parties as mailing targets, depending client/lead
and active/inactive status
2018-06-18 12:23:27 +02:00
gauthier
fed61930d5
FIX : clause must not be there
2018-06-18 11:37:15 +02:00
atm-greg
2cdae2ec98
remove globalcard context
2018-06-18 11:30:38 +02:00
Laurent Destailleur
cf0be86d0e
Merge pull request #8963 from ATM-Marc/NEW_supplierorderexport_reffourn
...
NEW: supplier order/order lines export: add supplier product ref
2018-06-18 11:26:14 +02:00
Laurent Destailleur
5675c8fc01
Update modFournisseur.class.php
2018-06-18 11:26:03 +02:00
Laurent Destailleur
e993a41160
Update modFournisseur.class.php
2018-06-18 11:24:58 +02:00
Laurent Destailleur
5632228153
Update modFournisseur.class.php
2018-06-18 11:23:36 +02:00
Laurent Destailleur
8c6f311aa6
Merge pull request #8974 from atm-ph/fix_7.0_addMoreActionsButtons_on_usercard
...
Fix missing hook on usercard (addMoreActionsButtons)
2018-06-18 11:18:12 +02:00
Laurent Destailleur
ca5f27636b
Merge pull request #8978 from grandoc/new_branch_17_06_2018
...
clean and update code
2018-06-18 11:16:00 +02:00
Laurent Destailleur
9d048281dc
Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument
...
Fix missing params on generateDocument
2018-06-18 11:14:49 +02:00
Laurent Destailleur
9cfc4a8d28
Merge pull request #8971 from atm-ph/fix_7.0_hook_getnomurltooltip
...
Fix can't add an attribute simply
2018-06-18 11:13:29 +02:00
Laurent Destailleur
95ee3325fc
Part of fix of #8972
2018-06-18 11:11:07 +02:00
Laurent Destailleur
95dfa1f7aa
Merge pull request #8973 from altatof/FIX_HTML_DETECTION
...
Fix <br/> detection
2018-06-18 10:42:02 +02:00
Laurent Destailleur
5d56969bd9
Merge pull request #8977 from hythamsoliman81/dolibarr-fixes
...
FIX: SQL syntax error at llx_website_page.sql
2018-06-18 10:41:45 +02:00
Laurent Destailleur
63fb82931c
Update functions.lib.php
2018-06-18 10:41:11 +02:00
Philippe GRAND
ddbf5e59e1
clean and update code
2018-06-18 10:12:19 +02:00
Philippe GRAND
4c08e2ebf3
clean and update code
2018-06-17 14:33:29 +02:00
Laurent Destailleur
7c7ee56832
Fix missing email
...
Fix avoid warning
2018-06-17 01:50:10 +02:00
hythamsoliman81
f461ab5f96
SQL synatx error at llx_website_page.sql
2018-06-17 00:12:06 +02:00
Laurent Destailleur
dcd43b715a
Fix look and feel v8
2018-06-16 23:51:30 +02:00
Laurent Destailleur
187127ce6f
Fix CSS
2018-06-16 21:19:50 +02:00
Laurent Destailleur
8c748505db
Use parent instead of parents
2018-06-16 17:25:16 +02:00
Laurent Destailleur
7ad086bbdf
FIX Duplicate select2 when we split a supplier order receipt item
2018-06-16 17:18:17 +02:00
Laurent Destailleur
5524784421
FIX prefilled date of order must have hours too
2018-06-16 15:24:31 +02:00
Laurent Destailleur
186f08e67b
Fix preview of PDF for supplier objects
2018-06-16 15:08:13 +02:00
Laurent Destailleur
7981bd08b7
Fix price+sql error when adding product when no supplier price defined
2018-06-16 14:47:33 +02:00
Laurent Destailleur
4898f10fa2
FIX Adding a product with no supplier price defined yet
2018-06-16 13:49:28 +02:00
Laurent Destailleur
92952aea28
Trans
2018-06-16 13:23:58 +02:00
Laurent Destailleur
5908fc1471
Trans
2018-06-16 13:15:24 +02:00
atm-greg
72449ddef4
add hooks on stock replenish
2018-06-15 16:55:23 +02:00
Laurent Destailleur
c0d4715bdb
Clean code
2018-06-15 16:29:26 +02:00
atm-ph
3c80ce501b
Fix missing hook on usercard (addMoreActionsButtons)
2018-06-15 16:05:50 +02:00
altatof
5d6cd381b9
Fix <br/> detection
2018-06-15 15:59:14 +02:00
Laurent Destailleur
79cbdf7fd1
Code comment
2018-06-15 15:29:19 +02:00
Ferran Marcet
a21e138c70
Fix: Avoid converting into reduction twice and draft invoice
2018-06-15 11:19:04 +02:00
atm-ph
cb3704b67e
Fix can't add an attribute simply
2018-06-15 11:02:46 +02:00
Inovea Conseil
d5a3e63e05
Fix missing paramater for generateDocument
2018-06-15 09:47:28 +02:00
Laurent Destailleur
df28be443b
Add syslog module in list of module reloaded in last migration step
2018-06-14 23:00:42 +02:00
Laurent Destailleur
f5c08c4b9f
Doc website
2018-06-14 16:38:20 +02:00
Laurent Destailleur
25d656025a
Fix use of alternative aliases is ok now
2018-06-14 16:33:11 +02:00
Laurent Destailleur
b37f7a6953
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-14 16:15:34 +02:00
Laurent Destailleur
e28aca6244
Fix workaround against p insertion by ckeditor
2018-06-14 16:15:06 +02:00
Regis Houssin
f9a86ba43f
Fix: MEMBER_MODIFY trigger not called if i change only extrafields
2018-06-14 14:01:05 +02:00
Laurent Destailleur
9717a32a2e
Merge pull request #8960 from grandoc/new_branch_13_06_2018
...
clean code
2018-06-14 12:01:19 +02:00
gauthier
e9d65ea751
FIX : need to filter on aa.entity for same accounting accounts available in several entities
2018-06-14 11:56:22 +02:00
Laurent Destailleur
f79466d483
Trans
2018-06-14 11:41:14 +02:00
Marc de Lima Lucio
a5898b830b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 7.0
2018-06-14 10:48:09 +02:00
Marc de Lima Lucio
a80e1c601c
NEW: supplier order/order lines export: add supplier product ref
2018-06-14 10:43:01 +02:00
Marc de Lima Lucio
1dec4c4320
FIX: supplier order: product supplier ref not saved on addline
2018-06-14 10:37:40 +02:00
Laurent Destailleur
4900f1f1f1
Fix sql coding style
2018-06-13 23:10:29 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
a15cfd23f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-13 22:57:51 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Philippe GRAND
a937d9e657
clean code
2018-06-13 22:52:24 +02:00
Laurent Destailleur
c5887c1ec7
Merge pull request #8399 from ptibogxiv/patch-23
...
FIX lang for support more type of stripeconnect account
2018-06-13 22:13:43 +02:00
Laurent Destailleur
e18717aa85
Update html.formprojet.class.php
2018-06-13 22:12:16 +02:00
Laurent Destailleur
933a6a5ba3
Update html.formcontract.class.php
2018-06-13 22:11:44 +02:00
Laurent Destailleur
094b31a563
Complete migration
2018-06-13 21:46:55 +02:00
Laurent Destailleur
ed41731a50
Merge pull request #8954 from mwelters/develop
...
German Accounting Plan SKR03 and SKR04 (mysql/data)
2018-06-13 21:45:02 +02:00
Laurent Destailleur
c09e69aeb6
Update llx_accounting_abc.sql
2018-06-13 21:44:43 +02:00
Laurent Destailleur
8d1456fb7f
Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal
...
add product units management in supplier proposal documents
2018-06-13 21:41:39 +02:00
Laurent Destailleur
aaa6565014
Merge pull request #8938 from HackLo/develop
...
FIX: Link does not work when there is spaces in SIREN
2018-06-13 21:39:54 +02:00
Laurent Destailleur
6881fda744
Merge pull request #8934 from grandoc/new_branch_08_06_2018
...
New branch 08 06 2018
2018-06-13 21:38:46 +02:00
Laurent Destailleur
074ada10e6
Merge pull request #8940 from aspangaro/8.0-b33
...
Fix : Migration for Romanian chart of accounts
2018-06-13 21:37:50 +02:00
Laurent Destailleur
09c92b7cc8
Merge pull request #8936 from atm-gauthier/6.0_fix_dont_remove_all_fourn_rights
...
FIX : If we enable 3 steps for supplier order approbation, we must no…
2018-06-13 21:36:01 +02:00
Laurent Destailleur
bc0080b945
Merge pull request #8945 from bafbes/abb7009
...
Fix: Do not activate module if errors found on execution of module SQL queries
2018-06-13 21:28:04 +02:00
Laurent Destailleur
98ae8e18df
Update modMyModule.class.php
2018-06-13 21:27:57 +02:00
Laurent Destailleur
c586f2ecf7
Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE
...
FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
2018-06-13 21:20:42 +02:00
Laurent Destailleur
4b84b7ccf2
Merge pull request #8926 from fappels/develop_fix_setvaluefrom
...
FIX commonobject setValueFrom trigger
2018-06-13 20:50:26 +02:00
Laurent Destailleur
916424943e
Merge pull request #8942 from grandoc/new_branch_10_06_2018
...
New branch 10 06 2018
2018-06-13 20:48:22 +02:00
Laurent Destailleur
e69b0102a5
Merge pull request #8935 from inoveaconseil/modulebuilder
...
Fix include for older version
2018-06-13 20:43:38 +02:00
Laurent Destailleur
4be069a3b5
Update setup.php
2018-06-13 20:43:02 +02:00
Laurent Destailleur
e983566422
Merge pull request #8947 from glu000/develop
...
Fix for Bug #8946
2018-06-13 20:41:54 +02:00
Laurent Destailleur
dd8e39195d
Merge pull request #8932 from grandoc/new_branch_07_06_2018
...
New branch 07 06 2018
2018-06-13 20:40:48 +02:00
Laurent Destailleur
3703a7c4b0
Merge pull request #8952 from papoteur-mga/patch-1
...
Fix: In list of bank accounts, display the balance in formatted price
2018-06-13 20:40:27 +02:00
Laurent Destailleur
4acde4e0a9
Merge pull request #8950 from ATM-Marc/FIX_develop_sortfield
...
FIX: handle sortorder on multiple columns + potential SQL field mismatch
2018-06-13 20:36:08 +02:00
Laurent Destailleur
b5cd722eb1
Merge pull request #8917 from atm-gauthier/6.0_fix_apply_reduc
...
FIX : sometimes amounts are identical but php find them different.
2018-06-13 20:34:59 +02:00
Laurent Destailleur
76ee88f0b1
Merge pull request #8951 from fappels/7.0_fix_ErrorProductAlreadyExists
...
Fix Wrong error for duplicate ref if barcode enabled but not set.
2018-06-13 20:19:55 +02:00
Laurent Destailleur
b8e927d347
Merge pull request #8915 from grandoc/new_branch_04_06_2018
...
clean and update code
2018-06-13 20:16:19 +02:00
Laurent Destailleur
3ec6b88ece
Merge pull request #8958 from frederic34/listfax
...
FIX add fax to thirdparty list
2018-06-13 20:10:10 +02:00
Laurent Destailleur
eabb3e9cd3
Merge pull request #8930 from hregis/7.0_non-numeric
...
FIX wrong var name $search_month_lim
2018-06-13 20:09:13 +02:00
Laurent Destailleur
5fcfad5966
Merge pull request #8918 from atm-gauthier/6.0_fix_entity_select_prod_fourn_prices
...
FIX : entity test must be on product_fourn_price table and not product table
2018-06-13 20:08:25 +02:00
Laurent Destailleur
49d749a4b9
Merge pull request #8920 from grandoc/new_branch_05_06_2018
...
clean and update code
2018-06-13 20:04:41 +02:00
Laurent Destailleur
887c9e0495
Merge pull request #8922 from aspangaro/8.0-b31
...
NEW Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
2018-06-13 20:04:16 +02:00
Laurent Destailleur
3f7f77ce95
Merge pull request #8923 from atm-florian/7.0
...
fix error display
2018-06-13 20:02:45 +02:00
Laurent Destailleur
fdc90da408
Update card.php
2018-06-13 20:02:38 +02:00
Laurent Destailleur
1e488a6f7f
Merge pull request #8924 from dtix/patch-1
...
Romania vat rate changed
2018-06-13 20:01:48 +02:00
Laurent Destailleur
4c1bb9d28f
Merge pull request #8948 from glu000/7.0
...
Fix #8946
2018-06-13 20:01:29 +02:00
Laurent Destailleur
f07408c6c3
Merge pull request #8929 from ATM-Marc/FIX_7.0_extrafields_intervention
...
FIX: intervention: extrafield error when calling insertExtrafields
2018-06-13 20:00:48 +02:00
Laurent Destailleur
6fbdcea356
Code comment
2018-06-13 19:22:50 +02:00
Frédéric FRANCE
345fb1f2af
add fax to thirdparty list
2018-06-13 17:57:15 +02:00
Laurent Destailleur
03b6bec8b8
Fix email template for test
2018-06-13 17:03:46 +02:00
altatof
d42f00bca9
FIX : pu_ht_devise was not converted to numeric so decimals were lost
...
when clculating total_ht_devise
2018-06-13 16:35:52 +02:00
Laurent Destailleur
cfa69fe93f
FIX popup confirmation deos not accept value with special chars
2018-06-13 14:51:20 +02:00
Laurent Destailleur
50aa674ebc
Fix support of 'help' field property. Fix bad td closing.
2018-06-13 13:36:40 +02:00
Laurent Destailleur
f4bef82bfa
Fix td not closed and js code duplicated (at wrong place)
2018-06-13 13:00:08 +02:00
Laurent Destailleur
ff002a45e0
Missing trans
2018-06-13 11:50:06 +02:00
Markus Welters
885904132c
Update llx_accounting_abc.sql
2018-06-13 09:37:12 +02:00
Papoteur
6567365086
In list of bank accounts, display the balance in formatted price
...
[Problem to solve]
in compta/bank/list.php, the balance can be displayed witht decimal or not. This is not fine.
[Solution]
Change a parameter in the price function to format the balance with the required number of decimals.
2018-06-13 08:39:26 +02:00
Laurent Destailleur
b1986a8d2e
Fix trans
2018-06-12 19:22:28 +02:00
fappels
a86c90fed1
Fix Wrong error for duplicate ref if barcode enabled but not set.
2018-06-12 16:38:42 +02:00
Marc de Lima Lucio
e992187f4c
FIX: handle sortorder on multiple columns + potential SQL field mismatch
2018-06-12 16:00:16 +02:00
atm-greg
d14f40f722
add product units management in supplier proposal documents
2018-06-12 14:36:32 +02:00
Laurent Destailleur
4313e41580
Start to fix pb with 3DS
2018-06-12 13:47:28 +02:00
Günter Lukas
fcbf50467e
Update user.class.php
2018-06-12 09:52:55 +02:00
Günter Lukas
3c42a282f5
Fix for Bug #8946
...
Add element fields to class user
2018-06-12 09:48:03 +02:00
Abbes Bahfir
2f759e0c18
Fix: Do not activate module if errors on module SQL queries execution
2018-06-12 00:43:01 +01:00
Abbes Bahfir
74d92dd91f
New: Optiopn to see line numbers in modules page
2018-06-11 23:10:40 +01:00
Laurent Destailleur
94919d6e99
Translation
2018-06-11 15:17:05 +02:00
Laurent Destailleur
5ae1395acd
Fix js when no data
2018-06-11 14:22:01 +02:00
Laurent Destailleur
1d7d16649a
Code comment
2018-06-11 12:31:26 +02:00
Laurent Destailleur
d6a84b0685
FIX Sync third party change to Stripe only if we change Stripe data
2018-06-11 11:47:10 +02:00
Laurent Destailleur
eb8d67483b
Fix message error
2018-06-11 10:40:57 +02:00
Laurent Destailleur
b5586af56e
Fix js error
2018-06-11 10:38:04 +02:00
Laurent Destailleur
ab93909402
Fix url test
2018-06-11 10:36:50 +02:00
Laurent Destailleur
8978208080
Check url
2018-06-11 10:34:54 +02:00
Laurent Destailleur
f0446d2a3b
Fix for content editable sites
2018-06-11 10:25:22 +02:00
Laurent Destailleur
557db7661c
Fix for content editable sites
2018-06-11 10:19:42 +02:00
Laurent Destailleur
7562c13fad
The about page is now a README.md file
2018-06-11 09:32:41 +02:00
Laurent Destailleur
ab5ed6a3b5
Fix rename of ticket language file
2018-06-11 09:31:31 +02:00
Laurent Destailleur
b67a86843b
Fix sql error
2018-06-11 09:22:50 +02:00
Laurent Destailleur
64537ba9bf
Fix missing field in install
2018-06-11 09:20:26 +02:00
Philippe GRAND
5021c7a556
clean and update code
2018-06-10 18:29:04 +02:00
Philippe GRAND
f1f56ca5e9
Merge remote-tracking branch 'upstream/develop' into develop
2018-06-10 18:09:24 +02:00
Alexandre SPANGARO
c7e6ee3a1b
Fix : Migration for Romanian chart of accounts
2018-06-10 04:02:35 +02:00
markus
f3a7e2205b
fix typo
2018-06-09 19:07:33 +02:00
markus
9ce10ccef7
Adding SKR03 and SKR04
2018-06-09 19:00:24 +02:00
Laurent Destailleur
31eeaf9914
Trans
2018-06-09 13:46:42 +02:00
Loïc Barouty
945b71d6af
FIX: Link does not work when there is spaces in SIREN (like in the main format)
2018-06-08 23:38:44 +02:00
Laurent Destailleur
758e5a51a5
Fix contextpage was not saved in forms
2018-06-08 19:35:53 +02:00
Laurent Destailleur
eb9321f2b8
css
2018-06-08 17:53:13 +02:00
gauthier
baf9d4a806
FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def.
2018-06-08 17:11:59 +02:00
Laurent Destailleur
95d5a1088b
Fix error on sql error (field does not exists)
2018-06-08 16:49:14 +02:00
Inovea Conseil
75bb5c1624
Fix include for older version
2018-06-08 16:01:09 +02:00
Laurent Destailleur
485dc9a57a
Clean code
2018-06-08 15:37:25 +02:00
Philippe GRAND
8f777a513b
clean and update code
2018-06-08 10:33:52 +02:00
Philippe GRAND
4dc42f65da
Merge remote-tracking branch 'upstream/develop' into develop
2018-06-08 09:49:03 +02:00
Laurent Destailleur
fb8dd2f32b
FIX TCPDF is generated PDF 1.7 but TCPDI was setting version to 1.3
2018-06-08 09:37:26 +02:00
Laurent Destailleur
8142a672a7
PDF compatibility. Use hidden option to force PDF1/A instead of PDF-1.3
2018-06-07 21:12:30 +02:00
Laurent Destailleur
df7e9fccdd
Autofill alias
2018-06-07 19:12:18 +02:00
Philippe GRAND
9a44a433b8
clean code
2018-06-07 18:32:00 +02:00
Philippe GRAND
4fd2468b6f
clean code
2018-06-07 18:13:00 +02:00
Rui Strecht
083acb1af5
Added MAIN_DOCUMENTS_DESCRIPTION_FIRST option to allow desc to appear before product/service label in documents
2018-06-07 16:24:45 +01:00
Regis Houssin
7ce2ebf1a9
Fix: wrong var name
2018-06-07 16:25:47 +02:00
Marc de Lima Lucio
d69fae72c7
FIX: intervention: extrafield regression in commit b5f37301a5
2018-06-07 15:17:22 +02:00
Laurent Destailleur
8aa7956b4f
Fix missing extraparams field in insert action
2018-06-07 12:53:06 +02:00
Laurent Destailleur
186df884fa
Trans
2018-06-07 09:37:12 +02:00
Laurent Destailleur
929a44d7ca
Fix dir of contract for multicompany
2018-06-06 23:56:59 +02:00
Laurent Destailleur
d10c9cf565
FIX dir for modules must not have s at end (fix contracts into contract)
2018-06-06 23:47:48 +02:00
Laurent Destailleur
76f0236bb6
Fix empty page
2018-06-06 23:13:49 +02:00
fappels
a9f60bcdac
fix travis
2018-06-06 22:04:12 +02:00
Laurent Destailleur
a7b38db31f
Fix bug reported by scrutinizer
2018-06-06 18:55:50 +02:00
Laurent Destailleur
b57f3a3f36
Fix bug reported by scrutinizer
2018-06-06 18:41:35 +02:00
Laurent Destailleur
6b24d81afc
Fix bug reported by scrutinizer
2018-06-06 18:40:56 +02:00
Laurent Destailleur
a8e06abc4f
Fix bug reported by scrutinizer
2018-06-06 18:35:11 +02:00
Laurent Destailleur
f9a24c53c0
Fix bug reported by scrutinizer
2018-06-06 18:20:31 +02:00
Laurent Destailleur
6e62727c37
Fix scrutinizer bug
2018-06-06 18:18:50 +02:00
Laurent Destailleur
bb97119233
Fix duplicate function name
2018-06-06 18:07:32 +02:00
fappels
141d19571c
Add modify trigger to barcode modify.
2018-06-06 17:11:34 +02:00
fappels
81ef355b65
Fix trigger on setValueFrom
...
Load updated values into object for trigger.
2018-06-06 17:10:46 +02:00
Laurent Destailleur
002181190c
Fix option not used
2018-06-06 15:28:50 +02:00
dtix
e6da000ae8
Romania vat rate changed
2018-06-06 14:48:11 +03:00
Laurent Destailleur
74890ce656
Sync transifex
2018-06-06 12:02:33 +02:00
Laurent Destailleur
ac721b46bc
Trans
2018-06-06 11:16:42 +02:00
Laurent Destailleur
35ed49e575
Trans
2018-06-06 10:42:41 +02:00
Laurent Destailleur
5ea1890f0c
Fix payments on contract line
2018-06-06 10:28:53 +02:00
florian HENRY
75305e095d
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
2018-06-05 20:39:53 +02:00
florian HENRY
8031ef49f2
fix error return
2018-06-05 20:38:55 +02:00
Alexandre SPANGARO
f2c04c5653
Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
2018-06-05 20:37:39 +02:00
Laurent Destailleur
30b04c0d3d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2018-06-05 18:16:32 +02:00
Laurent Destailleur
4c21ad4e4e
FIX: dol_delete_file must work in a context without db handler loaded
...
Conflicts:
htdocs/core/lib/files.lib.php
2018-06-05 18:12:14 +02:00
Laurent Destailleur
1671c8b6cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-05 18:06:30 +02:00
Laurent Destailleur
9c32e49bd3
FIX: dol_delete_file must work in a context without db handler loaded
2018-06-05 18:05:33 +02:00
Laurent Destailleur
f28a6e59c8
Look and feel v8
2018-06-05 16:30:16 +02:00
Philippe GRAND
82bb1c8806
clean and update code
2018-06-05 14:29:25 +02:00
gauthier
45ecb0258b
FIX : entity test must be on product_fourn_price table and not product table
2018-06-05 12:41:38 +02:00
gauthier
77e7932671
FIX : sometimes amounts are identical but php find them different.
2018-06-05 11:33:58 +02:00
Laurent Destailleur
8d62c06653
css
2018-06-05 11:25:41 +02:00
Laurent Destailleur
b6955692b4
Fix autofill of password
2018-06-05 11:22:00 +02:00
Laurent Destailleur
9730138845
Code comment
2018-06-05 11:06:44 +02:00
Laurent Destailleur
7cb66e8e0c
Fix reset of filters
2018-06-05 10:04:57 +02:00
Laurent Destailleur
e7f6a5112c
Bad picto
2018-06-05 09:02:50 +02:00
Laurent Destailleur
7c82c74b6b
Fix install check
2018-06-05 08:57:04 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Philippe GRAND
909fa496e5
clean and update code
2018-06-04 17:37:17 +02:00
Laurent Destailleur
7a8fac4198
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
2018-06-04 15:14:26 +02:00
Laurent Destailleur
3368e35502
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-06-04 14:09:34 +02:00
Laurent Destailleur
de2ffa1122
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/listactions.php
2018-06-04 14:09:17 +02:00
Laurent Destailleur
69dd11f7c6
Fix: Must use a standard (internationnal) date format.
2018-06-04 14:05:47 +02:00
Laurent Destailleur
eca66492ce
Merge pull request #8913 from aspangaro/8.0-a26
...
NEW : Accountancy Add import on general ledger
2018-06-04 14:02:34 +02:00
Laurent Destailleur
840330deea
Merge pull request #8905 from atm-greg/Add_supplier_proposals_in_suppliers_linkedObjects
...
Add supplier proposal in linkedObjects type select of the suppliers
2018-06-04 13:46:36 +02:00
Laurent Destailleur
40ab046bd1
Merge pull request #8904 from Mavyre/develop
...
FIX Errors on synchronize rates when accessing Dolibarr from HTTPS
2018-06-04 13:46:03 +02:00
Laurent Destailleur
5f4932c0b0
Merge pull request #8902 from bgenere/develop
...
FIX extrafield template for list and resource list with extrafields
2018-06-04 13:44:14 +02:00
Laurent Destailleur
54023d1029
Update list.php
2018-06-04 13:42:30 +02:00
Laurent Destailleur
af974430f5
Merge pull request #8901 from defrance/patch-119
...
Add Hook on getNomUrl
2018-06-04 13:36:46 +02:00
Laurent Destailleur
61946446b2
Update fichinter.class.php
2018-06-04 13:36:38 +02:00
Laurent Destailleur
da44ea858c
Trans
2018-06-04 13:35:30 +02:00
Laurent Destailleur
eaee252a5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
Laurent Destailleur
60ce5fb87e
Merge pull request #8911 from fappels/develop_fix_properties_for_trigger
...
FIX stock movement trigger is missing some data
2018-06-04 12:20:47 +02:00
Laurent Destailleur
536e8297c2
Merge pull request #8897 from areaeuro/patch-3
...
FIX Delete thirdparty logo
2018-06-04 12:19:41 +02:00
Alexandre SPANGARO
a3030e4057
Update works
2018-06-03 22:35:39 +02:00
fappels
e0f9605483
Fix add missing properties for trigger
2018-06-03 11:05:02 +02:00
Laurent Destailleur
a6104d18a9
CSS
2018-06-02 16:36:05 +02:00
Laurent Destailleur
034ce7e55d
CSS
2018-06-02 10:36:22 +02:00
Laurent Destailleur
5ff3398048
Try to fix evil Google Chrome autopopulate bug
2018-06-01 18:27:17 +02:00
Laurent Destailleur
be2c49d490
Fix log
2018-06-01 17:39:07 +02:00
Laurent Destailleur
b094ae953e
Better log
2018-06-01 17:20:49 +02:00
Laurent Destailleur
3f6d11cf26
Fix log
2018-06-01 16:23:42 +02:00
Laurent Destailleur
7c0afbe025
Clean code
2018-05-31 17:12:08 +02:00
atm-greg
0785029fe0
Add supplier proposal in linkedObjects type select of the suppliers
2018-05-31 10:46:50 +02:00
Laurent Destailleur
0503373e31
Avoid error on screen
2018-05-31 09:49:46 +02:00
Inovea Conseil
0f9fa09d3f
Fix after the comment
2018-05-31 09:13:18 +02:00
Mavyre
6b86e1c3bb
FIX Bookkeeping report wrong display
2018-05-30 21:38:57 +02:00
Mavyre
ace57859e4
Use curl to get rates from CurrecyLayer API
2018-05-30 21:14:51 +02:00
Mavyre
e59a91bdae
Stopped using AJAX for the synchro
2018-05-30 21:12:28 +02:00
bgenere
67830a7d04
FIX extrafields display properly in list for Resource module
2018-05-30 17:09:24 +02:00
bgenere
89d9fe3919
FIX Issue for extra fields date display in template.
...
Template is now consistent with the extrafiels_view template
2018-05-30 17:08:01 +02:00
BENKE Charlene
0ce3b2b431
Add Hook on getNomUrl
2018-05-30 14:19:30 +02:00
Inovea Conseil
78b3067de3
NEW: ADD admin page for modulebuilder
...
ADD custom README
ADD choice to generate about page and documentation folder
2018-05-30 13:54:43 +02:00
Inovea Conseil
7c57b360a3
Auto stash before merge of "develop" and "Dolibarr/develop"
2018-05-30 13:45:17 +02:00
Inovea Conseil
9391ec4951
Merge remote-tracking branch 'Dolibarr/develop' into develop
2018-05-30 13:44:00 +02:00
florian HENRY
b996237142
fix: when agenda is filterd with "todo" event, do not display "not
...
applicable" event
2018-05-30 13:37:17 +02:00
areaeuro
475297b98b
Update card.php
...
Line 714 - conditional to delete thirdparty logos
$object->photo
does not exits, and should read
$object->logo
This appears to be an oversight, as it is correct in the rest of the file
2018-05-30 12:29:02 +02:00
Laurent Destailleur
d8d4d15b4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:13:18 +02:00
Laurent Destailleur
0412264418
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:05:54 +02:00
Laurent Destailleur
60321aabd8
Fix regression
2018-05-30 11:59:23 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
...
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Laurent Destailleur
ec36f24046
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-30 11:17:21 +02:00
Laurent Destailleur
a6e323fae8
Fix bad usage of "for" loop
2018-05-30 11:16:06 +02:00
Laurent Destailleur
3733169120
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/recap-compta.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 11:09:53 +02:00
Laurent Destailleur
2df2071bae
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-30 11:05:12 +02:00
Laurent Destailleur
02da9b6992
FIX #8893 to get formatted price as substitution vars
2018-05-30 11:04:44 +02:00
Laurent Destailleur
e8d7c54716
Merge pull request #8890 from inoveaconseil/patch-3
...
Fix missing substitution
2018-05-30 10:52:35 +02:00
Laurent Destailleur
7590df85e6
Merge pull request #8887 from atm-florian/6.0
...
add hook on balence pages
2018-05-30 10:47:59 +02:00
Laurent Destailleur
e57ceab5de
Update fournisseur.commande.class.php
2018-05-30 10:45:06 +02:00
ATM-Nicolas
48a315f6cd
FIX : Bad substitution key used for default send proposal email
2018-05-30 10:14:34 +02:00
Inovea Conseil
e0c1e33012
NEW: ADD url to see the last version of a external module
2018-05-30 00:20:31 +02:00
Inovea Conseil
fc7b88e5e6
Fix missing substitution
...
Missing substitution for object
2018-05-29 23:04:35 +02:00
Mavyre
6ba6258d14
Fixed Classify abandonned not displaying
2018-05-29 17:36:24 +02:00
florian HENRY
b65b545e0f
add hook on balence pages
2018-05-29 16:29:14 +02:00
Laurent Destailleur
ee83b9a7b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-29 12:48:01 +02:00
Laurent Destailleur
57664c5a26
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/list.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
2018-05-29 12:47:42 +02:00
ATM-Nicolas
6b0b975ffd
FIX : Keep supplier proposal price for supplier order
2018-05-29 11:21:30 +02:00
Laurent Destailleur
51b5f63ce8
Merge pull request #8880 from wdammak/patch-14
...
Add movement generateDocument function (mode dev)
2018-05-29 11:15:00 +02:00
Laurent Destailleur
2ae9591d0d
Fix english name
2018-05-29 11:10:21 +02:00
Laurent Destailleur
8a6207efda
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-29 11:09:30 +02:00
Laurent Destailleur
99ccc50d91
Merge pull request #8876 from frederic34/patch-17
...
Delete config
2018-05-29 10:58:10 +02:00
Laurent Destailleur
0520c7efec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-29 10:57:28 +02:00
Laurent Destailleur
4d60fb3468
Fix size of popup
2018-05-29 10:57:14 +02:00
Laurent Destailleur
aa159f7b76
Merge pull request #8875 from frederic34/patch-16
...
fix asset admin
2018-05-29 10:56:54 +02:00
Laurent Destailleur
cf5f7bf06d
Update price.php
2018-05-29 10:52:55 +02:00
Laurent Destailleur
f473607249
Merge branch 'develop' into patch-15
2018-05-29 10:49:28 +02:00
Laurent Destailleur
1e5276f420
Merge pull request #8871 from el00ruobuob/patch-1
...
Update main.inc.php with charset
2018-05-29 10:48:54 +02:00
Laurent Destailleur
4b58158588
Update 7.0.0-8.0.0.sql
2018-05-29 10:47:14 +02:00
Laurent Destailleur
18898558e4
Merge branch 'develop' into patch-13
2018-05-29 10:46:28 +02:00
Laurent Destailleur
bf480b27f0
Merge pull request #8865 from frederic34/patch-11
...
Update admin.php for variant
2018-05-29 10:44:56 +02:00
Laurent Destailleur
b3cfed3d04
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-29 10:22:04 +02:00
Laurent Destailleur
01c8b33483
FIX 8870
2018-05-29 10:18:45 +02:00
Laurent Destailleur
7b824e3c48
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-29 10:13:48 +02:00
Laurent Destailleur
7eea70ebc8
FIX #8858 #8860 Backport better compatibility fix
2018-05-29 10:13:34 +02:00
Laurent Destailleur
323bf6ef1f
Merge pull request #8873 from frederic34/loadlangs
...
loadlangs
2018-05-29 10:07:10 +02:00
Laurent Destailleur
f83dedf1b0
Fix space/tab
2018-05-29 10:04:20 +02:00
Laurent Destailleur
b9682660d6
Merge pull request #8834 from Oeris/develop
...
NEW : adds billing contacts ids to REST API returns
2018-05-29 10:01:42 +02:00
Laurent Destailleur
0f50b0ffb1
Code comment
2018-05-29 10:00:08 +02:00
BENKE Charlene
7f8132e971
Create card-rec.php
2018-05-28 16:46:34 +02:00
BENKE Charlene
991c6d97c0
Update card.php
2018-05-28 16:44:49 +02:00
BENKE Charlene
0e7c82af95
Update eldy.lib.php
2018-05-28 16:43:23 +02:00
BENKE Charlene
a85ba00d2e
Create llx_fichinterdet_rec.sql
2018-05-28 16:42:19 +02:00
BENKE Charlene
0b7342f34b
Create llx_fichinter_rec.key.sql
2018-05-28 16:41:45 +02:00
BENKE Charlene
17016d03fe
Create llx_fichinter_rec.sql
2018-05-28 16:40:36 +02:00
BENKE Charlene
8124ea1522
Delete llx_fichinter_rec.sql
2018-05-28 16:39:56 +02:00
BENKE Charlene
eef8249ad7
Create llx_fichinter_rec.sql
2018-05-28 16:39:40 +02:00
BENKE Charlene
4a7ac774f7
introduce fichinter rec models
2018-05-28 16:38:11 +02:00
Neil Orley
748be12da2
Get external contacts ids instead of BILLING contacts ids.
2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2018-05-28 09:30:21 +02:00
wdammak
9ec6387a63
Add movement generateDocument function (mode dev)
2018-05-28 05:21:53 +01:00
Frédéric FRANCE
055508f343
remove one warning
2018-05-27 20:56:45 +02:00
Laurent Destailleur
5da89e1cad
Remove log
2018-05-27 19:33:46 +02:00
Laurent Destailleur
f3f252e88b
Fix duplicate record before creating primary key
2018-05-27 19:31:03 +02:00
Frédéric FRANCE
5c8f966898
Merge remote-tracking branch 'upstream/develop' into loadlangs
2018-05-27 18:41:17 +02:00
Laurent Destailleur
3f489ee3c6
Fix look and feel v7 for popup on ref of social contributions payments
2018-05-27 17:58:32 +02:00
Frédéric FRANCE
7eabc612e2
limit length of lines to 500 chars
2018-05-27 15:53:18 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Frédéric FRANCE
a0055174c4
loadlangs
2018-05-27 09:58:23 +02:00
Frédéric FRANCE
84f2b31d46
loadlangs
2018-05-27 09:40:17 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs
2018-05-27 09:27:09 +02:00
Frédéric FRANCE
ca9749eecc
Delete config
2018-05-27 00:32:41 +02:00
Frédéric FRANCE
753ba7ee17
Update assets_extrafields.php
2018-05-27 00:16:44 +02:00
Frédéric FRANCE
ec7516728d
Update assets_type_extrafields.php
2018-05-27 00:15:46 +02:00
Frédéric FRANCE
03bfb9a941
Update setup.php
2018-05-27 00:14:43 +02:00
Frédéric FRANCE
022d457284
loadlangs
2018-05-27 00:06:49 +02:00
Frédéric FRANCE
d986909109
loadlangs
2018-05-26 23:52:52 +02:00
patrick Delcroix
ef37fccef4
Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist
2018-05-26 23:43:17 +02:00
patrick Delcroix
adda3144bc
Fix Show double(x,y) fields
2018-05-26 23:39:36 +02:00
Frédéric FRANCE
622c394283
loadlangs
2018-05-26 21:11:25 +02:00
Frédéric FRANCE
f5605bdd7d
loadlangs
2018-05-26 20:51:17 +02:00
Frédéric FRANCE
30a3b95368
loadlangs
2018-05-26 20:32:23 +02:00
Frédéric FRANCE
f24a6ed4d6
loadlangs
2018-05-26 19:03:41 +02:00
Frédéric FRANCE
67e0abdd66
loadlangs
2018-05-26 18:52:14 +02:00
Frédéric FRANCE
f53f7bbf40
loadlangs
2018-05-26 18:41:16 +02:00
Frédéric FRANCE
58e5715ac3
loadlangs
2018-05-26 17:57:30 +02:00
Frédéric FRANCE
812b182680
loadlangs
2018-05-26 17:04:23 +02:00
Frédéric FRANCE
e87ff4d9b0
loadlangs
2018-05-26 16:24:54 +02:00
Frédéric FRANCE
9cd7bb3f58
loadlangs
2018-05-26 16:03:19 +02:00
Frédéric FRANCE
0a90f2d690
loadlangs
2018-05-26 15:50:03 +02:00
Frédéric FRANCE
cbed5c8349
loadlangs
2018-05-26 15:41:32 +02:00
Frédéric FRANCE
a487cf6806
Update price.php
2018-05-26 15:15:38 +02:00
el00ruobuob
667e4c30d6
Update main.inc.php
...
charset missing, causing display issues.
2018-05-26 12:05:39 +02:00
Frédéric FRANCE
d67bed57d9
Update 7.0.0-8.0.0.sql
2018-05-26 11:26:20 +02:00
Frédéric FRANCE
af73e6cd4d
Update llx_paiementfourn.sql
2018-05-26 11:23:49 +02:00
Frédéric FRANCE
091fb81368
Update list.php
2018-05-26 09:49:13 +02:00
Frédéric FRANCE
455f809968
Update admin.php
2018-05-26 09:40:00 +02:00
Laurent Destailleur
894f16c5ee
Fix navifation
2018-05-25 18:11:24 +02:00
Laurent Destailleur
b44717e706
Fix navifation
2018-05-25 18:06:13 +02:00
Laurent Destailleur
c78b1f1154
Fix navigation into page containers
2018-05-25 17:59:58 +02:00
Laurent Destailleur
d41b395a6d
Fix edition of type of container
2018-05-25 17:52:24 +02:00
Laurent Destailleur
bfa9850211
NEW Add arrows to navigate into containers in website module
2018-05-25 17:47:03 +02:00
Laurent Destailleur
bf81b755f9
Fix state code for payment from indonesia
2018-05-25 16:21:13 +02:00
Laurent Destailleur
37dcfe4a46
FIX button to pay still visible when amount null used
2018-05-25 16:00:23 +02:00
Laurent Destailleur
4c9d3d9679
Code comment
2018-05-25 15:58:45 +02:00
Laurent Destailleur
4a58ae59ed
Fix missing drop of old constraint on old table
2018-05-25 15:54:59 +02:00
Laurent Destailleur
10281169e6
Empty page first
2018-05-25 15:43:08 +02:00
Laurent Destailleur
182abfdb5b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/societe/card.php
2018-05-25 15:02:24 +02:00
Laurent Destailleur
b246034670
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-25 14:57:43 +02:00
Laurent Destailleur
ba6193cff7
Add indonesia provinces
2018-05-25 14:57:30 +02:00
Laurent Destailleur
943d1dce2e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-25 13:15:38 +02:00
Laurent Destailleur
8a64ee2297
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/list.php
htdocs/societe/card.php
2018-05-25 13:14:58 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty
...
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-25 12:55:02 +02:00
Laurent Destailleur
bcbe28d802
Code comment
2018-05-25 12:48:33 +02:00
Laurent Destailleur
f3713844ee
Update commonobject.class.php
2018-05-25 12:38:01 +02:00
Laurent Destailleur
770e97431b
Update commonobject.class.php
2018-05-25 12:36:38 +02:00
Laurent Destailleur
86b1904a41
Update commonobject.class.php
2018-05-25 12:33:30 +02:00
Laurent Destailleur
75b6dc6f61
Update modulebuilder.lib.php
2018-05-25 12:23:39 +02:00
Laurent Destailleur
fa252d5cbd
Merge branch 'develop' into FIX_6.0_pdf_note_incoterm
2018-05-25 11:59:22 +02:00
Laurent Destailleur
1a1f0fbc62
Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch
...
FIX : Fetch shipping will now fetch project id
2018-05-25 11:46:06 +02:00
Laurent Destailleur
aa65b3f9ba
Merge pull request #8830 from wdammak/patch-8
...
Add liste_modeles to warehouse module
2018-05-25 11:43:48 +02:00
Laurent Destailleur
9d407cdc03
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-25 11:27:04 +02:00
Laurent Destailleur
0e6aa3def3
Fix duplicate deprecated file
2018-05-25 11:26:50 +02:00
Laurent Destailleur
3d71ce8297
Update html.formfile.class.php
2018-05-25 11:19:38 +02:00
Laurent Destailleur
520ce99e56
Merge pull request #8828 from bgenere/develop
...
FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php
2018-05-25 11:17:45 +02:00
Laurent Destailleur
a3bea8d298
Update commonobject.class.php
2018-05-25 11:17:01 +02:00
Laurent Destailleur
131ddd6984
Merge pull request #8827 from ATM-Marc/FIX_shipment_fk_project
...
FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
2018-05-25 11:12:39 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml
...
new : add adv targt emailing amdin with main feature level 1
2018-05-25 11:10:51 +02:00
Laurent Destailleur
cbe54e596b
Merge pull request #8817 from wdammak/patch-5
...
Add generateDocument function to entrepot class
2018-05-25 11:08:43 +02:00
Laurent Destailleur
c36187b46b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-25 11:08:19 +02:00
Laurent Destailleur
3d97fa36d1
CSS
2018-05-25 11:08:05 +02:00
Laurent Destailleur
22b1f2574e
Merge pull request #8851 from atm-florian/develop
...
fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined
2018-05-25 11:07:18 +02:00
Laurent Destailleur
ac0570f6b2
Update translate.class.php
2018-05-25 11:07:11 +02:00
Laurent Destailleur
001b94698a
Merge pull request #8832 from dtix/develop
...
NEW Add romanian chart of accounts
2018-05-25 11:05:59 +02:00
Laurent Destailleur
b25c7e44d3
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice
...
FIX : test is_erasable() must be done before call function delete()
2018-05-25 11:05:20 +02:00
Laurent Destailleur
0a581e48d4
Update card.php
2018-05-25 11:04:04 +02:00
Laurent Destailleur
8303dc1e6f
Merge pull request #8815 from atm-florian/develop_fixproject
...
NEW: add filter on project task list
2018-05-25 10:56:10 +02:00
Laurent Destailleur
034752dc0b
Update tasks.php
2018-05-25 10:54:17 +02:00
Laurent Destailleur
e7cfad0e60
Update tasks.php
2018-05-25 10:52:24 +02:00
Laurent Destailleur
c56ef86bc3
Update project.lib.php
2018-05-25 10:50:16 +02:00
Laurent Destailleur
973384604e
Merge pull request #8850 from grandoc/new_branch_24_05_2018
...
clean and update code
2018-05-25 10:45:39 +02:00
Laurent Destailleur
fbcaf8872b
Merge pull request #8808 from atm-john/Add_table_thead_and_tbody
...
Add table thead and tbody for object lines
2018-05-25 10:42:26 +02:00
Laurent Destailleur
04586fab66
Merge pull request #8824 from ggg44473/7.0
...
Fix sql error accounting account
2018-05-25 10:41:16 +02:00
Laurent Destailleur
02803f9284
Merge pull request #8821 from aspangaro/8.0-b26
...
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
2018-05-25 10:36:46 +02:00
Laurent Destailleur
205732e240
Merge pull request #8822 from aspangaro/8.0-b27
...
Salaries : Move to LoadLangs
2018-05-25 10:34:36 +02:00
