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

63009 Commits

Author SHA1 Message Date
Laurent Destailleur
ea119a26c7
Update ajax.lib.php 2018-12-02 17:03:11 +01:00
Juanjo Menent
aa2ecd4b73
Merge pull request #10162 from aljawaid/aljawaid-ecm_translations 
FIX: Add Missing Translation Strings into ecm.lang
 2018-12-02 15:51:40 +01:00
Alexandre SPANGARO
7eee155439 Correct documentation 2018-12-02 14:07:38 +01:00
IJ
30f1925177
FIX: Add Missing Translation Strings into ecm.lang 
- ECMDocsByHolidays
- ECMDocsBySupplierProposals
 2018-12-02 12:29:52 +00:00
IJ
30e84f8f2c
Amend Add Access Keys in Navigation Tooltips 
- based on suggested code by @eldy
- Added `classfortooltip` for better display
 2018-12-02 10:29:04 +00:00
IJ
34326f9102
Undo Add Access Keys in Help Link ... from previous commit 
Not relevant anymore as the new code will detect browser and show the relevant string
 2018-12-02 10:22:47 +00:00
IJ
be523a737e
Undo Access Key Strings from previous commit 2018-12-02 10:19:37 +00:00
Alexandre SPANGARO
088c002ed1 NEW: Add stats on entries & movements by fiscal year 2018-12-02 11:01:11 +01:00
Alexandre SPANGARO
2466fa224c Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats 2018-12-02 10:48:55 +01:00
BENKE Charlene
044c54da94
Warning error if $conf->browser->layout is empty 2018-12-02 10:45:37 +01:00
Frédéric FRANCE
3b31354dc2
cats may be int or array 2018-12-02 10:33:23 +01:00
BENKE Charlene
172c1ac49f
Update list.php 2018-12-02 10:14:40 +01:00
Frédéric FRANCE
ab02cb3cde
doc comment adherent class 2018-12-02 10:12:40 +01:00
Philippe GRAND
8ec2bac36a FIX #3234 2018-12-02 10:02:05 +01:00
BENKE Charlene
65dc066352
Update list.php 2018-12-02 10:01:38 +01:00
BENKE Charlene
ad1ca07085
Update list.php 2018-12-02 09:58:18 +01:00
BENKE Charlene
1bc0defb31
Update list.php 2018-12-02 09:55:26 +01:00
Frédéric FRANCE
d2d623b0b6
GETPOSTISSET has only one param 2018-12-02 09:26:24 +01:00
Chl
864ce85341 NEW adding hooks to createRecurringInvoices() 
For example : send the newly generated invoice by mail.

We send the counter and the total so launching some action
on the last loop (generated invoice or error) is possible.

(bonus: correcting error reporting $this->errors to $this->errors[] )
 2018-12-02 01:34:13 +01:00
Chl
95b5d8790d corr. typo 2018-12-02 01:34:13 +01:00
Chl
6ea0919ebb facture-rec.class.php: reindent 2018-12-02 01:34:13 +01:00
Maxime Kohlhaas
ad05b531e7 Fix display user photo with new path 2018-12-02 00:02:43 +01:00
BENKE Charlene
7378a2f1c6
Update list.php 2018-12-02 00:02:10 +01:00
Maxime Kohlhaas
72225f6524 Migration of user photo paths 2018-12-01 23:57:15 +01:00
BENKE Charlene
6ac3cfdd99
Update list.php 2018-12-01 23:48:36 +01:00
BENKE Charlene
b104c0889d
Update list.php 2018-12-01 23:44:24 +01:00
BENKE Charlene
f07d1411aa
Update list.php 2018-12-01 23:41:15 +01:00
Maxime Kohlhaas
09b967bb1b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo 2018-12-01 23:39:28 +01:00
BENKE Charlene
0d35f04cb7
Update list.php 2018-12-01 23:36:26 +01:00
BENKE Charlene
21b55f3a83
refactoring dol_sql_datefilter 2018-12-01 23:30:58 +01:00
Laurent Destailleur
070b1d04c9
Merge pull request #10151 from frederic34/patch-17 
fix doc comment fournisseur.facture.class.php
 2018-12-01 23:06:02 +01:00
Laurent Destailleur
6f3d2e98a2
Merge pull request #10150 from frederic34/patch-9 
add log in empty catch
 2018-12-01 23:04:41 +01:00
Frédéric FRANCE
9692e98acf
Update fournisseur.facture.class.php 2018-12-01 22:49:12 +01:00
Frédéric FRANCE
471ea35d6c
add log in empty catch 2018-12-01 22:26:45 +01:00
Frédéric FRANCE
c6291b3e08
Update pdf_strato.modules.php 2018-12-01 21:59:37 +01:00
Frédéric FRANCE
912f7c6c68
Update pdf_strato.modules.php 2018-12-01 21:41:40 +01:00
Laurent Destailleur
96741290ba
Merge pull request #10147 from andreubisquerra/master 
Fix issues on TakePOS
 2018-12-01 20:25:45 +01:00
andreubisquerra
8f1a00bbf1 Fix issues on TakePOS 2018-12-01 19:55:35 +01:00
Laurent Destailleur
c3e2f73e48 FIX #10144 2018-12-01 19:45:30 +01:00
Maxime Kohlhaas
5e2f3a53c9 Fix expense report in ecm auto dir 2018-12-01 19:39:00 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Laurent Destailleur
a49a083629
Merge pull request #10142 from atm-maxime/fix_import_fk_dept 
Fix add missing fk_department and fk_pays in contact/bank imports
 2018-12-01 17:14:27 +01:00
Laurent Destailleur
0fb95c91a4
Merge pull request #10141 from andreubisquerra/master 
TakeBOX now is 'TakePOS Connector'
 2018-12-01 17:14:01 +01:00
Laurent Destailleur
e30bee50a2
Merge pull request #10139 from atm-john/fix_#8741 
FIX #8741
 2018-12-01 17:12:55 +01:00
Maxime Kohlhaas
13806124b2 Fix add missing fk_department and fk_pays in contact/bank imports 2018-12-01 17:11:04 +01:00
Frédéric FRANCE
9ceea06468
fix travis 2018-12-01 17:10:06 +01:00
andreubisquerra
1009588592 TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
ATM John BOTELLA
474228cbd6 FIX #8741 2018-12-01 17:01:11 +01:00
Maxime Kohlhaas
8c13c87429 Fix path for user photo 2018-12-01 16:55:42 +01:00
florian HENRY
6236f727c9 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-01 16:51:51 +01:00
florian HENRY
c422904b99 fix #9964 2018-12-01 16:51:40 +01:00
Inovea Conseil
18281d9d43
FIX #6580 
FIX #6580
 2018-12-01 16:48:50 +01:00
