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

50791 Commits

Author SHA1 Message Date
Maxime Kohlhaas
8eba418715 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-06-27 12:19:10 +02:00
John
93477c102f FIX delete linked element on facture rec 2017-06-26 15:44:04 +02:00
Laurent Destailleur
3a6314b1a0 Fix data 2017-06-26 13:29:18 +02:00
Laurent Destailleur
4a21457b8a Fix position of page nb 2017-06-26 09:28:02 +02:00
Laurent Destailleur
85ce1f3332 Fix missing var init 2017-06-26 09:20:16 +02:00
Laurent Destailleur
ab9be29356 Fix installers 2017-06-24 21:36:51 +02:00
Laurent Destailleur
e79f3715b4 FIX #7048 #6075 2017-06-24 16:21:25 +02:00
Laurent Destailleur
ee8924e101 Fix position of accounting periods 2017-06-24 10:23:38 +02:00
Laurent Destailleur
1211e0d7ab FIX vat code not saved during product creation. 2017-06-23 12:09:21 +02:00
Laurent Destailleur
45004493e0 Fix multicurrency and vat_src_code not propaged on invoice from 
shipment.
 2017-06-23 11:12:17 +02:00
Laurent Destailleur
ecae2fc6b6 Fix translation 2017-06-23 11:08:49 +02:00
Maxime Kohlhaas
ea616114a9 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-06-20 22:16:19 +02:00
Laurent Destailleur
3ec0e6f7ef FIX #6885 2017-06-20 12:31:08 +02:00
Laurent Destailleur
a7fb411a42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-20 10:46:38 +02:00
Laurent Destailleur
d572bd4f34 FIX #7003 2017-06-20 10:45:20 +02:00
Laurent Destailleur
6d42922839 FIX #7012 2017-06-20 10:37:42 +02:00
Laurent Destailleur
d8b0199ba2 FIX #7040 2017-06-20 10:24:54 +02:00
Maxime Kohlhaas
166b5da560 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-06-20 09:29:26 +02:00
Laurent Destailleur
dbeb31cad3 Merge pull request #7039 from marcosgdf/bug-5640 
FIX #5640 Prices of a predefined product/service were incorrect under certain circumstances
 2017-06-20 01:15:33 +02:00
Laurent Destailleur
1f83bef1b5 Merge pull request #7035 from fmarcet/3.9 
Fix: User id correction on holiday request
 2017-06-20 00:57:10 +02:00
Laurent Destailleur
1745d06bb7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 19:56:16 +02:00
Laurent Destailleur
12d7b92556 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 19:52:49 +02:00
Laurent Destailleur
6fb0fc7b71 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 19:42:56 +02:00
Laurent Destailleur
f694939fc7 Fix migration with pgsql 2017-06-19 19:39:37 +02:00
Marcos García
eaaee59f92 FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working 2017-06-19 19:23:00 +02:00
Marcos García
ba87549124 FIX #5640 Prices of a predefined product/service were incorrect under certain circumstances 2017-06-19 18:07:43 +02:00
fmarcet
c4546b6da6 FIX: User id correction on holiday request 2017-06-19 16:23:44 +02:00
Ferran Marcet
03eadcebf1 FIX: User id correction on holiday request 2017-06-19 12:25:00 +02:00
Regis Houssin
9352ecca1f Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context 2017-06-19 04:01:34 +02:00
Laurent Destailleur
43f25b49a1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-19 03:00:29 +02:00
Laurent Destailleur
5cd5986211 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-19 02:59:49 +02:00
Laurent Destailleur
39419bb411 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 02:59:16 +02:00
Laurent Destailleur
774c624687 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 02:58:44 +02:00
Laurent Destailleur
5439390461 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 02:57:12 +02:00
Laurent Destailleur
6fc4dacd42 Fix migration opensurvey 2017-06-19 02:55:33 +02:00
Laurent Destailleur
317ab64d7c Fix escapement 2017-06-18 22:03:25 +02:00
Laurent Destailleur
f3a5975cf8 Fix sql injection 2017-06-18 21:58:56 +02:00
Laurent Destailleur
8debefa8ad Fix php sanitazing 2017-06-18 21:53:06 +02:00
Laurent Destailleur
0ef507ae7f Fix rename of file to remove .noexe extension. 2017-06-18 21:52:51 +02:00
Laurent Destailleur
abe736c6a6 Escape hml tags 2017-06-18 19:42:59 +02:00
Laurent Destailleur
7777bcc587 Merge pull request #7009 from atm-ph/fix_5.0_css_situation_invoice 
Fix css to apply "pair" and "impair" style
 2017-06-16 12:50:44 +02:00
phf
3333049341 Fix total aren't aligned 2017-06-15 11:11:49 +02:00
Laurent Destailleur
848f70e026 Fix bad merge 2017-06-14 10:38:34 +02:00
Laurent Destailleur
0e867229db FIX Can't create invoice if PO disapproved 2017-06-14 10:28:02 +02:00
Laurent Destailleur
7939daa225 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/index.php
 2017-06-14 10:18:24 +02:00
Laurent Destailleur
83a5b8e078 FIX Can set supplier invoice to billed. 2017-06-14 10:13:33 +02:00
phf
d2db5f60a8 Fix css to apply "pair" and "impair" style 2017-06-14 09:42:05 +02:00
Laurent Destailleur
fd2ab6371d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-13 15:58:22 +02:00
Laurent Destailleur
70c7bcc85f Complete css to get value unique 2017-06-13 15:57:30 +02:00
Laurent Destailleur
7b8a35630c Merge pull request #6997 from atm-ph/fix_6993 
Fix 6993 - supplier propal check min price on update line
 2017-06-13 15:03:27 +02:00
