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

68218 Commits

Author SHA1 Message Date
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Laurent Destailleur
650cd2b54f Prepare 10.0.3 2019-10-12 18:41:33 +02:00
Laurent Destailleur
9c94ffeea9 Fix css 2019-10-12 18:40:41 +02:00
Laurent Destailleur
67d76787eb Add new hidden conf VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT 2019-10-12 15:29:06 +02:00
Laurent Destailleur
9871dd8770 Debug variants 2019-10-12 15:27:06 +02:00
Frédéric FRANCE
c3e8aec07c
fix translation for showemailing 
in lang files, it's ShowEMailing not ShowEmailing
 2019-10-11 23:54:05 +02:00
Laurent Destailleur
2fa3b23cf1 Fix missing price level field 2019-10-11 19:36:36 +02:00
Laurent Destailleur
f345b5fdb0 Fix look and feel v10 2019-10-11 19:32:45 +02:00
JC Prieto
d109341ebe
Update card.php 
Variable $mesg not do anything
 2019-10-11 18:08:15 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:12:01 +02:00
Laurent Destailleur
7ea0af4067 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:38 +02:00
Laurent Destailleur
2a07ecf659 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:30 +02:00
Laurent Destailleur
777c297353 FIX #12054 2019-10-11 15:42:27 +02:00
Laurent Destailleur
85a4bac9e0 Better translation 2019-10-11 15:22:12 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00
Laurent Destailleur
c3aba5f1a3 FIX #12083 2019-10-11 14:53:30 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen 2019-10-09 18:47:25 +02:00
Laurent Destailleur
f2d04fe55c Code comment 2019-10-09 11:51:10 +02:00
Laurent Destailleur
9da1d5025b FIX If product account not suggested during bind, it is not preselected 2019-10-09 03:15:29 +02:00
Laurent Destailleur
9f4aadae18 Missing Nature, Duration and Type fields in export of products 2019-10-09 02:05:20 +02:00
Laurent Destailleur
6de31f2c54 Better translation 2019-10-08 19:35:50 +02:00
Laurent Destailleur
8921a103c1 Trans 2019-10-08 19:25:54 +02:00
Laurent Destailleur
7377c30bfe Fix limit 2019-10-08 13:17:13 +02:00
Laurent Destailleur
73422b2149 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-08 13:15:05 +02:00
Laurent Destailleur
760783b98b FIX #11942 2019-10-08 13:14:51 +02:00
Laurent De Coninck
091df082fc fix the access of the bank account of one user 
There are 3 ways to access this tab :
    1. If the module holiday is enabled
    2. If the module holidays is enabled
    3. If the module expense report is enabled

More over that, the application checks if the user can access the bank
account of the selected user. The application does that twice (logical
^^), first to know if the tab has to be displayed or not. Second time,
when you arrive on the page /user/bank.php to know if you have access
(eg. if you type the url directly).

In this second check, the check of the expense report module was missing
(added by this PR). This caused the following issue: the tab was visible
but when the user clicked on itn, he received an error as he cannot
access the page.
 2019-10-08 08:11:29 +02:00
Laurent Destailleur
51be0fad99 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 20:52:39 +02:00
Laurent Destailleur
bb72efefc5 Fix phpcs 2019-10-07 20:52:27 +02:00
Laurent Destailleur
156eb7fa61
Merge branch '10.0' into hotfix/12041-security-generate-password 2019-10-07 20:22:19 +02:00
Laurent De Coninck
2ba8506608 validate the 0 as min value consecutive; meaning not take that rule into account 2019-10-07 17:53:23 +02:00
Florian Mortgat
2aee62ea28 FIX: $from and $sendto variables are unescaped in the sending error message 
This causes addresses like Tom <tom@examp.le> not to be shown in the message.
 2019-10-07 17:32:52 +02:00