Laurent Destailleur
e4bc9f8f87
Merge pull request #10136 from grandoc/8.0 
fix :#9967
 2018-12-01 16:45:37 +01:00
Maxime Kohlhaas
748dd12e4d
Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model 
FIX : Select first mail model by default
 2018-12-01 16:39:22 +01:00
Philippe GRAND
bbf3b3baac fix :#9967 2018-12-01 16:27:14 +01:00
florian HENRY
c320dcd161 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9999 2018-12-01 16:24:20 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
Frédéric FRANCE
61322b9ce2
devcamp 2018 fix #9642 2018-12-01 16:19:54 +01:00
BENKE Charlene
1dc2fc5060
fix #9475 2018-12-01 16:17:52 +01:00
Laurent Destailleur
a8009d4a72
Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources 
FIX Work with new table actioncomm_resources and multiple contact affectation
 2018-12-01 16:16:50 +01:00
Laurent Destailleur
9ac984af76
Update company.lib.php 2018-12-01 16:15:34 +01:00
Inovea Conseil
0ba5fda3da
Update price.php 2018-12-01 16:11:49 +01:00
Inovea Conseil
8964ec7ea1
Fix #9572 
Fix #9572
 2018-12-01 15:58:37 +01:00
Juanjo Menent
7d4553179d Fix #9929 2018-12-01 15:48:46 +01:00
Laurent Destailleur
6076976e3b
Merge pull request #10128 from grandoc/new_branch_01_12_2018 
fix scrutinizer issue : The variable  seems only to be defined at a l…
 2018-12-01 15:48:38 +01:00
Philippe GRAND
3df83d7cf3 fix scrutinizer issue : The variable seems only to be defined at a later point 2018-12-01 15:45:02 +01:00
florian HENRY
b9046b9174 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:42:07 +01:00
florian HENRY
faf7ea345f fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:23:46 +01:00
florian HENRY
dacc959937 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/comment.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:18:51 +01:00
Laurent Destailleur
5c755b6f9f
Merge pull request #10095 from ptibogxiv/patch-97 
Fix duration display product/service  in list.php
 2018-12-01 15:14:57 +01:00
Laurent Destailleur
778547818d
Merge pull request #10108 from frederic34/patch-2 
Avoid adding libs not compatible with php 5.4
 2018-12-01 15:09:25 +01:00
Laurent Destailleur
5d3575ab4d
Merge pull request #10126 from atm-florian/develop 
fix scrutinizer
 2018-12-01 15:08:45 +01:00
Laurent Destailleur
f94f7e15ca
Update date.lib.php 2018-12-01 15:07:55 +01:00
Laurent Destailleur
03f0922325
Merge pull request #10087 from AurelGDN/develop 
New Takepos: cheque payment button in cashdesk
 2018-12-01 15:03:19 +01:00
Laurent Destailleur
305ab85f5d
Merge pull request #10114 from frederic34/patch-17 
Update 6.0.0-7.0.0.sql #8723
 2018-12-01 14:54:31 +01:00
florian HENRY
d928372239 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/commande/class/commande.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 14:51:22 +01:00
Laurent Destailleur
358be875e4
Merge pull request #10120 from defrance/patch-127 
scrutinizer major error
 2018-12-01 14:49:50 +01:00
Laurent Destailleur
b8e3aaa3cb
Merge pull request #10121 from defrance/patch-128 
scrutinizer major error
 2018-12-01 14:49:28 +01:00
Laurent Destailleur
915b1b9528
Merge pull request #10124 from atm-john/fix_issue_from_scrutinizer 
Fix issue from scrutinizer
 2018-12-01 14:49:14 +01:00
BENKE Charlene
60d0a5efab
massfilesarea feature for plugin modules 2018-12-01 14:44:34 +01:00
florian HENRY
8e38d24121 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-12-01 14:43:32 +01:00
florian HENRY
47eda86e2f fix scrutinizer 2018-12-01 14:39:04 +01:00
Laurent Destailleur
30ed180dd4
Merge pull request #10122 from defrance/patch-129 
scrutinizer major error correction
 2018-12-01 14:29:42 +01:00
ATM John BOTELLA
c6f4879575 Fix issue from scrutinizer 2018-12-01 12:04:34 +01:00
BENKE Charlene
676ac67817
scrutinizer error update 2018-12-01 11:49:25 +01:00
BENKE Charlene
1f91a763ff
scrutinizer major error correction 
It seems like $tasksarray can also be of type string. However, the property $lines is declared as type array<integer,object<Task>>. Maybe add an additional type check?
 2018-12-01 11:44:46 +01:00
Frédéric FRANCE
07da468109
Update modDav.class.php 2018-12-01 11:39:58 +01:00
BENKE Charlene
fca332995b
scrutinizer major error 2018-12-01 11:37:50 +01:00
BENKE Charlene
c34b213f61
scrutinizer major error 2018-12-01 11:33:58 +01:00
Juanjo Menent
6104d16b08
Merge pull request #10117 from atm-maxime/fix_pdf_contract 
Fix pdf strato for contract with multipage
 2018-12-01 11:14:38 +01:00
Juanjo Menent
1c04c2b5f4 Fix #10097 2018-12-01 10:38:40 +01:00
BENKE Charlene
19e4698488
Update date.lib.php 2018-12-01 10:32:37 +01:00
Alexandre SPANGARO
7f1a48916e Merge remote-tracking branch 'upstream/develop' into develop 2018-12-01 07:00:34 +01:00
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
BENKE Charlene
085101376c
Introduce standard sql date format filter 
refactoring standard sql filter for date
 2018-12-01 00:41:46 +01:00
florian HENRY
38059ed60d fix #10006 2018-12-01 00:39:37 +01:00
Frédéric FRANCE
335327827d
Update 6.0.0-7.0.0.sql 2018-12-01 00:34:17 +01:00
Frédéric FRANCE
0270da7d8c
Update 5.0.0-6.0.0.sql 2018-12-01 00:28:58 +01:00
Frédéric FRANCE
6ab12b5911
Update llx_paiementfourn.sql 2018-12-01 00:26:51 +01:00
Juanjo Menent
0e1c4d92da
Merge pull request #10112 from inoveaconseil/patch-2 
Fix missing translation
 2018-11-30 23:59:29 +01:00
Juanjo Menent
d1df592c7e
Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen 
Fix #9074
 2018-11-30 23:57:49 +01:00
Juanjo Menent
859d6c4401
Merge pull request #10109 from atm-maxime/fix_dupl_code 
Fix #9070
 2018-11-30 23:57:32 +01:00
Juanjo Menent
a57a43fc05
Merge pull request #10104 from inoveaconseil/MassClose 
FIX mass action closed proposal
 2018-11-30 23:56:38 +01:00
Juanjo Menent
70d75caf09
Merge pull request #10096 from ptibogxiv/patch-98 
Fix trans
 2018-11-30 23:54:36 +01:00