Laurent Destailleur
9e5af63c2c Merge pull request #6996 from atm-ph/fix_5.0_display_situtation_amount 
Fix display on situation invoice
 2017-06-13 15:01:44 +02:00
Laurent Destailleur
9b979e3cb7 Fix wrong warning when user is disabled 2017-06-13 13:44:18 +02:00
phf
f2961b8652 Fix 6993 - supplier propal check min price on update line 2017-06-13 12:30:30 +02:00
Maxime Kohlhaas
c8172d2b49 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-06-13 11:59:10 +02:00
Laurent Destailleur
e4c7f584e3 Fix option STOCK_SUPPORTS_SERVICES (stock not visible when it should) 2017-06-13 11:45:21 +02:00
phf
4c0b0ef4c2 Fix display on situation invoice 2017-06-13 11:29:12 +02:00
Laurent Destailleur
5def2d2600 Add div to help debug of html content 2017-06-13 11:14:52 +02:00
Laurent Destailleur
ffdee40eb9 Fix permission on recurring invoice list 2017-06-13 10:58:41 +02:00
Laurent Destailleur
4402c7fb89 Merge pull request #6987 from atm-ph/fix_6962 
FIX 6962 Can't create shipment if no write permission on order
 2017-06-12 17:46:29 +02:00
florian HENRY
71afaaa360 fix : availibity refresh 2017-06-12 17:24:36 +02:00
Laurent Destailleur
64a6ff9687 Fix test for navigation disabling for external users 2017-06-12 16:26:25 +02:00
Laurent Destailleur
5d9a84dedb Fix sql syntax error 2017-06-12 15:35:50 +02:00
Laurent Destailleur
2916444f6c Fix check on module product for external user 2017-06-12 15:30:00 +02:00
Laurent Destailleur
279e6ab304 Fix missing parameters 2017-06-12 14:54:03 +02:00
Laurent Destailleur
d7cbb598c1 Fix permission for external users 2017-06-12 14:30:00 +02:00
Laurent Destailleur
bf41056c68 Fix test on permission for widgets 2017-06-12 14:21:04 +02:00
Laurent Destailleur
ec24f223b5 Fix permission on widget 2017-06-12 12:55:57 +02:00
Laurent Destailleur
cd08690646 Fix ajax search product that return bad json response 2017-06-12 12:42:06 +02:00
Laurent Destailleur
8f7371cdf0 Product has 2 status. Add span to differentiate for css 2017-06-12 12:24:42 +02:00
Laurent Destailleur
0207f86aa5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-12 12:03:26 +02:00
Laurent Destailleur
6d130351a0 Fix css 2017-06-12 11:32:10 +02:00
atm-ph
5157981751 Fix 6962 wrong permission check 2017-06-11 12:59:54 +02:00
Laurent Destailleur
e99d57802b Merge pull request #6986 from atm-ph/fix_6982 
Fix 6982 missing parameter to get more informations about files
 2017-06-11 12:56:48 +02:00
atm-ph
946e72f269 Fix 6982 missing parameter to get more informations about files 2017-06-11 12:26:51 +02:00
Laurent Destailleur
9c482b9f2a FIX CVE-2017-7886 2017-06-10 21:37:27 +02:00
Laurent Destailleur
d037515e37 FIX SQL injection on user/index.php parameter search_statut. 
Conflicts:
	htdocs/user/index.php
 2017-06-10 20:10:57 +02:00
atm-ph
0d24df9ffc Fix 6939 new path for pictures is not used 2017-06-10 14:40:17 +02:00
Laurent Destailleur
4b4b2ad1b7 Merge pull request #6965 from atm-maxime/fix_converttoreduc 
Fix : button convert was still available even if deposit was already …
 2017-06-10 00:10:45 +02:00
Laurent Destailleur
9341d5f448 FIX Line of invoices not inserted when using POS module and VAT NPR. 2017-06-09 15:35:27 +02:00
Laurent Destailleur
cc37a7d848 Fix parenthesis 2017-06-09 13:11:34 +02:00
Laurent Destailleur
24eebfeb61 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-09 12:57:14 +02:00
Laurent Destailleur
985a9ed8d3 FIX Redirect to payment page from member subscription page failed if a 
unique security key was defined.
 2017-06-09 12:12:12 +02:00
Laurent Destailleur
1935de03c7 Fix bad consistency of labels 2017-06-09 12:01:55 +02:00
Laurent Destailleur
41586b76c0 Fix missing css 2017-06-09 11:40:35 +02:00
Laurent Destailleur
62933e9a26 Fix sql syntax error in some cases 2017-06-09 11:22:42 +02:00
Maxime Kohlhaas
92b7914ef3 Fix : button convert was still available even if deposit was already converted 2017-06-09 11:09:06 +02:00
Maxime Kohlhaas
ec5b304634 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-06-09 11:05:37 +02:00
Laurent Destailleur
02781b41ca Fix several problem with hook printFieldListWhere 2017-06-09 11:02:34 +02:00
Laurent Destailleur
bec6ad9fb3 Fix bad position of hook 2017-06-09 10:22:07 +02:00
Laurent Destailleur
929946ad47 Fix several problem with hook printFieldListWhere 2017-06-09 10:12:01 +02:00
Laurent Destailleur
d6ba16d357 Fix missing printFieldListWhere hook 2017-06-09 09:45:22 +02:00
Laurent Destailleur
d326f161ef Fix permission on page to print barcode 2017-06-09 01:06:52 +02:00
Laurent Destailleur
a63050bf46 FIX Warnings 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/images.lib.php
 2017-06-09 00:38:30 +02:00