Laurent Destailleur
839929f764 FIX #12026 2019-10-07 14:16:47 +02:00
Laurent Destailleur
12d243b8d4 FIX #12040 2019-10-07 13:13:46 +02:00
Laurent Destailleur
bb84e4a236
Merge pull request #12037 from frederic34/patch-14 
Fix list of expense report list for user when he has extrafields
 2019-10-07 13:10:02 +02:00
Laurent Destailleur
68a4ab87a2 Fix can set min repeat to 0 for password 2019-10-07 12:57:24 +02:00
Laurent Destailleur
a604fb9afb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 12:54:57 +02:00
Laurent Destailleur
022c67ee68
Merge pull request #12045 from laudeco/hotfix/12041-security-generate-password 
[fix #12041] - Generate password mode perso
 2019-10-07 12:54:45 +02:00
Laurent Destailleur
91a922a454
Update security.php 2019-10-07 12:54:28 +02:00
Laurent Destailleur
7015e71105 FIX #12041 2019-10-07 12:53:32 +02:00
Laurent Destailleur
611b045676
Merge pull request #12053 from atm-lena/9.0_fix_link_fetch 
FIX : missing "$this->id" in "fetch" function
 2019-10-07 12:38:05 +02:00
Laurent Destailleur
23de8694fa Fix module files 2019-10-07 12:37:01 +02:00
Laurent Destailleur
b9ac8295d4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 12:28:06 +02:00
Laurent Destailleur
55508e25ec Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-07 12:27:06 +02:00
VESSILLER
219b0d8925 FIX Import of product using units 2019-10-07 12:26:02 +02:00
atm-lena
8c024b3786 FIX : missing "$this->id" in "fetch" function 2019-10-07 11:26:10 +02:00
Laurent Destailleur
753da4791e FIX Pb in units of shipments 
Conflicts:
	htdocs/expedition/card.php
 2019-10-06 16:31:17 +02:00
Laurent Destailleur
fb808d830e FIX Look and feel v10 2019-10-06 16:28:14 +02:00
Laurent Destailleur
6c1c008d09 FIX Look and feel v10 2019-10-06 16:28:10 +02:00
Frédéric FRANCE
37f6aa3395
Update list.php 2019-10-06 15:52:33 +02:00
Frédéric FRANCE
52da21912b
Update agenda.lang 2019-10-06 13:21:04 +02:00
Frédéric FRANCE
21dcc549fa
translation for holidays actioncomm 2019-10-06 10:09:06 +02:00
Laurent Destailleur
ac8837d01f Fix url 2019-10-05 19:28:00 +02:00
Laurent Destailleur
7f5ccf4b8e Remove google+ 2019-10-05 19:27:14 +02:00
Laurent Destailleur
3e5cd877b8 FIX Bad list of ticket on public interface for ticket emailcollector 2019-10-05 14:27:42 +02:00
Laurent Destailleur
e90234c2bc FIX escape email alias 2019-10-05 14:27:37 +02:00
Laurent Destailleur
083db12490 FIX access to public interface when origin email has an alias. 2019-10-05 11:53:08 +02:00
Laurent Destailleur
a06b1b9f3f Fix escaping chars 2019-10-05 11:43:28 +02:00
Laurent Destailleur
8bf9afb7ca FIX Attachement of linked files on ticket when sending a message 2019-10-04 19:41:35 +02:00
stickler-ci
a509404636 Fixing style errors. 2019-10-04 16:26:26 +00:00
Laurent De Coninck
c8fb81710f fix #12041 - Generate password 
Secure the generate password method "perso".
Now the system checks the minimum possible value. If the value entered
is lower then the system will never trigger the update.

Since the update is done through GET parameters, I also added a check
backend wise. This checks should never be triggered nor in error.

[see: #12041]
 2019-10-04 18:13:00 +02:00
Laurent Destailleur
503973cec9 FIX Edit of ticket module parameters erased others 2019-10-04 14:04:31 +02:00
Laurent Destailleur
c3fa770871 FIX Filter "Open all" of ticket was ko. 2019-10-04 13:06:24 +02:00
Laurent Destailleur
68c28ab3c7 FIX Look and feel v10 2019-10-04 12:31:25 +02:00
Laurent Destailleur
0b9d27423d FIX Can't modify vendor invoice if transfered into accountancy 2019-10-04 10:31:57 +02:00
Laurent Destailleur
6cd3d27885 Fix comparison 2019-10-04 09:54:52 +02:00
Frédéric FRANCE
55410a55ef
Update list.php 2019-10-04 00:45:57 +02:00
Laurent Destailleur
b787e53020 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-03 17:54:58 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/product/card.php
 2019-10-03 17:53:59 +02:00
Laurent Destailleur
d9aa816197 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
atm-lena
ae01bd8f07 FIX missing begin() 2019-10-03 17:23:16 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php 2019-10-03 00:22:14 +02:00
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency 
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
 2019-10-02 11:12:30 +02:00
Laurent Destailleur
4928a999a0
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype 
FIX : change product type must be allowed if we activate hidden conf
 2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762
Update card.php 2019-10-01 14:41:25 +02:00
Laurent Destailleur
d6198a1e33 Fix billed time is empty 2019-10-01 13:47:29 +02:00
Laurent Destailleur
2d42afc686 FIX Filter on project on ticket list 2019-10-01 12:36:39 +02:00
Laurent Destailleur
9b607a3105 FIX navigation on ticket tab of projects 2019-10-01 12:29:58 +02:00
Frédéric FRANCE
64381ac4d6 Update api_boms.class.php 2019-10-01 11:37:29 +02:00
Laurent Destailleur
956b46d920 Fix warnings 2019-10-01 11:37:15 +02:00
Frédéric FRANCE
7872a93605 Update box_commandes.php 2019-10-01 11:36:33 +02:00
Frédéric FRANCE
4ff65ce586 Update box_supplier_orders.php 2019-10-01 11:36:29 +02:00
Frédéric FRANCE
d201515514 Update box_prospect.php 2019-10-01 11:36:24 +02:00
Laurent Destailleur
322786cabe Look and feel v10 2019-10-01 11:36:06 +02:00
Laurent Destailleur
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
6ee17022c0 Fix bad key for type of contact of resources 2019-10-01 11:34:01 +02:00
gauthier
2167e7ed98 FIX : hidden conf to prevent from changing product_type 2019-10-01 09:12:51 +02:00
Laurent Destailleur
4f356fa412
Merge pull request #11859 from altatof/avoir 
FIX : allow standalone credit note even if no invoice
 2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89
Update card.php 2019-09-30 18:12:43 +02:00
Laurent Destailleur
29d941cb6e
Merge pull request #11918 from atm-gauthier/8.0_fix_discount_visibility_follows_invoice_sharing 
FIX : If we share invoice, we need to see discount created from a deposit on each entity
 2019-09-30 18:04:07 +02:00
Laurent Destailleur
d2881eb85b FIX CSS 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
 2019-09-29 19:26:37 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
18055bc425 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-27 17:51:34 +02:00
Laurent Destailleur
46e019642f Code comment 2019-09-27 17:51:22 +02:00
Laurent Destailleur
ea62ea8c70
Merge pull request #11901 from ptibogxiv/patch-263 
NEW: delete purchase price API
 2019-09-27 15:37:21 +02:00
VESSILLER
5f08a649eb FIX empty cache when we want to load specific warehouses in select 
Conflicts:
	htdocs/product/class/html.formproduct.class.php
 2019-09-27 15:10:05 +02:00
Laurent Destailleur
e3edb37620 Fix escape db 2019-09-27 14:54:23 +02:00
madx666
4b3430a1dc Fix return to list on page 1 
When are on page 1 on any list and we go on an object, when return to the list, we are back on page 0
 2019-09-27 14:53:11 +02:00
Laurent Destailleur
da35e3d7cd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-27 14:07:35 +02:00
Laurent Destailleur
6d1a571aed Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-09-27 14:07:11 +02:00
Laurent Destailleur
5d45638248 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-27 14:02:23 +02:00
Laurent Destailleur
ab33665f7b
Merge pull request #11950 from laudeco/hotfix/11881-remove-referent 
[FIX][#11881] -  remove referent from the project
 2019-09-27 12:37:16 +02:00
Laurent Destailleur
412e0f193b
Update element.php 2019-09-27 12:36:53 +02:00
Laurent Destailleur
34aa64bae2
Update element.php 2019-09-27 12:36:15 +02:00
Laurent Destailleur
2eaa910336
Update project.class.php 2019-09-27 12:32:27 +02:00
Laurent Destailleur
7f9ea2e223
Merge pull request #11929 from atm-florian/9.0 
fix regex main.inc.php warning
 2019-09-27 12:26:24 +02:00
Laurent Destailleur
de11801792
Merge pull request #11971 from ATM-Marc/FIX_8.0_shipping_errors 
FIX: shipping card: missing user error messages when classifying closed or billed
 2019-09-27 11:56:43 +02:00
Laurent Destailleur
59a099b176
Merge pull request #11954 from frederic34/patch-18 
add missing error code in price parser
 2019-09-27 11:35:42 +02:00
Laurent Destailleur
99cfea1ff4
Update paiement_charge.php 2019-09-27 11:34:50 +02:00
Laurent Destailleur
61f8771525
Merge pull request #11959 from prietojc/patch-10 
FIX:  expedition.class.php
 2019-09-27 11:15:23 +02:00
Laurent Destailleur
435edf999b Fix: label of product not always visible after a search 2019-09-27 11:05:44 +02:00
Marc de Lima Lucio
13f5decdf7 FIX: shipping card: missing user error messages when classifying closed or billed 2019-09-27 11:00:17 +02:00
Laurent Destailleur
cd295662d6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-27 10:21:28 +02:00
Laurent Destailleur
8c3c7fd857 Fix remove + of categ on product thumb 2019-09-27 10:21:14 +02:00
Laurent Destailleur
d4364dd44e
Merge pull request #11956 from atm-john/10.0_fix_top_menu_size 
FIX top menu right padding
 2019-09-26 23:39:23 +02:00
Alexandre SPANGARO
b52e5d51e3 FIX colspan on VAT quadri report 2019-09-26 22:01:59 +02:00
JC Prieto
cdb6e7f9a6
Fix moved to fetch_line() 
Fix moved to fetch_line()
 2019-09-26 20:34:28 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
Laurent Destailleur
ba1275332d Fix thousand separator for fr_NC 2019-09-25 13:03:43 +02:00
JC Prieto
0893926189
Update expedition.class.php 
Clear lines before fech them.
 2019-09-25 12:49:19 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Laurent Destailleur
c53be23122 FIX Filtering the HTTP Header "Accept-Language". 2019-09-24 13:54:52 +02:00
Laurent Destailleur
9cfe1262bd FIX Force downlaod of file with .noexe as octet-stream mime type 2019-09-24 13:30:04 +02:00
John Botella
5417dc0356 Fix top menu right padding 2019-09-24 13:11:40 +02:00
Laurent Destailleur
b5c5cc42fc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-24 12:43:54 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Frédéric FRANCE
26cd418320
Update price_parser.class.php 2019-09-24 10:28:27 +02:00
Juanjo Menent
c97bd14278 FIX TakePOS no invoice validation control and good payment translate 2019-09-24 10:08:48 +02:00
Laurent Destailleur
d22a1e2571 Use space 2019-09-23 19:44:05 +02:00
Laurent De Coninck
b4f31d61fa allow to remove one custom referent in the project. 
Allow to remove one custom referent from the project.

When we develop one module that supports the custom referent in a
project and if you don't follow the same naming convention as in the
other table (in french). You cannot remove the element.

This fix support now the property 'project_field'. And thus set this
column to null.

[see: #11881]
 2019-09-23 17:46:54 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
Laurent Destailleur
8ac0383fa0 FIX Send email from expense report card. 
FIX Alias name is not into the email recipient label.
 2019-09-23 12:36:12 +02:00
Laurent Destailleur
d5877e9c36 FIX Bad currency var used in stripe for connect 2019-09-23 11:36:45 +02:00
gauthier
575e4d11d0 FIX : wrong test 2019-09-19 17:28:51 +02:00
gauthier
d40534e8fa FIX : change product type must be allowed if we activate hidden conf 2019-09-19 15:21:52 +02:00
florian HENRY
3b555797d1 fix regex 2019-09-19 12:32:26 +02:00
florian HENRY
536e99e3c9 fix regex main.inc.php fatal 2019-09-19 09:59:05 +02:00
Laurent Destailleur
9bf387d43c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/main.inc.php
	htdocs/user/card.php
 2019-09-18 15:12:38 +02:00
Laurent Destailleur
00d5cff00d Fix XSS injection into textarea 2019-09-18 14:44:31 +02:00
Laurent Destailleur
e52788eb75 Fix xss 2019-09-18 14:31:03 +02:00
Laurent Destailleur
771104bc68 Fix XSS 2019-09-18 14:25:53 +02:00
Laurent Destailleur
345ac28c89 Fix js injection 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
 2019-09-18 14:21:02 +02:00
Laurent Destailleur
7b512587aa FIX XSS 2019-09-18 14:15:20 +02:00
Laurent Destailleur
ad3d21578c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-18 13:13:02 +02:00
Laurent Destailleur
2da5071642 Fix VAT in New caledonia is now called TGC 2019-09-18 13:12:22 +02:00
Laurent Destailleur
214bf4375e Fix missing include 2019-09-17 13:28:36 +02:00
Laurent Destailleur
24cb1390e4 FIX Update of leave request when CSRF with token is on 
FIX Export of leave request show the number of open days
 2019-09-17 13:17:25 +02:00
Laurent Destailleur
ab9dee631b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
gauthier
2ac8bd4e16 FIX : If we share invoice, we need to see discount created from a deposit on each entity 2019-09-17 11:59:58 +02:00
Laurent Destailleur
8d79404914 Fix css for responsive 2019-09-16 18:40:58 +02:00
Laurent Destailleur
e3480780cf Fix label on "Connect" button on Simple POS module 2019-09-16 18:31:40 +02:00
Laurent Destailleur
5233e7d8ad FIX do not output return code on screen after a select of bank account 2019-09-16 18:29:04 +02:00
Laurent Destailleur
23777fd5ff Fix css 2019-09-16 11:19:02 +02:00
Laurent Destailleur
abee6dceaa Fix css demo 2019-09-16 11:16:58 +02:00
Laurent Destailleur
f5dd4f4f9e css 2019-09-16 11:08:34 +02:00
Laurent Destailleur
edbf8f0186 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-16 11:01:21 +02:00
Laurent Destailleur
eb70411ae0 Css demo 2019-09-16 11:01:09 +02:00
ptibogxiv
ea1baefe9a
NEW: delete purchase price API 2019-09-15 20:50:18 +02:00
Maxime Kohlhaas
5d4f702920
Remove bas copy / paste 2019-09-15 16:38:03 +02:00
Laurent Destailleur
bb6853a635 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-15 15:53:15 +02:00
Laurent Destailleur
ab07da02c4 Fix scrutinizer 2019-09-15 15:53:04 +02:00
Laurent Destailleur
cec5666257
Merge pull request #11872 from hregis/10.0_ldap 
FIX an admin can not access his own permissions after enabling advanced permissions
 2019-09-15 15:32:50 +02:00
Laurent Destailleur
27e3a2cb1d
Update perms.php 2019-09-15 15:32:43 +02:00
Laurent Destailleur
76b3668368 FIX regression with option to hide picto on top menu 2019-09-15 15:15:59 +02:00
Laurent Destailleur
544a1237bc FIX regression with option to hide picto on top menu 2019-09-15 15:11:13 +02:00
Laurent Destailleur
f946ec0563
Merge pull request #11896 from tuxgasy/10.0_childtablesoncascade_isempty 
Check if childtablesoncascade is not empty
 2019-09-15 10:16:07 +02:00
Laurent Destailleur
7b56cbc334
Merge pull request #11892 from aspangaro/10.0_nowrap 
Fix Bank entries - nowrap on amount
 2019-09-15 10:01:06 +02:00
Laurent Destailleur
bbb62f27c7 Update doc 2019-09-14 19:25:09 +02:00
TuxGasy
e0238705cc Check if childtablesoncascade is not empty 2019-09-14 19:04:43 +02:00
Laurent Destailleur
f45abc1b2a Removed useless header 2019-09-14 18:26:38 +02:00
Laurent Destailleur
584549df11 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:23:20 +02:00
Laurent Destailleur
3caa1bd43c FIX Debug feature orderstoinvoice for suppliers 2019-09-14 18:21:37 +02:00
Laurent Destailleur
bac1e7133a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-14 17:35:19 +02:00
Laurent Destailleur
844f0903da Fix missing fields 2019-09-14 17:34:57 +02:00
Laurent Destailleur
92c6168247
Merge pull request #11858 from ptibogxiv/patch-260 
FIX new invoice with generic thirdparty in takepos
 2019-09-14 17:10:32 +02:00
Laurent Destailleur
ace9eb9b3e
Merge pull request #11870 from hregis/10.0_mc 
FIX avoid non numeric warning
 2019-09-14 16:39:40 +02:00
Laurent Destailleur
7aac67f79c
Merge pull request #11884 from frederic34/patch-10 
fix colspan in show_project
 2019-09-14 16:33:02 +02:00
Alexandre SPANGARO
4420af683d Fix Bank entries - nowrap on amount 2019-09-14 05:44:28 +02:00
florian HENRY
224b4c147a Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2019-09-13 15:25:25 +02:00
florian HENRY
7966bfc2df fix: fill id for links (document tab) 2019-09-13 15:25:16 +02:00
Laurent Destailleur
36963423c3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-13 11:59:39 +02:00
Laurent Destailleur
9df4f0601d Clean address line to be on 1 line 2019-09-13 11:18:08 +02:00
Laurent Destailleur
7b73e2d57a FIX label of thirdparty is wrong on open project list 2019-09-13 11:05:50 +02:00
Laurent Destailleur
9eb736b110 FIX stripe payment when there is a quote into address 2019-09-13 10:12:43 +02:00
Laurent Destailleur
5137104b92 Fix responsive 2019-09-13 01:46:18 +02:00
Frédéric FRANCE
00394493eb
Update index.php 2019-09-12 22:02:39 +02:00
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project 2019-09-12 21:39:57 +02:00
Laurent Destailleur
a12bd6aec8 better translation 2019-09-12 18:55:07 +02:00
Regis Houssin
60e85136df FIX an admin can not access his own permissions after enabling advanced 
permissions
 2019-09-12 08:48:55 +02:00
Regis Houssin
5f23ba5467 FIX avoid non numeric warning 2019-09-12 08:04:53 +02:00
Laurent Destailleur
db900cb5ea FIX EDB-ID:47370 2019-09-11 17:51:50 +02:00
Laurent Destailleur
eeaeefe20c FIX Add repair.php option 'restore' to restore user picture after v10 2019-09-11 15:46:37 +02:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Christophe Battarel
c8cb5886f4 correction 2019-09-10 17:04:09 +02:00
Christophe Battarel
95417d4c86 allow standalone credit note even if no invoice 2019-09-10 16:24:04 +02:00
Laurent Destailleur
48aedcee20 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-09-10 15:31:29 +02:00