Inovea Conseil
6201962dcf
Fix missing translation 2018-11-30 23:27:05 +01:00
florian HENRY
7a182c7880 fix #10069 2018-11-30 23:25:44 +01:00
Maxime Kohlhaas
e8a02a971d Fix #9074 2018-11-30 23:05:12 +01:00
Maxime Kohlhaas
7585461486 Fix #9070 2018-11-30 22:16:17 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Laurent Destailleur
2dc6351593 Fix website import 2018-11-30 15:16:17 +01:00
Inovea Conseil
ad7117be60 FIX mass action closed proposal 2018-11-30 15:05:28 +01:00
Laurent Destailleur
7a4c1cddc8 Fix save master file of a website 2018-11-30 14:46:44 +01:00
Laurent Destailleur
e8d29c644b Fix grab web site 2018-11-30 14:30:00 +01:00
Laurent Destailleur
94c2d7194c Trans Website 2018-11-30 12:41:35 +01:00
Laurent Destailleur
4260d5765f Fix bad trans key 2018-11-30 11:50:32 +01:00
Laurent Destailleur
6fbf292a95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a Update ChangeLog 2018-11-30 11:00:42 +01:00
IJ
95be3976c4
NEW: Add Autofill Remainder Amount to Expense Report Payment Page 2018-11-29 22:37:07 +00:00
ptibogxiv
e8bdb580ab
Fix trans 2018-11-29 14:00:27 +01:00
ptibogxiv
310dc46113
Update list.php 2018-11-29 13:44:42 +01:00
ptibogxiv
31e3b82ca6
Fix duration display product/service in list.php 2018-11-29 13:44:10 +01:00
Laurent Destailleur
539d993666 Fix translation of month 2018-11-29 12:20:47 +01:00
Laurent Destailleur
bbfd134733 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:24:18 +01:00
Laurent Destailleur
ea3e58a390
Merge pull request #10090 from hregis/8.0_bug3 
FIX remove constant for avoid problem
 2018-11-29 11:18:29 +01:00
Laurent Destailleur
d5c28a76d8
Merge pull request #10079 from aljawaid/aljawaid-fix_payment_type 
FIX: Display All Types of Payments on Expense Report Card
 2018-11-29 11:17:31 +01:00
Laurent Destailleur
b15403207b
Merge pull request #10077 from aspangaro/9.0p1 
Fix create accounting account from balance
 2018-11-29 11:16:27 +01:00
Laurent Destailleur
950dfeef58
Merge pull request #10081 from oscim/patch-1 
Update company.lib.php
 2018-11-29 11:15:52 +01:00
Laurent Destailleur
f3ce49806d
Update company.lib.php 2018-11-29 11:15:27 +01:00
Laurent Destailleur
163bc3784e
Merge pull request #10076 from ptibogxiv/patch-96 
Fix retrieve Donation newpayment.php
 2018-11-29 11:14:33 +01:00
Laurent Destailleur
9e20d9e847 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8 responsive 2018-11-29 11:03:02 +01:00
Laurent Destailleur
6e21b372d1
Merge pull request #10094 from defrance/patch-125 
Duplicate declaration of $object
 2018-11-29 10:58:36 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018 
fix typo error
 2018-11-29 10:57:48 +01:00
Laurent Destailleur
a460452101
Merge pull request #10086 from bafbes/abb80044 
fix: Access to global $conf needed
 2018-11-29 10:57:21 +01:00
Laurent Destailleur
05f1e5f16b
Merge pull request #10089 from grandoc/new_branch_28_11_2018 
FIX: bad URL
 2018-11-29 10:57:08 +01:00
Laurent Destailleur
2808876904
Merge pull request #10084 from grandoc/new_branch_27_11_2018 
fix : typo error
 2018-11-29 10:56:53 +01:00
BENKE Charlene
10bf7bdc95
Duplicate declaration of $object 
Already present line 126
 2018-11-29 10:29:04 +01:00
Laurent Destailleur
c5bd11951f Fix bar not visible on some screen 2018-11-29 02:09:07 +01:00
Laurent Destailleur
bfc2f6e84c Add template 2018-11-29 00:48:47 +01:00
Laurent Destailleur
af2150a427 CSS 2018-11-29 00:45:15 +01:00
Laurent Destailleur
3c0ff40e43 Fix trans 2018-11-29 00:41:12 +01:00
Laurent Destailleur
619ec1f0cb Fix trans 2018-11-29 00:40:18 +01:00
Laurent Destailleur
3650543749 CSS 2018-11-28 22:51:24 +01:00
Laurent Destailleur
23126fe49a CSS 2018-11-28 17:14:13 +01:00
Regis Houssin
b4aa9ee335 FIX remove constant for avoid problem 2018-11-28 17:04:42 +01:00
Laurent Destailleur
ca1f9c7e60 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/stocks.lang
 2018-11-28 16:57:39 +01:00
Laurent Destailleur
b9c08853be CSS 2018-11-28 16:54:21 +01:00
Philippe GRAND
2b6810e2ab FIX: bad URL 2018-11-28 16:37:49 +01:00
Laurent Destailleur
28902e18ee Fix for screen with antiblue system 2018-11-28 16:32:53 +01:00
ptibogxiv
21f4d474b4 Fix sql don.class.php 2018-11-28 16:11:10 +01:00
Laurent Destailleur
0373cad2cd FIX Method setValid not found 2018-11-28 16:11:00 +01:00
Marc de Lima Lucio
c13cc5d697 FIX: form actions: select_type_actions could be too small + bad init 2018-11-28 15:46:27 +01:00
Laurent Destailleur
3b66a2bf9c Fix missing email in popup 2018-11-28 14:20:55 +01:00
AurelienGoudeneche
4282a46bb2
Add files via upload 
revert previous comment l44
 2018-11-28 13:20:44 +01:00