Maxime Kohlhaas
9b74a632e1 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-06-07 09:24:40 +02:00
florian HENRY
ca5fd6ac4c FIX #6926 2017-06-06 09:15:11 +02:00
Maxime Kohlhaas
6787d717f9 Update bonprelevement.class.php 2017-06-03 18:23:19 +02:00
Laurent Destailleur
3555bd2bd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
 2017-06-03 01:29:59 +02:00
Laurent Destailleur
d9794f942d Prepare 5.0.4 2017-06-03 01:17:33 +02:00
Laurent Destailleur
37a261587e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-03 01:17:03 +02:00
Laurent Destailleur
75a01cbe7e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-03 01:13:06 +02:00
Laurent Destailleur
f0ff2b3085 Merge pull request #6931 from atm-arnaud/FIX_contratligne_update 
FIX contratligne update
 2017-06-03 01:02:56 +02:00
Laurent Destailleur
98586f3b2d Merge pull request #6930 from atm-ph/fix_5.0_wrong_agenda_view_link 
Fix week view link has wrong link
 2017-06-03 01:02:40 +02:00
Laurent Destailleur
af584bc9c0 FIX #6880 #6925 2017-06-03 00:58:51 +02:00
arnaud
df883a601b FIX contratligne update 2017-06-02 12:28:50 +02:00
Laurent Destailleur
976c8e0752 Fix security to test access on a task 2017-06-01 19:53:54 +02:00
Laurent Destailleur
dd2d9f533a Clean duplicated vars 2017-06-01 18:18:57 +02:00
Laurent Destailleur
76e1438fe6 FIX REST api to get project when user has permission to read all. 2017-06-01 17:29:47 +02:00
phf
31aa8bdf05 Fix week view link has wrong link 2017-06-01 16:26:32 +02:00
gauthier
fb252706f9 FIX : situation_progress param default value must be 100 and not 0 2017-06-01 15:42:19 +02:00
Laurent Destailleur
f4cdb6b254 Fix month on 2 chars. Some setup return on 1 char only. More phpunit 
assert.
 2017-06-01 15:33:23 +02:00
Maxime Kohlhaas
5f6c63948e Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-06-01 13:06:32 +02:00
Laurent Destailleur
bb5a49eca4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-01 12:26:59 +02:00
Laurent Destailleur
07a6bb5664 More files to delete in migration 2017-06-01 12:26:17 +02:00
Maxime Kohlhaas
0b5adc7795 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-06-01 11:55:54 +02:00
Maxime Kohlhaas
0e175ba373 Fix : SEPA XML address should also have dolEscapeXML 2017-06-01 11:48:14 +02:00
Laurent Destailleur
d70c14a411 Update bonprelevement.class.php 2017-05-31 19:07:39 +02:00
Laurent Destailleur
d7d8e51ab1 Merge pull request #6912 from atm-gauthier/5.0_fix_originid_on_supplierproposal 
FIX : origin & originid on supplierproposal
 2017-05-31 19:01:29 +02:00
Laurent Destailleur
7c29e286f8 Prepare 4.0.7 2017-05-31 13:31:17 +02:00
Laurent Destailleur
5d115bcf69 Fix deadlock feature, can't process a leave request when validator has 
left company.
 2017-05-30 20:58:32 +02:00
Maxime Kohlhaas
510b1aedcf Fix xml SEPA $ListOfFactures not used and was listing all invoices in each XML line 2017-05-30 16:13:49 +02:00
Maxime Kohlhaas
200f4010d8 Fix special char and size limit in SEPA XML 2017-05-30 16:00:39 +02:00
gauthier
6b7c4cbbe1 FIX : default param 2017-05-30 16:00:21 +02:00
gauthier
c66695bd56 FIX : origin & originid on supplierproposal 2017-05-30 15:35:51 +02:00
Maxime Kohlhaas
2f6fe2c65e Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-05-30 14:10:20 +02:00
David
d8c5ec2aef FIX: REST API not possible to add agendaevents 2017-05-29 13:47:42 +02:00
Regis Houssin
96b8339d21 Fix: [Restler] Delete the cache file otherwise it does not update 2017-05-29 13:46:03 +02:00
Laurent Destailleur
d2813eabbc FIX #6877 
Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-05-29 13:41:59 +02:00
Laurent Destailleur
19b8918caf FIX #6881 2017-05-29 13:40:08 +02:00
Laurent Destailleur
ab5545d02d Merge pull request #6898 from defrance/patch-12 
$resaction need in 5.0.x too
 2017-05-29 11:41:22 +02:00
BENKE Charlie
18799c3a7f Changes Done 
question
need to change $actionclassinstance->results in $actionclassinstance->resactionss ???
 2017-05-29 11:00:08 +02:00
Maxime Kohlhaas
6ac08c3bee Fix : Product supplier price is related to supplier's currency 2017-05-29 10:32:17 +02:00
Laurent Destailleur
b22817c237 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
 2017-05-29 10:25:07 +02:00
Laurent Destailleur
4a330af4bf Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 10:15:30 +02:00
Laurent Destailleur
aa0a369f06 Fix typo 2017-05-29 10:15:10 +02:00
Laurent Destailleur
d526fcc091 Merge pull request #6884 from hregis/5.0_bug 
Fix: wrong SPECIMEN value
 2017-05-29 10:14:52 +02:00
Laurent Destailleur
5ff85a6586 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 10:13:55 +02:00
Laurent Destailleur
b7b2184fb6 Merge pull request #6879 from atm-arnaud/FIX_pagination_resources 
FIX pagination on resources
 2017-05-29 10:12:11 +02:00