Laurent Destailleur
dbef8fc380 FIX Add field for data becoming mandatory by some online payment system 2018-11-28 13:13:38 +01:00
Laurent Destailleur
01181ba3a4 Fix avoid warning 2018-11-28 13:06:39 +01:00
AurelienGoudeneche
2edaa0e1d9
Add files via upload 2018-11-28 13:05:59 +01:00
AurelienGoudeneche
4d9e64bfcf
Add files via upload 2018-11-28 13:04:59 +01:00
Laurent Destailleur
d59c81cfe4 Fix missing or 2018-11-28 11:47:24 +01:00
Juanjo Menent
2f61d29b06 FIX: #10080 Supplier translations are in english 2018-11-28 10:40:45 +01:00
Laurent Destailleur
436a85ef7a Fix missing email 2018-11-27 20:34:43 +01:00
Abbes Bahfir
1a8882198e fix: Accss to global $conf needed 2018-11-27 18:22:12 +01:00
Laurent Destailleur
a4fc564048 css 2018-11-27 18:04:45 +01:00
Laurent Destailleur
780a538fe0 Fix multicompany not accessible from website. 2018-11-27 17:37:39 +01:00
Laurent Destailleur
bb565d33f9 FIX Several fixes in fetchAll 2018-11-27 16:39:08 +01:00
Laurent Destailleur
0b6aaccfcc sync transifex 2018-11-27 16:35:47 +01:00
Laurent Destailleur
70bd931d08 FIX empty page due to preg_replace JIT error on large strings 2018-11-27 16:20:31 +01:00
Ferran Marcet
9d6c95e8a9 Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-11-27 11:39:07 +01:00
Ferran Marcet
d8537a3c76 FIX Lines are not inserted correctly if VAT have code 2018-11-27 11:36:31 +01:00
Laurent Destailleur
e95c6091c4 Fix lang 2018-11-27 11:10:39 +01:00
Laurent Destailleur
0367795488 Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
Laurent Destailleur
71bcabd8eb Missing trans 2018-11-27 10:23:58 +01:00
Philippe GRAND
30d30d9c1e fix : typo error 2018-11-27 10:06:38 +01:00
Laurent Destailleur
7c22504252 Fix position of field must be ssame between create/edit/view 2018-11-27 09:22:59 +01:00
IJ
0bdbff6419
Add Access Key Language Strings 2018-11-27 00:24:11 +00:00
IJ
825f41bfda
Add Access Keys in Navigation Tooltips 2018-11-27 00:22:21 +00:00
IJ
f0b1a9358a
Add Access Keys in Help Link 2018-11-27 00:14:28 +00:00
Laurent Destailleur
b9e544d291 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/resource/list.php
 2018-11-26 23:08:06 +01:00
Laurent Destailleur
b5c136bc32 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-26 23:02:23 +01:00
Laurent Destailleur
653b99cb33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-26 23:02:07 +01:00
Laurent Destailleur
84d73086ea Fix bookkeeping list was empty 2018-11-26 22:53:56 +01:00
Laurent Destailleur
2f2df12f59 Complete dictionary 2018-11-26 18:02:25 +01:00
Philippe GRAND
a59a4c60e0 FIX : Typo errors 2018-11-26 16:09:05 +01:00
Philippe GRAND
52f587e1e3 merging 2018-11-26 16:05:53 +01:00
oscim
f5ebcca475
error space after comment 2018-11-26 15:47:51 +01:00
Laurent Destailleur
12b9ac2c3b Fix lang 2018-11-26 14:48:27 +01:00
Laurent Destailleur
62e39f5a31 Fix title 2018-11-26 14:37:19 +01:00
Philippe GRAND
8722ccef82 fix typo error 2018-11-26 14:35:29 +01:00
Philippe GRAND
05d617b759 fix typo error 2018-11-26 14:33:45 +01:00
Philippe GRAND
9bf0f12068 fix typo error 2018-11-26 14:32:04 +01:00
Philippe GRAND
3800fde225 fix typo error 2018-11-26 14:29:25 +01:00
Laurent Destailleur
f0ab6e60ec FIX Loading translation of cron tasks 2018-11-26 13:31:05 +01:00
Laurent Destailleur
8f15fe9c63 Empty lines 2018-11-26 12:41:10 +01:00
Laurent Destailleur
611569f639 Add missing translation 2018-11-26 11:18:01 +01:00
oscim
2af24903e9
Update company.lib.php 
Fix list in  agenda for tab customer / provider , no thirdparty selected because name of class is not Societe
 2018-11-26 10:53:34 +01:00
IJ
db719dbcbb
FIX: Display All Types of Payments on Expense Report Card 
Fixes #9991 - Bug: 7.0.4: Expense Report Payment Type Not Displayed 
- without this fix, only cash type accounts were shown when payment was made
 2018-11-25 20:36:25 +00:00
Laurent Destailleur
4bb8568d6c Fix doxygen 2018-11-25 12:18:45 +01:00
Laurent Destailleur
a395e9e4ee Fix var not defined 2018-11-25 12:13:35 +01:00
Laurent Destailleur
2e139d1960 Fix var $hidedetails not defined 2018-11-25 12:08:49 +01:00
Laurent Destailleur
ed1062c440 Css 2018-11-25 11:59:49 +01:00
Laurent Destailleur
1d2c2a23ef Fix look and feel v8 2018-11-25 11:57:19 +01:00
Alexandre SPANGARO
703d3d90eb Revert "Fix create accounting account from balance" 
This reverts commit 9154fd366f.
 2018-11-24 22:40:04 +01:00
Alexandre SPANGARO
9154fd366f Fix create accounting account from balance 2018-11-24 22:30:06 +01:00
ptibogxiv
d401974028
Fix retrieve Donation newpayment.php 2018-11-24 15:33:48 +01:00
Laurent Destailleur
099f47deba
Merge pull request #10019 from frederic34/swiftmailer 
Swiftmailer
 2018-11-24 11:54:47 +01:00
Laurent Destailleur
82b4b3ccb3
Merge pull request #10047 from frederic34/patch-9 
doc cmail class
 2018-11-24 11:20:49 +01:00
Laurent Destailleur
2fcd221dbb
Merge pull request #10048 from frederic34/patch-15 
Update fournisseur.commande.class.php
 2018-11-24 11:20:21 +01:00
Laurent Destailleur
ecb6ea9151
Merge pull request #10058 from frederic34/patch-2 
correct link and avoid warning in resource list
 2018-11-24 11:17:56 +01:00
Laurent Destailleur
f0e4c262a3
Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card 
FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete
 2018-11-24 11:13:49 +01:00
Laurent Destailleur
ff857c0144
Merge pull request #10064 from frederic34/pdfexpensereport 
try to fix the expensereport pdf
 2018-11-24 11:11:26 +01:00
Laurent Destailleur
1398b94a80
Merge pull request #10062 from ptibogxiv/patch-94 
Fix sql don.class.php
 2018-11-24 11:08:39 +01:00
Laurent Destailleur
0cc4ee2b01
Merge pull request #10073 from ptibogxiv/patch-95 
Fix order&co billed on online payment page
 2018-11-24 11:08:26 +01:00
Laurent Destailleur
b5d1a34080
Update newpayment.php 2018-11-24 11:08:05 +01:00
Laurent Destailleur
c1efb2d423
Merge pull request #10070 from frederic34/patch-17 
doc comment accountancycategory class
 2018-11-24 11:06:32 +01:00
Laurent Destailleur
333efbeadf
Merge pull request #10061 from andreubisquerra/master 
Cash drawer button
 2018-11-24 11:05:55 +01:00