Laurent Destailleur
70636cc59f FIX SQL injection on user/index.php parameter search_statut. 2017-05-29 09:59:21 +02:00
Laurent Destailleur
d03d179fa3 FIX Fullname when member is a moral entity with no name. 2017-05-28 23:43:24 +02:00
BENKE Charlie
e4f7f2a0b2 $resaction need in 5.0.x too 2017-05-26 12:39:49 +02:00
Laurent Destailleur
aef9ef2d75 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-24 13:46:03 +02:00
Laurent Destailleur
6eeb82ec70 FIX dialog window with md theme must not be hidden by left menu part. 2017-05-24 13:45:26 +02:00
Regis Houssin
a3d8da0a73 Fix: wrong SPECIMEN value 2017-05-24 11:30:11 +02:00
arnaud
8781a19e0e FIX pagination on resources 2017-05-23 12:22:53 +02:00
Laurent Destailleur
86cbf7e35f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-20 21:38:14 +02:00
Laurent Destailleur
2a9c6d9387 Complete ignore file 2017-05-20 21:11:31 +02:00
Laurent Destailleur
c18c401960 Merge pull request #6864 from atm-florian/5.0_fix6863 
FIX #6863
 2017-05-18 19:12:37 +02:00
Laurent Destailleur
59517a1fa0 Merge pull request #6855 from olsesacl/#6813 
FIX: #6813 No numbering model for supplier proposal module
 2017-05-18 17:58:10 +02:00
Laurent Destailleur
51fa6cfb19 Merge pull request #6854 from atm-florian/5.0 
fix event thirdparty agenda do not show good owner
 2017-05-18 17:57:24 +02:00
Laurent Destailleur
6fd0eef89d Merge pull request #6848 from atm-ph/fix_double_id_on_invoice 
Fix html id 'tablelines' exist twice
 2017-05-18 17:49:04 +02:00
florian HENRY
82cac745e3 FIX 6863 2017-05-18 14:18:59 +02:00
Laurent Destailleur
1f1d92d858 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-17 14:45:37 +02:00
Laurent Destailleur
d86b42b024 Missing title, bad css 2017-05-17 14:45:08 +02:00
Sergio Sanchis Climent
1a98886aa3 FIX: #6813 2017-05-17 00:42:29 +02:00
florian HENRY
3890c67210 fix event thirdparty agenda do not show good owner 2017-05-16 19:08:59 +02:00
arnaud
c9738aa7ea FIX doactions hook missing in invoice model page 2017-05-16 11:34:00 +02:00
phf
3da7b9543d Fix double quote 2017-05-15 15:10:15 +02:00
phf
f10b77f190 Fix html id 'tablelines' exist twice 2017-05-15 15:05:42 +02:00
Laurent Destailleur
1d0e9b0a59 Merge pull request #6828 from atm-alexis/FIX_situation_invoice_allpercent 
FIX situation invoice broken
 2017-05-13 20:14:48 +02:00
Laurent Destailleur
dec602a27b Merge pull request #6838 from atm-ph/fix_invoice_credit_note_standalone 
Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work
 2017-05-13 19:45:42 +02:00
Laurent Destailleur
8fc285c8b3 Fix bad date usage 2017-05-12 18:32:13 +02:00
Laurent Destailleur
b81de35703 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/contrat/class/contrat.class.php
 2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e Fix escaping class 2017-05-12 15:28:10 +02:00
Laurent Destailleur
5581e5da72 FIX New vat code not correctly implemented if "1 price per customer". 2017-05-12 13:12:17 +02:00
Laurent Destailleur
74af1223de Fix company id for US 2017-05-12 11:26:24 +02:00
phf
b092b6861a Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work 2017-05-11 12:48:47 +02:00
Laurent Destailleur
eb4cfc11cb Fix syntax error 2017-05-11 11:58:16 +02:00
Laurent Destailleur
0e4a209dd8 Fix normalize color settings 2017-05-11 11:50:21 +02:00
alexis Algoud
c2f76522eb fix form inside table 2017-05-11 09:04:14 +02:00
Laurent Destailleur
922fa088b4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/boxes/box_services_expired.php
 2017-05-10 23:47:33 +02:00
Laurent Destailleur
ef5fd503cd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-10 23:43:08 +02:00
Laurent Destailleur
b2e9d4cc21 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-10 23:42:49 +02:00
Laurent Destailleur
d7b142beb7 Merge pull request #6830 from jfefe/patch-12 
Fix #6504: CVE-2017-7886
 2017-05-10 23:41:19 +02:00
Laurent Destailleur
d19d733f95 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-10 23:28:24 +02:00
Laurent Destailleur
2ad4dbdae2 Merge pull request #6817 from Gecka-Apps/5.0-cronfix 
Fix recurring invoices generation when using the cron url
 2017-05-10 23:11:38 +02:00
Laurent Destailleur
61a4382bd8 Merge pull request #6814 from fmarcet/3.9 
FIX: Correction with author and validator user on orders
 2017-05-10 23:11:21 +02:00
Laurent Destailleur
7ab151dc0d Merge pull request #6809 from Gecka-Apps/5.0 
New-Caledonia uses the same bank accounts patterns than France
 2017-05-10 23:02:29 +02:00
Benoit
23af50ad2a Add fk_facture_fourn element to fetch lines objects 2017-05-10 22:45:41 +02:00
Benoit
ec4e416a6c Fix bug xhen insert new bankline 2017-05-10 22:44:08 +02:00
jfefe
d410a320d7 WIP #6504: CVE-2017-7886 
'defaultlang' attribute was not filtered before database request which cause an SQL injection.
 2017-05-10 20:32:54 +02:00
Laurent Destailleur
5a96ae54b9 FIX Link to files on bank account tab broken with multicompany 
FIX Link to preview on thirdparty broken with multicompany
 2017-05-10 19:08:07 +02:00
Laurent Destailleur
823e5b48e3 Code comment 2017-05-10 18:56:18 +02:00
Laurent Destailleur
52de60c49b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-10 18:17:58 +02:00
BENKE Charlie
d570df5089 inverted value between FRST & RECUR 2017-05-10 18:17:28 +02:00
Laurent Destailleur
002bebd837 Fix missing extraparams make sql syntax error 2017-05-10 18:15:01 +02:00
Laurent Destailleur
e48ba06730 Fix generation of sepa mandate with multicompany 2017-05-10 18:13:38 +02:00
alexis Algoud
bba8f972a1 FIX situation invoice broken 
due to the all percent application form inside addline form
 2017-05-10 16:10:14 +02:00
Laurent Destailleur
199b4dfeb5 Merge pull request #6816 from Gecka-Apps/5.0-fixes 
Add local taxes support to predefined invoices
 2017-05-10 14:52:23 +02:00
Laurent Destailleur
fe053c8603 Better escaping of error message. 2017-05-10 12:03:40 +02:00
Laurent Destailleur
3e0fcf5ec2 Fix label "total for this page" on last page. 2017-05-10 11:57:59 +02:00
Laurent Destailleur
383dfc0c96 FIX Pagination of invoices 2017-05-10 11:51:59 +02:00
Laurent Destailleur
c4722e3694 FIX XSS 2017-05-10 11:48:45 +02:00
Laurent Destailleur
2fc64b8e11 Fix XSS 2017-05-10 00:44:54 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Destailleur
667e3c2876 Add another security sanitizing option 2017-05-09 19:26:28 +02:00
Laurent Dinclaux
fb561bae1b Fix recurring invoices generation when using the cron url 2017-05-10 00:58:48 +11:00
Laurent Dinclaux
c88656edb4 Fix PHPDOC comments 2017-05-09 23:59:37 +11:00
Laurent Dinclaux
6cac627117 Add support for localtaxes to predefined invoices 2017-05-09 23:19:16 +11:00
Ferran Marcet
dbcb60433b FIX: Correction with author and validator user on orders 2017-05-09 13:31:20 +02:00
Laurent Dinclaux
2b7dcfa56d Add missing vat_src_code field to predefined invoices table 2017-05-09 21:07:32 +11:00
Laurent Destailleur
d7d212bbe1 Fix bad link to list 2017-05-08 12:31:37 +02:00
Laurent Destailleur
fd6518182b Fix can force tls version 2017-05-08 12:08:43 +02:00
Laurent Dinclaux
8c75fc0e52 New-Caledonia uses the same bank accounts patterns than France 2017-05-07 14:11:47 +11:00
Laurent Destailleur
2e5c32eb62 Merge pull request #6748 from atm-florian/5.0 
FIX : #6747
 2017-05-05 19:06:14 +02:00
Laurent Destailleur
57e540af53 For better compatibility with module for 6.0 2017-05-05 17:46:40 +02:00
Laurent Destailleur
15d20497c8 FIX #6795 #6796 2017-05-05 17:46:22 +02:00
Laurent Destailleur
4b42a5fd86 Merge pull request #6775 from marcosgdf/bug-6677 
FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty
 2017-05-05 17:05:06 +02:00
Laurent Destailleur
eb2124bfc8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-05 14:14:53 +02:00
Laurent Destailleur
2120b9af85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/theme/eldy/style.css.php
 2017-05-05 14:14:21 +02:00
Laurent Destailleur
e830ea6714 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-05 14:02:10 +02:00
Laurent Destailleur
8a37eeea74 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-05 14:02:02 +02:00
Laurent Destailleur
938d33941d Merge pull request #6780 from marcosgdf/php7-warnings 
Corrected PHP7 warnings for several pages
 2017-05-05 09:59:25 +02:00
Laurent Destailleur
9785e9b298 Update commonobject.class.php 2017-05-05 09:57:51 +02:00
Laurent Destailleur
4b8cda2070 Merge pull request #6791 from Gecka-Apps/5.0 
Fix major issues with local taxes
 2017-05-05 09:30:52 +02:00
Laurent Destailleur
db8c4a5ac4 Merge pull request #6760 from fappels/4.0_fix_download_delivery_doc 
Fix download delivery and donation document
 2017-05-05 09:21:19 +02:00
Laurent Destailleur
382fcb53fa Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-05 09:16:30 +02:00
Laurent Destailleur
f32d19fb73 FIX #6767 serious critical error no login possible 2017-05-05 09:15:14 +02:00
Laurent Dinclaux
a1e9246794 Resolved merge conflict [2] 2017-05-05 10:34:38 +11:00
Laurent Dinclaux
24a2fb57ea Resolved merge conflict 2017-05-05 10:22:46 +11:00
Laurent Destailleur
0c9f268f99 Merge pull request #6759 from ATM-Marc/FIX_supplier_order_rang 
FIX supplier order line creation with rang = 0
 2017-05-04 21:06:58 +02:00
Laurent Destailleur
089b882033 Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone 
FIX ajax autocomplete on clone
 2017-05-04 21:05:40 +02:00
Laurent Destailleur
2de335e2dc Action must be a verb 2017-05-04 18:49:58 +02:00
florian HENRY
b8d63ae6c0 Better fix 2017-05-04 14:04:30 +02:00
florian HENRY
9958fcaa6f Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0 2017-05-04 14:02:28 +02:00
Laurent Destailleur
944cd40ef4 Merge pull request #6749 from atm-florian/5.0_fix6614 
FIX #6614
 2017-05-04 13:59:24 +02:00