wdammak
5c9d5bb6ad
order by category 2018-11-23 21:30:34 +01:00
wdammak
5c3daf4a6a
order by category 2018-11-23 21:27:22 +01:00
wdammak
064816242a
Order by category 2018-11-23 21:26:10 +01:00
Laurent Destailleur
13e24dc894 Code comment 2018-11-23 15:35:40 +01:00
Laurent Destailleur
5bd9c14929 Update demo data for 8.0 and 9.0 2018-11-23 14:05:45 +01:00
Laurent Destailleur
9f610c2279 Add website template 2018-11-23 12:46:32 +01:00
ptibogxiv
e8ba8814cd
Update newpayment.php 2018-11-23 12:45:37 +01:00
ptibogxiv
6a232a8754
Update newpayment.php 2018-11-23 12:27:24 +01:00
ptibogxiv
1cc6763950
Fix order billed online payment 2018-11-23 11:40:38 +01:00
Laurent Destailleur
ea7c77d788 Trans 2018-11-23 11:09:27 +01:00
Laurent Destailleur
a06b032c23 fix trans 2018-11-23 10:53:04 +01:00
fappels
322ce410d7 Add missing paid field in fetch sql 2018-11-23 09:42:43 +01:00
Frédéric FRANCE
d21abc2dc3
Update accountancycategory.class.php 2018-11-22 23:26:04 +01:00
Frédéric FRANCE
295d082da1
Update accountancycategory.class.php 2018-11-22 22:56:38 +01:00
Frédéric FRANCE
21b429836a
doc comment accountancycategory class 2018-11-22 21:08:03 +01:00
Laurent Destailleur
0a057c8277 Clean var_dump 2018-11-22 20:47:53 +01:00
Laurent Destailleur
fe35e72e83 Fix perf. Make only one request per group for year N-1. 2018-11-22 20:45:50 +01:00
Laurent Destailleur
5727cf2910 Prepare code for performance enhancement 2018-11-22 20:09:27 +01:00
Laurent Destailleur
72fc0226e3 Optimize performance: Remove call for year N, can be done with total of 
each month
 2018-11-22 19:45:35 +01:00
Laurent Destailleur
97af22369d Trans 2018-11-22 13:47:55 +01:00
Laurent Destailleur
3bb7726101 Revert "Fix translation" 
This reverts commit 8de30c12d8.
 2018-11-22 13:22:05 +01:00
Laurent Destailleur
8de30c12d8 Fix translation 2018-11-22 13:19:25 +01:00
Laurent Destailleur
0fbf213739 Fix length of field 2018-11-22 13:08:18 +01:00
JC Prieto
54418c168b
New: Update only the multiprices that have been changed 
When a multiprice was changed all level prices were updated at once and history of prices is getting very large.
 2018-11-22 12:38:10 +01:00
Laurent Destailleur
1d4c756783 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-22 11:44:37 +01:00
Thibault Descamps
d63d8088ed Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_global_search_go_direct_on_card 2018-11-22 11:37:25 +01:00
Thibault Descamps
c2e5a29246 NEW redirect if only one result on global search on card 2018-11-22 11:36:30 +01:00
Laurent Destailleur
784c13d9d0 Fix label of month 2018-11-22 11:14:05 +01:00
Laurent Destailleur
89138bc349 FIX Accounting personalized report when using multicompany 2018-11-22 10:59:39 +01:00
Laurent Destailleur
21e9c02b11 Performance enhancement in Accounting Personalized report 2018-11-22 10:40:15 +01:00
Frédéric FRANCE
491270b27f
try to fix the expensereport pdf 2018-11-21 23:06:52 +01:00
IJ
693a8d6e4a
NEW: Add hidden config 'ADD_UNSPLASH_LOGIN_BACKGROUND' 
- The background image will be refreshed on every login page refresh
- Background image is pulled from the popular open source image website Unsplash
- If an already saved static background image exists, then this code will override it (but not delete the saved image).
 2018-11-21 21:53:29 +00:00
ptibogxiv
fe30eee16e
Fix sql don.class.php 2018-11-21 19:50:55 +01:00
andreubisquerra
463aff4540 Cash drawer button 2018-11-21 16:54:40 +01:00
Laurent Destailleur
5e9abe6aad Fix getLanguageCodeFromCountryCode 2018-11-21 16:28:36 +01:00
Laurent Destailleur
b6dac7da20 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-21 15:40:15 +01:00
Laurent Destailleur
93929a652b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-21 15:35:15 +01:00
Laurent Destailleur
084516b885 Fix ip detection of geoip 2018-11-21 15:11:57 +01:00
Frédéric FRANCE
e8cac0df35
correct link and avoid warning in resource list 2018-11-21 14:06:06 +01:00
Thibault Descamps
1cc130e5f6 NEW : conf to change concat desc order 2018-11-21 09:57:44 +01:00
Laurent Destailleur
0ea6f2778b Fix examples 2018-11-20 22:01:38 +01:00
Laurent Destailleur
6514b51382 Better help 2018-11-20 21:59:05 +01:00
Frédéric FRANCE
730863cb09
reduce complexity of eldylib menu 2018-11-20 21:40:37 +01:00
Laurent Destailleur
c891f6ed10 Disable javascript feature with no javascript 2018-11-20 21:26:22 +01:00
Laurent Destailleur
1ecdaa548c Remove the no more used and deprecated dol_print_graph function 2018-11-20 20:28:46 +01:00
Laurent Destailleur
966a0b7ec7 Fix message content and language 2018-11-20 20:13:16 +01:00
Laurent Destailleur
07fe7e58d8 Code comment 2018-11-20 19:04:58 +01:00
Laurent Destailleur
61fddadc3f Complete the fetchAll of modulebuilder + websitepage 2018-11-20 18:29:29 +01:00
Laurent Destailleur
200de22807 Missing image in container 2018-11-20 16:48:34 +01:00
Laurent Destailleur
f455e32bef FIX Some modules templates were visible when it should not 2018-11-20 16:22:16 +01:00
Laurent Destailleur
12a6709ebe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-20 15:27:16 +01:00
Laurent Destailleur
4b82538941 Better module position 2018-11-20 14:56:14 +01:00
Laurent Destailleur
7587eedd7c
Merge pull request #10044 from prietojc/patch-1 
# Fix: Missing lines to search total_ttc
 2018-11-20 13:44:08 +01:00
Laurent Destailleur
7e735e222e
Merge pull request #10045 from frederic34/patch-2 
GETPOSTISSET has only one parameter
 2018-11-20 13:43:41 +01:00