Laurent Destailleur
88917afa08 Merge pull request #6740 from Hugome/fix-length_accounta 
FIX: length_accounta return variable name
 2017-05-04 12:45:45 +02:00
Laurent Destailleur
8318ebc109 Fix missing field into addline of proposals 2017-05-04 10:45:20 +02:00
David
270c3db32e fix params order for tha addline() function 
please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
 2017-05-04 10:16:36 +02:00
Laurent Destailleur
81d696300c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-04 10:01:33 +02:00
Laurent Destailleur
8009370f04 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/contact/document.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/repair.sql
 2017-05-04 10:01:11 +02:00
Laurent Destailleur
1096177cce Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-04 09:57:57 +02:00
Laurent Destailleur
ee039c69a8 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-04 09:57:45 +02:00
Laurent Destailleur
6fb8876e5a Merge pull request #6730 from fappels/5.0_fix_en_US_admin_tag 
Fix typo in en_US admin tag
 2017-05-04 09:54:21 +02:00
Laurent Destailleur
4adfe6de70 Merge pull request #6725 from atm-gauthier/FIX_restrictedarea_document_contact 
FIX : forgotten parameter for right multicompany use
 2017-05-04 09:37:24 +02:00
Laurent Dinclaux
85bf4b742b Fix typo 2017-05-04 17:21:59 +11:00
Laurent Dinclaux
909b489d1f More fixes regarding localtaxes not being diplayed in generated PDF and vat_src_code not being propagating properly when generating posts from type to type. 2017-05-04 10:05:55 +11:00
Laurent Dinclaux
421843e693 Fix missing localtaxes lines in "commande" PDF 2017-05-03 23:35:57 +11:00
Laurent Dinclaux
b93df2d6b5 Fixes localtax propagation to new invoice 2017-05-03 23:13:21 +11:00
Laurent Dinclaux
f63f28c7fe Fix vat_src_code propagation between post types 2017-05-03 21:37:30 +11:00
Laurent Dinclaux
98b2e83bfb Fix localtaxes type not retrieved in proposals. Fixes Dolibarr/dolibarr/#6786 2017-05-03 21:36:56 +11:00
Laurent Destailleur
3917bdfc79 Fix vat_src_code propagation. 2017-05-02 22:37:43 +02:00
Marcos García de La Fuente
7ae405a254 Corrected PHP7 warnings for several PDF document models 2017-05-02 14:08:20 +02:00
Marcos García de La Fuente
6e7fddee7d Corrected PHP7 warnings for function pdf_einstein::write_file 2017-05-02 14:07:04 +02:00
Marcos García de La Fuente
166f2d262d Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume 2017-05-02 14:00:27 +02:00
florian HENRY
4dc409fc8b Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0 2017-05-02 10:13:51 +02:00
Marcos García de La Fuente
d658a833c9 FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty 
Close #6677
 2017-05-01 12:05:52 +02:00
Laurent Destailleur
fd72977505 Merge pull request #6690 from atm-gauthier/FIX_dateSelector 
FIX : global $dateSelector isn't the good one, then date selector on …
 2017-04-29 21:20:54 +02:00
Laurent Destailleur
50d65e3a9f Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
 2017-04-29 17:40:47 +02:00
Laurent Destailleur
cc8e66d079 FIX Journal code of bank must be visible of accountaing module on. 2017-04-29 15:30:40 +02:00
Laurent Destailleur
04c05efafe FIX Several bugs in accounting module. 2017-04-29 15:16:36 +02:00
Laurent Destailleur
c9bfb6e945 FIX Several bugs in accounting module. 2017-04-29 15:07:50 +02:00
Laurent Destailleur
04b1535b12 FIX Found duplicate line when it is not. 2017-04-29 14:59:40 +02:00
Laurent Destailleur
05fe0d7fcd Fix doxygen 2017-04-29 01:01:12 +02:00
fappels
18981ab0c9 Fix download donation document 2017-04-28 11:39:33 +02:00
Laurent Destailleur
9c2ce0202d Translation 2017-04-27 13:19:36 +02:00
Laurent Destailleur
1a98c4a3ff Fix error management in adding translation key 2017-04-27 12:48:13 +02:00
Laurent Destailleur
e97fae0c43 Fix typo 2017-04-27 12:10:08 +02:00
florian HENRY
23e2cbb7f9 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0 2017-04-27 09:02:06 +02:00
Laurent Destailleur
d390acc888 FIX A non admin user can not download files attached to user. 2017-04-27 02:03:59 +02:00
Laurent Destailleur
95788c9699 FIX A non admin user can not download files attached to user. 2017-04-27 00:53:13 +02:00
fappels
c69a1205c0 Fix download delivery document 2017-04-26 19:06:41 +02:00
Marc de Lima Lucio
56e749df9f FIX: supplier order line were always created with rang = 0 2017-04-26 16:12:27 +02:00
Quentin Vial-Gouteyron
4ab5674ffb FIX ajax autocomplete on clone 2017-04-25 15:10:46 +02:00
Laurent Destailleur
113d4d1665 FIX spaces not allowed into vat code 2017-04-25 10:29:13 +02:00
florian HENRY
8f97177dae FIX 6614 2017-04-24 14:44:44 +02:00
Laurent Destailleur
a2287fd183 Add example of sql request to fix llx_product_price 2017-04-24 13:46:41 +02:00
Laurent Destailleur
587f5a76e6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-04-24 12:59:51 +02:00
Laurent Destailleur
cd099bf3b1 Fix bad update of prices 2017-04-24 12:42:54 +02:00
florian HENRY
86338d1781 FIX : #6747 2017-04-24 09:03:25 +02:00
Laurent Destailleur
65fec95458 Fix debian package 2017-04-24 04:17:59 +02:00
Laurent Destailleur
af56c85057 Fix perms on file 2017-04-24 03:11:19 +02:00
Laurent Destailleur
ec59f08e41 FIX extrafield css for boolean type 2017-04-24 00:46:27 +02:00
Laurent Destailleur
0080821dc5 Fix no invoice if not a customer 2017-04-23 16:05:54 +02:00
hugome
54256773c5 FIX: length_accounta return variable name 2017-04-21 10:27:48 +02:00
Laurent Destailleur
cfc31e91e8 FIX overwrapping of weight/volume on rouget template 2017-04-18 18:13:43 +02:00
Laurent Destailleur
d89a89f8ea Fix error message 2017-04-18 17:03:34 +02:00
fappels
433b9e6fe1 Fix typo in en_US admin tag 2017-04-18 16:22:39 +02:00
Laurent Destailleur
9456f7091e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-04-18 01:36:33 +02:00
Laurent Destailleur
82f9555c6b Translation 2017-04-18 01:35:58 +02:00
Juanjo Menent
9bbfeed1bc Merge pull request #6722 from Christian-Seiler/3.9 
Fix #5911 Added missing Slashes
 2017-04-16 12:23:52 +02:00