Laurent Destailleur
8ecd5ffa3b FIX Missing button cancel 2018-11-20 13:41:38 +01:00
Laurent Destailleur
be4dc40dfa Fix standardize date format for payment between customer and supplier 2018-11-20 10:16:54 +01:00
Laurent Destailleur
4845e90d95 Fix update of hours for payment 2018-11-20 10:03:38 +01:00
Laurent Destailleur
4bf5a12f35 Fix trans 2018-11-20 09:56:03 +01:00
Frédéric FRANCE
2e4ec1ed10
Update fournisseur.commande.class.php 2018-11-19 23:56:20 +01:00
Frédéric FRANCE
4e60e48f34
Update CMailFile.class.php 2018-11-19 23:43:58 +01:00
Frédéric FRANCE
2179e2011e
doc cmail class 2018-11-19 23:38:07 +01:00
Frédéric FRANCE
32706f570d
reduce complexity of htmlformmail class 2018-11-19 21:19:39 +01:00
Laurent Destailleur
e020597ba7 Fix deletion for class build with modulebuilder 2018-11-19 21:11:26 +01:00
Frédéric FRANCE
8f17ae8df5
GETPOSTISSET has only one parameter 2018-11-19 20:28:55 +01:00
Laurent Destailleur
62a5869db4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 20:08:14 +01:00
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
25ee999d27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:32 +01:00
Laurent Destailleur
20dbbaf5cc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:04 +01:00
Laurent Destailleur
fb6aa01207 FIX #10030 better german chart 2018-11-19 20:04:31 +01:00
JC Prieto
deff4ca4a0
Update list.php 
Missing the following lines to search total_ttc
 2018-11-19 20:03:36 +01:00
Frédéric FRANCE
8f7e90da8c
clean clean 2018-11-19 19:08:14 +01:00
Laurent Destailleur
839428d545 Missing trans 2018-11-19 19:02:00 +01:00
Laurent Destailleur
8191df4857
Merge pull request #9962 from atm-john/fix_extrafield_view 
FIX hidden extrafield
 2018-11-19 18:37:18 +01:00
Laurent Destailleur
929635d468
Merge pull request #10026 from OPEN-DSI/fix-contact-agenda-filter 
Fix Contact Agenda events filter when no Third Party
 2018-11-19 18:35:55 +01:00
Laurent Destailleur
471f41577c
Merge pull request #10040 from defrance/patch-124 
Add societe extrafields on proposal export
 2018-11-19 18:33:41 +01:00
Laurent Destailleur
8535844737 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:27:00 +01:00
Laurent Destailleur
1931fd33eb
Merge pull request #10041 from atm-ph/fix_8.0_optional_param 
Fix new params has been added not optional
 2018-11-19 18:26:21 +01:00
Laurent Destailleur
e2269796e2
Merge branch 'develop' into swiftmailer 2018-11-19 18:23:55 +01:00
Laurent Destailleur
bd8856b988
Merge pull request #10033 from frederic34/patch-9 
Update CMailFile.class.php
 2018-11-19 18:20:20 +01:00
Laurent Destailleur
7a3f088fcb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:19:11 +01:00
Laurent Destailleur
77bc1c4313 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-11-19 18:18:43 +01:00
Laurent Destailleur
c0dac69116
Merge pull request #10031 from aspangaro/9.0_style 
Fix Page Salaries stats - Look & feel  v9
 2018-11-19 18:14:35 +01:00
Laurent Destailleur
4bedeabc5b FIX #10036 2018-11-19 18:02:29 +01:00
François J
37f3b8bbde Update @since version to 9.0 2018-11-19 17:51:00 +01:00
Laurent Destailleur
1b09179df7
Merge pull request #10035 from frederic34/patch-15 
typo
 2018-11-19 17:44:20 +01:00
Laurent Destailleur
828f79bbd5
Merge pull request #10023 from hregis/develop_bug2 
FIX more simple
 2018-11-19 17:44:05 +01:00
François J
6aaf0f4655 Add afterSelectOptions hook & selectcontacts context 2018-11-19 17:40:16 +01:00
gauthier
ecdfa5219b FIX : We want to be able to send PDF of paid invoices 2018-11-19 17:31:45 +01:00
Laurent Destailleur
8d4db1d085 Fix phpcs 2018-11-19 16:35:37 +01:00
Laurent Destailleur
77ed591648 Fix phpcs 2018-11-19 16:05:27 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00
Laurent Destailleur
2d09008610 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 15:55:59 +01:00
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/card.php
 2018-11-19 15:55:41 +01:00
Laurent Destailleur
8a5add6a98 Fix phpcs 2018-11-19 15:53:09 +01:00
Laurent Destailleur
50e20b2ac0 Fix phpcs 2018-11-19 15:52:46 +01:00
Laurent Destailleur
a3398f1a8d Sync transifex 2018-11-19 15:49:58 +01:00
atm-ph
129034ba76 Fix new params has been added not optional 2018-11-19 15:46:30 +01:00
Laurent Destailleur
ade0363224 Module status 2018-11-19 15:46:20 +01:00
Laurent Destailleur
2947dcfc8d Sanitize message 2018-11-19 15:36:12 +01:00
Laurent Destailleur
5f93315097 Clean code 2018-11-19 15:14:46 +01:00
Laurent Destailleur
0886928a64 FIX Link between action and project must use field not the link table 2018-11-19 14:38:30 +01:00
Laurent Destailleur
1e1ccd4c88 Fix pagination in action/event list 2018-11-19 14:25:34 +01:00
BENKE Charlene
92562ad89f
Add societe extrafields on export 2018-11-19 12:17:41 +01:00
florian HENRY
dc2f1e9812 fix list agenda extrafield visibility 2018-11-19 11:25:48 +01:00
Laurent Destailleur
824b1924e2 Fix loading of cronjob 2018-11-19 10:33:42 +01:00
Alexandre SPANGARO
cf0c4a5ce0 Add in public area 2018-11-18 22:03:32 +01:00
Alexandre SPANGARO
2d55666a0b NEW Add gender in member card 2018-11-18 21:50:58 +01:00
Regis Houssin
7cba680f38 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-18 17:07:03 +01:00
Laurent Destailleur
2480a8dc2a Ignore 2018-11-18 15:57:20 +01:00
Laurent Destailleur
22b2af6911 Exclude dir 2018-11-18 15:46:37 +01:00
Laurent Destailleur
a179d45afd Remove deprecated translation keys 2018-11-17 23:40:10 +01:00
Laurent Destailleur
1cce95cb23 Trans 2018-11-17 23:35:49 +01:00
Laurent Destailleur
13d00b2eb1 Sync transifex 2018-11-17 23:14:12 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
Frédéric FRANCE
0ba388de5d
typo 2018-11-17 18:03:59 +01:00
Frédéric FRANCE
30b1db34cd
Update CMailFile.class.php 2018-11-17 11:33:01 +01:00
Alexandre SPANGARO
4e39065e29 Fix Page Salaries stats - Look & feel v9 2018-11-17 07:37:32 +01:00
Laurent Destailleur
a2c9fefee0 Fix do not show tool to check european vat if country is not in EEC 2018-11-17 00:40:39 +01:00
Laurent Destailleur
6b8a3094f0 Fix missing some keys in substitution arrays 2018-11-17 00:14:23 +01:00
Frédéric FRANCE
35142ac2fb
wip 2018-11-16 17:58:14 +01:00
Laurent Destailleur
028be21070 Debug 2018-11-16 16:55:53 +01:00
Laurent Destailleur
5d596fe584 Fix trackid must contains an id of instance 2018-11-16 16:43:13 +01:00
Laurent Destailleur
3b193a8a7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-16 14:13:18 +01:00
Laurent Destailleur
f32706259a Sync transifex 2018-11-16 14:13:00 +01:00
François J
a5777d30e1 Fix Contact Agenda events filter when no Third Party 
Handle case where the contact is not linked to any third party.
 2018-11-16 10:09:25 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused 2018-11-15 22:15:45 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Frédéric FRANCE