rassakali
e1ea6e2b53 Update card.php 2017-04-16 12:04:36 +02:00
Christian Seiler
e23a44bcdf Added missing Slashes 
fixed line where two slashes were missing, that caused an error when creating barcodes.
 2017-04-16 11:09:18 +02:00
Juanjo Menent
3a8608db19 Merge pull request #6697 from atm-maxime/fix_supp_prop_subprice 
Fix Subprice was null in supplier proposal and line was not transfered to…
 2017-04-16 11:08:41 +02:00
Juanjo Menent
f000ca23c3 Merge pull request #6721 from simnandez/5.0 
FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View
 2017-04-16 10:45:55 +02:00
Juanjo Menent
f059ab0042 Merge pull request #6711 from atm-maxime/fix_stockmvt_origin 
Fix : no origin on stock mvmt when order set back to draft
 2017-04-16 10:31:45 +02:00
Juanjo Menent
2413c728a8 Merge pull request #6710 from atm-maxime/fix_bank_on_supp_pay 
Fix : display bank on supplier payment as on customer payment
 2017-04-16 10:29:25 +02:00
Juanjo Menent
2fb96c8817 Merge pull request #6708 from atm-florian/5.0_fixmissingaccountancy_mainmenu 
fix :missing mainmenu and leftmenu into accoutancy menu descriptor
 2017-04-16 10:22:03 +02:00
Juanjo Menent
00390bc8e4 Merge pull request #6705 from atm-florian/5.0 
fix setEventMessages error insteads of errors
 2017-04-16 10:19:19 +02:00
Juanjo Menent
006ad4cef8 FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View 2017-04-15 20:04:45 +02:00
Laurent Destailleur
ac884ec463 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/install/repair.php
 2017-04-15 16:28:08 +02:00
Laurent Destailleur
d2173c1fa4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-04-15 16:24:42 +02:00
Laurent Destailleur
7fe66581f1 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-04-15 16:24:30 +02:00
Laurent Destailleur
72ff353e9f Fix repair of product_stock 2017-04-15 16:22:15 +02:00
Laurent Destailleur
2e759d5156 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-04-15 16:19:02 +02:00
Laurent Destailleur
086fa4385f Fix clean of product_batch 2017-04-15 16:17:22 +02:00
Laurent Destailleur
d99de641e8 Fic on vat npr 2017-04-15 03:06:25 +02:00
Maxime Kohlhaas
402924f6d7 Fix : no origin on stock mvmt when order set back to draft 2017-04-14 15:12:32 +02:00
Maxime Kohlhaas
6c5b329dd1 Fix : display bank on supplier payment as on customer payment 2017-04-14 14:51:39 +02:00
florian HENRY
2496286374 fix :missing mainmenu and leftmenu into accoutancy menu descriptor 2017-04-14 12:27:53 +02:00
florian HENRY
8b0c123aca Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0 2017-04-14 09:01:40 +02:00
florian HENRY
196156a21e fix setEventMessages error insteads of errors 2017-04-13 16:35:29 +02:00
Laurent Destailleur
db23a5222b Fix translation 2017-04-13 15:12:19 +02:00
Laurent Destailleur
6f4ce8dc2f Merge remote-tracking branch 'origin/3.9' into 4.0 2017-04-12 14:22:47 +02:00
Laurent Destailleur
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +02:00
Maxime Kohlhaas
396ea54894 Subprice was null in supplier proposal and line was not transfered to supplier order 2017-04-12 11:09:49 +02:00
Laurent Destailleur
8e33c8090d FIX No filter on company when showing the link to elements. 2017-04-11 19:07:03 +02:00
gauthier
8a373b25ba FIX : global $dateSelector isn't the good one, then date selector on objectline_create tpl was hidden 2017-04-11 12:41:19 +02:00
Laurent Destailleur
2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php
 2017-04-11 11:43:54 +02:00
BENKE Charlie
2af3f010bf expedition->dir_output is used by livraison 
not livraison->dir_output who not exist
 2017-04-11 11:33:14 +02:00
gauthier
30d58f77db FIX : forgotten parameter for right multicompany use 2017-04-11 11:33:05 +02:00
Laurent Destailleur
17da4f64a7 Merge pull request #6683 from marcosgdf/bug-6679 
FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
 2017-04-11 11:21:14 +02:00
Laurent Destailleur
4d72165288 Merge pull request #6681 from marcosgdf/bug-6680 
FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
 2017-04-11 11:20:52 +02:00
Laurent Destailleur
a7ccb175e5 Merge pull request #6676 from marcosgdf/bug-6675 
FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
 2017-04-11 11:17:45 +02:00
Laurent Destailleur
5ae1b5457b Merge pull request #6674 from marcosgdf/bug-6673 
FIX #6673 Missing "nature" table header in thirdparty list
 2017-04-11 11:17:21 +02:00
Laurent Destailleur
fc735eaa4f Merge pull request #6672 from marcosgdf/bug-6671 
FIX #6671 Cannot remove thirdparty type with "#" in its name
 2017-04-11 11:16:58 +02:00
Laurent Destailleur
eb4236011b Merge pull request #6670 from marcosgdf/bug-6669 
FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry
 2017-04-11 11:15:16 +02:00
Laurent Destailleur
50dbe39cda Merge pull request #6668 from marcosgdf/bug-6613 
FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key
 2017-04-11 11:14:47 +02:00
Laurent Destailleur
cd90dcb1e1 Merge pull request #6667 from marcosgdf/bug-6623 
FIX #6623 User card shows "Return to list" link even if the user has no rights to list users
 2017-04-11 11:14:25 +02:00
Laurent Destailleur
d4de81ed6d Merge pull request #6659 from altatof/fix_incoterm 
FIX: dont get empty "Incoterms : - " string if no incoterm
 2017-04-11 11:08:17 +02:00
Laurent Destailleur
abf87a6946 Merge branch '4.0' into fix_reffourn 2017-04-11 11:00:35 +02:00
Laurent Destailleur
f5f062936e Merge pull request #6654 from atm-florian/5.0 
fix: missing attribute update
 2017-04-11 10:59:31 +02:00
Marcos García de La Fuente
996b5e9f87 Corrected translation errors and little bug showing a non-available button to a restricted user 2017-04-09 18:17:46 +02:00
Marcos García de La Fuente
12df7b6ab9 FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode 
Close #6679
 2017-04-09 18:09:08 +02:00
Marcos García de La Fuente
59fa5c2fe6 FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it 
Close #6680
 2017-04-09 17:38:59 +02:00
Marcos García de La Fuente
2057613ad9 FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list 
Close #6675
 2017-04-09 15:18:02 +02:00
Marcos García de La Fuente
2d83efc7e3 FIX #6673 Missing "nature" table header in thirdparty list 
Close #6673
 2017-04-09 15:03:02 +02:00
Marcos García de La Fuente
da0af36086 FIX #6671 Cannot remove thirdparty type with "#" in its name 
Close #6671
 2017-04-09 14:51:15 +02:00
Marcos García de La Fuente
411d276ed2 FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry 
Close #6669
 2017-04-09 14:29:40 +02:00
Marcos García de La Fuente
a8da077613 FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key 
Close #6613
 2017-04-09 14:13:04 +02:00
Marcos García de La Fuente
74f0ae5bbb FIX #6623 User card shows "Return to list" link even if the user has no rights to list users 
Close #6623
 2017-04-09 14:09:33 +02:00
Laurent Destailleur
7f7ba6279a Fix translation 2017-04-08 14:02:07 +02:00
Laurent Destailleur
31f580ad93 FIX Enter a direct bank transaction 2017-04-08 01:25:52 +02:00
altatof
d892a89f45 FIX: dont get empty "Incoterms : - " string if no incoterm 2017-04-07 14:15:51 +02:00
altatof
919633b2be escape supplier ref 2017-04-07 12:10:01 +02:00
altatof
a6ec22d7fe FIX: dont lose supplier ref if no supplier price in database 2017-04-07 12:06:15 +02:00
florian HENRY
7668702806 fix: missing attribute update 2017-04-07 08:56:10 +02:00
Laurent Destailleur
8363bee234 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:56:48 +02:00
Laurent Destailleur
fe4f71296f FIX #6636 Complete fix 2017-04-06 21:55:23 +02:00
arnaud
6b2d8a3c34 FIX limit+1 dosn't show Total line 2017-04-06 11:14:15 +02:00
Laurent Destailleur
18fc5bec9b Better log 2017-04-06 10:56:37 +02:00
Laurent Destailleur
dc14268ac6 FIX complete hourly rate when not defined into table of time spent 2017-04-05 15:24:41 +02:00
Laurent Destailleur
e2b96abd0b Fix translation 2017-04-05 13:34:52 +02:00
Laurent Destailleur
a6c60e4a9a FIX shared bank account with multicompany not visible in invoice setup 2017-04-05 11:14:02 +02:00
Laurent Destailleur
7c868888a5 FIX Add option MAIN_MAIL_USE_MULTI_PART to include text content into 
HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to
restore the inline images feature.
 2017-04-05 01:02:03 +02:00
Laurent Destailleur
4f292d1247 Prepare 5.0.2 2017-04-04 13:01:53 +02:00
BENKE Charlie
5b5380659e ERROR Categories Bank vs categories transactions 
PB since 4.0, present in 5.0 and develop version
There is a confusion between the categorization function of bank accounts and the categorization function of the records. The categorization of the entries has been removed or it is not replaced by the categorization of the bank accounts.
I propose for the moment to restore the old category of writings but to envisage the creation of a new type of category "bank records" (or if it is not necessary with the new account) to leave so
 2017-04-03 15:58:48 +02:00
Laurent Destailleur
13587fa13e Fix key were not translated 2017-04-03 10:51:35 +02:00
Laurent Destailleur
6a69f9349b Fix too much logs in list 2017-04-03 10:43:04 +02:00
Laurent Destailleur
a5a0995313 More comments 2017-04-03 10:11:29 +02:00
Laurent Destailleur
00d485b2c5 Start 4.0.6 2017-04-02 22:09:06 +02:00