532ce34c53
i put the sword under the carpet 2018-11-15 21:36:20 +01:00
Frédéric FRANCE
7c241620c0
replace random_bytes 2018-11-15 21:20:09 +01:00
Frédéric FRANCE
482c6efdd9
replace php > 5.4 code 2018-11-15 20:35:40 +01:00
Frédéric FRANCE
caa080f103
replace php > 5.4 code 2018-11-15 20:32:51 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
Regis Houssin
2350908d4e FIX change getEntity doc and changelog 2018-11-15 19:00:14 +01:00
Regis Houssin
a0709895c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-15 18:55:48 +01:00
Regis Houssin
ffc9b02322 FIX missing one column 2018-11-15 18:28:12 +01:00
Regis Houssin
38b4b719f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug2 2018-11-15 18:27:50 +01:00
Regis Houssin
03acd7a40c FIX travis error again 2018-11-15 18:24:32 +01:00
Laurent Destailleur
e58dd3c0b1
Merge pull request #10024 from hregis/develop_bug 
FIX travis errors
 2018-11-15 18:21:25 +01:00
Laurent Destailleur
7d5c9959bc Close #9978 
Better way to address the feature. Work in most cases, need less code
and less sql access.
 2018-11-15 18:20:38 +01:00
Regis Houssin
531b6e8d2b FIX travis errors 2018-11-15 18:13:07 +01:00
Laurent Destailleur
103dfe2aa7 FIX go back to create form if error 2018-11-15 17:55:27 +01:00
Regis Houssin
2d2e836965 FIX more simple 2018-11-15 17:45:33 +01:00
Laurent Destailleur
b51004e809 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:34:36 +01:00
Laurent Destailleur
2d6f7f926c FIX xss injection on user address 2018-11-15 17:34:11 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc 
FIX compatibility between proposal sharing and proposalnumber sharing
 2018-11-15 17:19:28 +01:00
Laurent Destailleur
6297e03ea9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:16:12 +01:00
Laurent Destailleur
4fa694569e
Merge pull request #10018 from Tetras-Libre/develop 
Fix issue #9956 User can edit some of their data without permissons
 2018-11-15 16:56:57 +01:00
Laurent Destailleur
8a97ba4ba9
Update card.php 2018-11-15 16:56:12 +01:00
Laurent Destailleur
ff0a5d9fe1
Merge pull request #10016 from WSoptics/wsoptics-8.0 
FIX: sql errors
 2018-11-15 16:47:52 +01:00
Laurent Destailleur
6ffd63c965
Update projectstats.class.php 2018-11-15 16:47:40 +01:00
Laurent Destailleur
f2bbb54b8f
Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist 
FIX : filter on product category doesn't work
 2018-11-15 16:44:40 +01:00
Laurent Destailleur
f3228dc4f8
Merge pull request #10010 from atm-john/Fix_cat_photo_upload 
Fix event message on upload category picture fail
 2018-11-15 16:43:59 +01:00
Laurent Destailleur
d20bb41cde
Merge pull request #10017 from hregis/8.0_bug 
FIX avoid error if $object->fk_account =< 0 for getNomUrl
 2018-11-15 16:43:00 +01:00
Laurent Destailleur
b0d1174600
Merge pull request #10020 from mwelters/develop 
for Denmark: forme_jurisdisque additions
 2018-11-15 16:39:32 +01:00
Laurent Destailleur
8bfcbc8f9d
Merge pull request #10015 from frederic34/patch-9 
doc bookkeeping class
 2018-11-15 16:28:42 +01:00
Laurent Destailleur
f2fba05475
Merge branch 'develop' into new_branch_13_11_2018 2018-11-15 16:23:54 +01:00
Laurent Destailleur
c04fcf170b Work on emailcollector 2018-11-15 16:23:07 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
markus
ac0f46f9e5 for Denmark: forme_jurisdisque additions 2018-11-15 11:10:54 +01:00
Laurent Destailleur
3ca45e0e40 Fix double dot in sql filename 2018-11-15 10:59:55 +01:00
Regis Houssin
6f90516f57 FIX check write permission for multicurrency 2018-11-15 09:40:08 +01:00
Frédéric FRANCE
92cda2a75c
fix cant use method return value 2018-11-14 23:29:24 +01:00
Frédéric FRANCE
b13ad8170f
correctly check intl extension 2018-11-14 22:42:09 +01:00
Frédéric FRANCE
1c15d249b3
replace specific php7 code 2018-11-14 22:05:21 +01:00
Laurent Destailleur
e94b545cb6 Fix field not required 2018-11-14 18:38:09 +01:00
David Beniamine
01947288fb
Fix issue #9956 User can edit some of their data without permissons 2018-11-14 18:29:15 +01:00
Regis Houssin
bcc83408e0 FIX avoid error if $object->fk_account =< 0 for getNomUrl 2018-11-14 18:10:41 +01:00
Regis Houssin
976094043b FIX missing GETPOST('entity') 2018-11-14 17:34:27 +01:00
Regis Houssin
0907a6d611 FIX wrong object name (travis error) 2018-11-14 16:55:14 +01:00
Regis Houssin
0592e8a31c FIX config is override by multicompany module 2018-11-14 16:44:10 +01:00
Regis Houssin
874e27ef84 FIX multicompany override constants of current entity 2018-11-14 15:37:10 +01:00
Regis Houssin
93a1e941a4 FIX new method: override constants of current entity 2018-11-14 15:34:39 +01:00
Regis Houssin
2bc25fc008 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-14 15:24:41 +01:00
Regis Houssin
9ff4b31843 FIX compatibility with invoice sharing and invoice number sharing 2018-11-14 15:24:22 +01:00
Regis Houssin
3294fada3d FIX working on invoice sharing (multicompany) 2018-11-14 14:59:36 +01:00
Laurent Destailleur
1f6ccd4a66 Fix permission to edit websites 2018-11-14 13:58:00 +01:00
Laurent Destailleur
a7989eb893 Fix menu 2018-11-14 13:55:10 +01:00
Laurent Destailleur
df2aa2e2f6 Fix column balance 2018-11-14 13:52:43 +01:00
Laurent Destailleur
ba22ae45e7 Fix column balance 2018-11-14 13:45:20 +01:00
Laurent Destailleur
0201939ebe Fix column balance 2018-11-14 13:43:39 +01:00
Laurent Destailleur
7aa042172e Fix sql error 2018-11-14 13:06:40 +01:00
Frédéric FRANCE
4909e3afc4
doc bookkeeping class 2018-11-14 08:28:20 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
04edcaa89c FIX compatibility between proposal sharing and proposalnumber sharing 2018-11-13 20:20:46 +01:00
gauthier
85dd0ec2dd FIX : filter on product category doesn't work 2018-11-13 15:24:53 +01:00
John BOTELLA
c6cf748ba7 Fix envent message on upload category picture 2018-11-13 14:44:10 +01:00
Laurent Destailleur
77582b2a41 FIX the autofocus feature 2018-11-13 11:36:57 +01:00
John BOTELLA
500bb7bc96 best conditions testing 2018-11-13 10:20:34 +01:00
Philippe GRAND
2ed060a070 fix: Invalid argument supplied for foreach() 2018-11-13 10:07:04 +01:00
Philippe GRAND
35c43683b6 fix Erreur DB_ERROR_SYNTAX 2018-11-13 09:45:47 +01:00
Laurent Destailleur
723654efea Fix phpcs 2018-11-12 17:15:03 +01:00
Laurent Destailleur
628918f863 Remove var_dump 2018-11-12 16:43:33 +01:00
Tobias Elbert
fceaae7a8d fixed sql query error 2018-11-12 16:22:42 +01:00
Tobias Elbert
ceae6ac376 fixed sql query error 2018-11-12 16:21:20 +01:00
gauthier
f404cae546 FIX : Same on customer card 2018-11-12 16:04:42 +01:00
gauthier
66ea8bbe87 FIX : fourn payment modes musn't be available on customer docs 2018-11-12 15:58:41 +01:00
Laurent Destailleur
01e7b5747d FIX user param is null not 0 when not defined 
FIX properties email_xx were not set
 2018-11-12 15:27:59 +01:00
Laurent Destailleur
5a7cb95b72 FIX filter on entity must be done as soon as we don't search on rowid. 2018-11-12 14:49:08 +01:00
François J
10dd5652ee Add SELECT DISTINCT to show_actions_done() SQL request 2018-11-12 12:34:25 +01:00
François J
9a6a3d8df4 Join llx_actioncomm_resources only if we have a contact object. 2018-11-12 12:20:07 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
ca3510e889
Merge pull request #9994 from ptibogxiv/patch-91 
Fix Invalid argument supplied for foreach()
 2018-11-11 17:30:06 +01:00
Laurent Destailleur
cda88f4df9
Merge pull request #9993 from ptibogxiv/patch-90 
Fix Invalid argument supplied for foreach()
 2018-11-11 17:29:32 +01:00
Laurent Destailleur
4f7d3e794a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47 FIX #9992 2018-11-11 17:28:17 +01:00
Laurent Destailleur
65d8f59321
Merge pull request #9992 from delcroip/patch-18 
to support proposal_supplier insert
 2018-11-11 17:27:23 +01:00
Laurent Destailleur
2985d9cfbf
Update 8.0.0-9.0.0.sql 2018-11-11 17:27:16 +01:00
Laurent Destailleur
f39b99b153
Merge pull request #9933 from ptibogxiv/patch-83 
Update Stripe Version API
 2018-11-11 17:25:49 +01:00
Laurent Destailleur
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Laurent Destailleur
0b57faa7b4 Fix help 2018-11-11 14:42:11 +01:00
Laurent Destailleur
de259e9db6 Code comment 2018-11-11 14:36:35 +01:00
Laurent Destailleur
ad7ae76cd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:51:49 +01:00
patrick Delcroix
fa9ecd9f97 clean: align with upstream 2018-11-10 15:46:51 +01:00
patrick Delcroix
e9d3db084a new: link to the compta-files.php in the accountancy left menu 2018-11-10 15:35:56 +01:00
ptibogxiv
80782a366e
Fix Invalid argument supplied for foreach() 2018-11-10 15:04:38 +01:00
Laurent Destailleur
6591cdba75 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:03:34 +01:00
ptibogxiv
5c96689c87
Fix Invalid argument supplied for foreach() 2018-11-10 15:02:50 +01:00
delcroix Patrick
52f35d8038
to support proposal_supplier insert 
proposal_supplier has 17 char when the elementtype column can take only 16 char
 2018-11-10 14:59:46 +01:00
delcroix Patrick
4b0d3ad6c6 Update llx_projet_task_time.sql 2018-11-10 14:31:28 +01:00
delcroix Patrick
34787dc1d7 Update 5.0.0-6.0.0.sql 2018-11-10 14:31:27 +01:00
delcroip
e0bae07f97 NEW:Invoice creation from task Time 2018-11-10 14:31:26 +01:00
Laurent Destailleur
ed3a333436 Fix phpcs 2018-11-10 13:11:18 +01:00
Laurent Destailleur
776d5e6fc6
Merge pull request #9988 from frederic34/patch-15 
The variable $i seems to be never defined.
 2018-11-10 12:20:09 +01:00
Laurent Destailleur
5ec602cafa
Merge pull request #9983 from hregis/8.0_bug 
FIX missing field "visible"
 2018-11-10 12:19:35 +01:00
Laurent Destailleur
2946ca60cf
Merge pull request #9989 from frederic34/patch-16 
Update actions_ticket.class.php
 2018-11-10 12:18:37 +01:00
Laurent Destailleur
bd78ea1ccf
Merge pull request #9987 from frederic34/dkim 
add admin dkim translation
 2018-11-10 12:16:43 +01:00
Laurent Destailleur
bae1ff67a4
Merge pull request #9986 from frederic34/patch-9 
remove warning
 2018-11-10 12:16:10 +01:00
ptibogxiv
20a3dd86cd
2018-11-08 
no change for dolibarr but better for integration and development
 2018-11-10 11:07:01 +01:00
Frédéric FRANCE
20acf440a3
Update api_products.class.php 2018-11-10 07:55:01 +01:00
Frédéric FRANCE
c2ee9ba9db
Update actions_ticket.class.php 2018-11-10 07:38:55 +01:00
Frédéric FRANCE
2514cf4a96
Update actions_ticket.class.php 2018-11-10 07:32:22 +01:00
Frédéric FRANCE
b271e1a3b0
The variable $i seems to be never defined. 2018-11-10 07:27:20 +01:00