Commit Graph

68218 Commits

Author SHA1 Message Date
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
Laurent Destailleur
d4e26fcc55 FIX missing include (dol_convert_file not found) 2019-09-10 15:29:33 +02:00
ptibogxiv
48419da769
FIX new invoice with generic thirdparty in takepos
by default, new invoice should always create with default thirdparty and avoid errors : creating new invoice with last customer and forget to change it...
2019-09-10 14:58:55 +02:00
Laurent Destailleur
ba33369af6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 00:10:08 +02:00
Laurent Destailleur
08f8ad6f30 FIX javascript error when using dol_use_jmobile=1 2019-09-10 00:09:18 +02:00
Laurent Destailleur
d061e61d25 Fix add_to_target has only 1 param. 2019-09-09 13:45:25 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +02:00
Laurent Destailleur
6b355997da Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-09 13:05:52 +02:00
Laurent Destailleur
f6e04ba314 Fix sql error 2019-09-09 13:05:41 +02:00
Laurent Destailleur
39924cd413
Merge pull request #11842 from aspangaro/10.0_p8
FIX #11401 Adherent unknown language key
2019-09-09 12:59:16 +02:00
david
ac539d20b9 FIX #10460 compatibility with MariaDB 10.4 2019-09-09 11:10:08 +02:00
Alexandre SPANGARO
3a8d8ee902 FIX #11401 Adherent unknown language key 2019-09-08 03:56:01 +02:00
Laurent Destailleur
c9a62b09c1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-07 09:50:08 +02:00
Laurent Destailleur
bdbae9b3bc Fix phpcs 2019-09-06 23:51:33 +02:00
Laurent Destailleur
4e5b4964dc
Merge pull request #11827 from aspangaro/10.0_boxes_nowrap
FIX Nowrap missing on amount in boxes
2019-09-06 23:37:23 +02:00
Laurent Destailleur
72dcb98c5c
Merge pull request #11819 from aspangaro/10.0_theme
FIX Missing ticket icon on md theme
2019-09-06 23:35:20 +02:00
Laurent Destailleur
b4aa030dd3
Merge pull request #11824 from ptibogxiv/patch-253
FIX: dol_thirdparty_id for stripe PI
2019-09-06 23:29:34 +02:00
Laurent Destailleur
a168c989f8
Update stripe.class.php 2019-09-06 23:29:27 +02:00
Laurent Destailleur
b2fe04e2f7
Merge pull request #11832 from hregis/10.0_mc
FIX avoid Warning: A non-numeric value encountered
2019-09-06 23:25:56 +02:00
Laurent Destailleur
f12a012932
Update card.php 2019-09-06 23:25:40 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
348ab4765c Fix sql injection 2019-09-06 15:20:04 +02:00
Laurent Destailleur
cad9a59d2a Add option to be able to find behaviour before the fix of list of
invoice in direct debit order.
2019-09-06 14:45:55 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
bc7bf3b4b5 FIX bad consistency in list of invoice for direct debit order. 2019-09-06 13:44:02 +02:00
Laurent Destailleur
d1a5be20ea Fix wrong warning 2019-09-06 13:02:52 +02:00
Laurent Destailleur
165f64463b Fix look and feel v10 2019-09-06 12:46:54 +02:00
Laurent Destailleur
0ed7ab07fd Fix date selection for supplier proposal not yet supported 2019-09-06 12:41:34 +02:00
Regis Houssin
369961b376 FIX avoid Warning: A non-numeric value encountered 2019-09-06 11:55:41 +02:00
Laurent Destailleur
2e8c915b88 Fix more consistent setup 2019-09-06 02:39:08 +02:00
Laurent Destailleur
626e3fd90e Fix look and feel v10 2019-09-06 02:34:24 +02:00
Laurent Destailleur
5b1d94a668 Fix translation 2019-09-06 02:27:49 +02:00
Laurent Destailleur
16484e1fa3 Fix balance of td 2019-09-06 02:22:44 +02:00
Laurent Destailleur
08c16ea2e1 Fix bad dir created 2019-09-06 02:03:26 +02:00
Laurent Destailleur
80daf29d79 Fix conflict between new module reception and old process
Fix inventory record does not need status at creation

Conflicts:
	htdocs/fourn/commande/card.php
2019-09-06 01:55:22 +02:00
Laurent Destailleur
9a823f1c64 Fix bad perm 2019-09-05 22:51:26 +02:00
Laurent Destailleur
e91b6f7843 FIX Can't delete a draft leave even if it should 2019-09-05 22:48:33 +02:00
Laurent Destailleur
04174316c8 Fix css for expanded dir in ecm 2019-09-05 17:57:21 +02:00
Laurent Destailleur
c816a41006 Fix missing exit 2019-09-05 15:00:46 +02:00
Laurent Destailleur
1828872bd1 Removed deprecated properties 2019-09-05 13:39:33 +02:00
Alexandre SPANGARO
4fe141c9f1 FIX Nowrap missing on amount in boxes 2019-09-05 12:05:50 +02:00
ptibogxiv
9601f846ce
Update stripe.class.php 2019-09-05 11:11:48 +02:00
Laurent Destailleur
7d5877b8b1 Doxygen 2019-09-04 13:50:10 +02:00
Laurent Destailleur
f2f2621da8 FIX Can't save setup of mailman module 2019-09-04 11:33:07 +02:00
Laurent Destailleur
a3d417a40f Fix can't change approver of a leave request in some cases 2019-09-04 11:21:41 +02:00
Laurent Destailleur
cabbdfc650 Fix injection in User-Agent 2019-09-04 10:30:05 +02:00
Alexandre SPANGARO
a7ecf9f18b FIX Missing ticket icon on md theme 2019-09-04 09:32:37 +02:00
Laurent Destailleur
0a17e6bfd5 FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2019-09-03 22:39:24 +02:00
Laurent Destailleur
ffc49705d3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-03 17:42:04 +02:00
Laurent Destailleur
1a8f271bf4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-03 17:41:56 +02:00
Laurent Destailleur
f1a16a68dc
Merge pull request #11787 from aspangaro/9.0_balance
FIX Sens of the balance (Debit - Credit in accountancy not contrary)
2019-09-03 17:41:35 +02:00
Laurent Destailleur
84800257e8
Merge pull request #11799 from jtraulle/fix-11683-10.0
Fix #11682 Missing origin object ref and thirdparty ref in future ban…
2019-09-03 17:32:47 +02:00
Laurent Destailleur
7c07e64adc
Update treso.php 2019-09-03 17:32:18 +02:00
Laurent Destailleur
65fee73b22
Update treso.php 2019-09-03 17:31:20 +02:00
Laurent Destailleur
3c80bc139e
Merge pull request #11794 from atm-florian/10_fixMissingSubstitutionCheckbox
FIX bad substitution for extrafields type checkbox
2019-09-03 15:18:17 +02:00
Laurent Destailleur
9c6cbfeb7f
Merge pull request #11774 from ptibogxiv/patch-250
FIX logout redirect to takepos.php
2019-09-03 15:10:28 +02:00
Laurent Destailleur
c32100c714
Merge pull request #11768 from atm-florian/10_fixeventlist
fix event list with description
2019-09-03 15:02:22 +02:00
Laurent Destailleur
d3a6aba2a3
Merge pull request #11816 from ptibogxiv/patch-252
Fix lang in invoice / takepos
2019-09-03 15:00:11 +02:00
Laurent Destailleur
52a543953c Fix position of tests 2019-09-03 14:58:54 +02:00
Laurent Destailleur
17ccb8fa10 Fix missing tooltip 2019-09-03 14:56:13 +02:00
Laurent Destailleur
1ef0bfac27 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-03 14:52:21 +02:00
Laurent Destailleur
a95e02e3f6 FIX #11789 FIX #11790 2019-09-03 14:52:03 +02:00
ptibogxiv
80624c67f4
Fix lang in invoice / takepos 2019-09-03 14:48:46 +02:00
Laurent Destailleur
d4fb1d134d
Merge pull request #11801 from jtraulle/fix-11682-10.0
Fix #11683 Correct links to create a new product or service from search results
2019-09-03 13:02:17 +02:00
Laurent Destailleur
19f9d036df
Merge pull request #11805 from simnandez/10.0
FIX #11804 list of tickets from a customer card display ALL tickets
2019-09-03 13:01:49 +02:00
Laurent Destailleur
931380c740
Merge pull request #11803 from atm-florian/10_fixavoidDividedBy0
fix avoid error message Divided By 0
2019-09-03 12:58:56 +02:00
Laurent Destailleur
f7ce723686
Merge pull request #11800 from jtraulle/fix-11427-10.0
FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
2019-09-03 12:56:00 +02:00
Laurent Destailleur
8bffbb2202
Merge pull request #11806 from ptibogxiv/patch-251
FIX takepos layout clear or focus search
2019-09-03 12:52:49 +02:00
ptibogxiv
6996e83390
Update takepos.php 2019-09-03 11:40:19 +02:00
ptibogxiv
0c5859d2bf
Update takepos.php 2019-09-03 11:37:25 +02:00
Laurent Destailleur
a126b1e538 FIX Add char $ and ; in sanitizing of filenames. 2019-09-02 22:25:44 +02:00
ptibogxiv
f9df175efc
FIX takepos layout clear or focus search
fix focus for compatibility with barcode scanner
2019-09-02 21:26:44 +02:00
Juanjo Menent
b45d3ea1a0 FIX #11804 2019-09-02 17:38:59 +02:00
Laurent Destailleur
8cff008156 Fix error reporting 2019-09-02 16:03:20 +02:00
Laurent Destailleur
59fe34752c Fix error reporting of LDAP errors 2019-09-02 16:02:48 +02:00
florian HENRY
c8bfc7441e fix avoid error message Divided By 0 2019-09-02 09:44:59 +02:00
florian HENRY
7dc3684662 fix bad substitution for extrafields type checkbox 2019-09-02 09:41:30 +02:00
florian HENRY
a963057859 Merge branch '10.0' of github.com:Dolibarr/dolibarr into 10_fixeventlist 2019-09-02 09:36:16 +02:00
Laurent Destailleur
a040d7eccc Fix bad link 2019-09-02 04:39:45 +02:00
Laurent Destailleur
42defc31bd FIX Look and feel v10 2019-09-02 04:39:41 +02:00
Laurent Destailleur
29d2e7edd0 missing reposition 2019-09-02 04:39:36 +02:00
Laurent Destailleur
c589fdcb83 Code comment 2019-09-02 04:39:20 +02:00
Laurent Destailleur
92799902b6 Fix var null 2019-09-02 03:44:34 +02:00
Laurent Destailleur
a4600c9efa Fix missing class reposition 2019-09-01 23:24:29 +02:00
Laurent Destailleur
5f3c7cb8dc Fix compatibility with hooks tha add , at begin of sql string 2019-09-01 21:46:46 +02:00
Laurent Destailleur
46affe9090 Fix css on smartphone 2019-09-01 21:14:56 +02:00
Laurent Destailleur
df6472254d Fix var not defined 2019-08-31 13:31:08 +02:00
Laurent Destailleur
c81c8543da Fix bad param 2019-08-31 13:26:55 +02:00
Laurent Destailleur
26154d3190 Fix must use the new common code 2019-08-31 12:54:56 +02:00
Laurent Destailleur
524b0cd85f FIX Mode smartphone was not triggered when there is too loo menu
entries.
2019-08-31 12:34:18 +02:00
Laurent Destailleur
7e19a64ff2 Sync transifex 2019-08-31 02:17:50 +02:00
Laurent Destailleur
58643e5e96 Fix regression 2019-08-31 00:44:10 +02:00
Jean Traullé
c84f1baf17
Fix #11683 Correct links to create a new product or service from search results 2019-08-31 00:18:53 +02:00
Jean Traullé
237c29d428
FIX #11427 require product class
Fixes POST /supplierinvoices REST API endpoint
2019-08-31 00:07:14 +02:00
Jean Traullé
8f1fba6775
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries 2019-08-30 23:56:52 +02:00
Laurent Destailleur
4a76dfa6ff Fix link to setup 2019-08-30 18:23:43 +02:00
Laurent Destailleur
5e7fc06ab2 Fix js injection 2019-08-30 16:25:25 +02:00
Laurent Destailleur
7942c5edf7 Fix js injection 2019-08-30 16:22:24 +02:00
Laurent Destailleur
55f0051db2 Html tag <marquee are forbidden 2019-08-30 15:17:13 +02:00
Laurent Destailleur
e54dbecf6d Sync transifex 2019-08-30 04:17:40 +02:00
Laurent Destailleur
906506b74c Fix alignement of legend 2019-08-30 04:14:45 +02:00
Alexandre SPANGARO
14b9460de0 FIX Sens of the balance (Debit - Credit in accountancy not contrary) 2019-08-29 16:27:25 +02:00
Laurent Destailleur
58fdfc25d2 FIX Css was saved on wrong website. 2019-08-29 13:43:43 +02:00
Laurent Destailleur
6420a32395 Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:54:31 +02:00
Laurent Destailleur
641a50a58b Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:52:29 +02:00
Laurent Destailleur
9f775ca480 Fix look and feel v10 2019-08-29 01:37:19 +02:00
ptibogxiv
4cf2c835c6
Update logout.php 2019-08-28 19:48:45 +02:00
ptibogxiv
1c28086d4b
FIX logout redirect to takepos.php
usefull for terminal locked with POS and use standard dolibarr login with addon as U2F
2019-08-28 13:22:54 +02:00
Laurent Destailleur
85016a7a45 Fix bad error when module not enabled 2019-08-28 13:12:43 +02:00
Laurent Destailleur
f21cb54ae6 FIX management of extrafields in modulebuilder 2019-08-28 13:12:38 +02:00
Laurent Destailleur
c0262f1e19 Fix type integer 2019-08-28 12:24:56 +02:00
Laurent Destailleur
7236df37d4 FIX error management when adding a property with type real 2019-08-28 12:16:59 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +02:00
Laurent Destailleur
e09223ed4d FIX #11702 2019-08-27 17:52:46 +02:00
Laurent Destailleur
851d76460a FIX #11720 2019-08-27 17:42:25 +02:00
florian HENRY
243fca9a1a fix event list with description 2019-08-27 16:12:07 +02:00
Laurent Destailleur
1ac9affd82 Trans 2019-08-27 15:54:44 +02:00
Laurent Destailleur
d4d3e28437 It is diffcult to understand how stock decrease is done so we show the
ref of stock.
2019-08-27 15:53:03 +02:00
Laurent Destailleur
a2b1d96d42 Fix protection in cleaning invoice with transaction. Delete also
extrafield lines.
2019-08-27 15:42:35 +02:00
Laurent Destailleur
7165389f6c Add log
Add protection to avoid change on a non draft invoice.
2019-08-27 15:39:35 +02:00
Laurent Destailleur
478b1fea25 FIX #11711 2019-08-27 15:06:50 +02:00
Laurent Destailleur
55505604c1
Merge pull request #11397 from atm-josselin/FIX_product_document_and_special_characters
FIX : filepath of generated documents doesn't handle products with sp…
2019-08-27 14:12:48 +02:00
Laurent Destailleur
22719b90b6 Fix remove warning 2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
Laurent Destailleur
c2c9e1d042 Fix warning 2019-08-27 12:15:29 +02:00
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +02:00
Laurent Destailleur
9fb06b1e7e Fix phpcs 2019-08-27 11:42:18 +02:00
Laurent Destailleur
63dcef710e Fix phpcs 2019-08-27 03:41:02 +02:00
Laurent Destailleur
4fb36ce84d Fix phpcs 2019-08-27 03:22:58 +02:00
Laurent Destailleur
047298cded
Merge pull request #11511 from atm-florianm/9.0_FIX_dispatched-products-array-bug
9.0 fix dispatched products array bug
2019-08-26 23:58:40 +02:00
Laurent Destailleur
965bd171eb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 23:56:51 +02:00
Laurent Destailleur
513f224349 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 23:56:43 +02:00
Laurent Destailleur
c7f06fe50e Fix phpcs 2019-08-26 23:56:17 +02:00
Laurent Destailleur
783c69c618
Merge pull request #11756 from ptibogxiv/patch-245
Fix lang for "nature" in contact
2019-08-26 22:51:23 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
2019-08-26 22:44:49 +02:00
Laurent Destailleur
b6db04a727 Fix add missing filter on entity on stock listing for product combo 2019-08-26 22:42:04 +02:00
Laurent Destailleur
952e395943 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-26 22:34:51 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
ptibogxiv
ad38478fc6
Fix lang for "nature" in contact 2019-08-26 20:01:05 +02:00
Laurent Destailleur
f07d99ed9a
Merge pull request #11730 from atm-ph/fix_9.0_missing_hooks
Fix wrong placement to print title and missing hook to print value
2019-08-26 17:14:50 +02:00
Laurent Destailleur
7c5fc9f3f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:43:24 +02:00
Laurent Destailleur
9d2942bb88 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-26 16:41:14 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:41:06 +02:00
Laurent Destailleur
60b8982a74 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-08-26 16:39:39 +02:00
Laurent Destailleur
fc1381c056
Merge pull request #11739 from ptibogxiv/patch-239
Fix display context for takepos in invoice/list.php
2019-08-26 16:38:27 +02:00
Laurent Destailleur
11dbe80a7b
Merge pull request #11740 from ptibogxiv/patch-240
Fix context display with takepos societe/list.php
2019-08-26 16:37:57 +02:00
Laurent Destailleur
2b8c57b714
Merge pull request #11724 from ptibogxiv/patch-228
Fix stripelive_oauthcallback.php
2019-08-26 16:34:40 +02:00
Laurent Destailleur
039a613ea1
Merge pull request #11728 from ptibogxiv/patch-231
Fix stripetest_oauthcallback.php
2019-08-26 16:29:00 +02:00
Laurent Destailleur
8a6c27379f
Merge pull request #11737 from ptibogxiv/patch-237
Fix lang in takepos
2019-08-26 16:27:50 +02:00
Laurent Destailleur
6771a2e1f9
Update invoice.php 2019-08-26 16:27:00 +02:00
Laurent Destailleur
b21818a510
Merge pull request #11753 from aspangaro/10.0_p7
FIX Missing div for buttons in tax, loan, various payment modules
2019-08-26 16:24:10 +02:00
Laurent Destailleur
d08ed9fbcf FIX column jabberid missing 2019-08-26 16:19:39 +02:00
Laurent Destailleur
9e7796d495 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:09:57 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
Laurent Destailleur
56ee89c38d
Merge pull request #11742 from ptibogxiv/patch-242
Fix lang in societe/list.php
2019-08-26 16:02:31 +02:00
Laurent Destailleur
7ebd79a45f
Update list.php 2019-08-26 16:02:24 +02:00
Alexandre SPANGARO
76691925a4 FIX Missing div for buttons in tax, loan, various payment modules 2019-08-26 15:35:20 +02:00
Alexandre SPANGARO
b00020c4ea FIX #11746 Unable to modify amount of insurance of a loan 2019-08-26 12:10:19 +02:00
Laurent Destailleur
60c3cefc53 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:44:39 +02:00
ptibogxiv
dbcead47e1
Update list.php 2019-08-24 16:05:21 +02:00
ptibogxiv
7b5c9818f7
Fix context display with takepos societe/list.php 2019-08-24 15:58:33 +02:00
ptibogxiv
7112fcee9a
Update list.php 2019-08-24 15:54:14 +02:00
ptibogxiv
2be125e647
Fix display context for takepos in invoice list
fix for thirdparty name and create button
2019-08-24 15:47:17 +02:00
ptibogxiv
c4b18890d9
Update invoice.php 2019-08-24 15:12:56 +02:00
ptibogxiv
bb763ecb59
Fix lang in takepos 2019-08-24 14:02:25 +02:00
ptibogxiv
73a6b45e23
Fix load langs in takepos 2019-08-24 13:26:01 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Laurent Destailleur
b7e7ca46b5 Fix responsive 2019-08-23 14:01:13 +02:00
atm-ph
f14f1c9190 Fix wrong placement to print title and missing hook to print value 2019-08-23 09:15:15 +02:00
ptibogxiv
839ba76ae4
Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00
Regis Houssin
2d59f6bb3d FIX avoid sql error if fk_project is empty during update 2019-08-23 07:59:36 +02:00
ptibogxiv
06fdd5ddbc
Update stripelive_oauthcallback.php 2019-08-22 22:50:41 +02:00
ptibogxiv
0be59646a8
Update stripelive_oauthcallback.php 2019-08-22 22:00:53 +02:00
Florian Mortgat
fa29415e6a Moved repair payload from a specific script to install/repair.php 2019-08-22 14:06:18 +02:00
Laurent Destailleur
2080f92ec2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-22 12:39:13 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55 FIX name and position of hook FIX #11710 2019-08-22 12:30:14 +02:00
Laurent Destailleur
f7391879a2
Merge pull request #11713 from ptibogxiv/patch-225
Fix context in takepos
2019-08-22 11:50:46 +02:00
Laurent Destailleur
cdda08c0d3 FIX #11685 2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card" 2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354
Merge pull request #11685 from ptibogxiv/patch-224
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-22 11:25:08 +02:00
Laurent Destailleur
a19228ccc0 Fix compatibility with twofactor
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
2019-08-22 10:53:42 +02:00
Laurent Destailleur
b06dab6930 Fix add option to restore backward compatibility 2019-08-22 00:44:28 +02:00
Laurent Destailleur
9bd229bc7a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/modules.php
2019-08-21 16:04:34 +02:00
Laurent Destailleur
ed7480ddbb Fix phpcs 2019-08-21 16:03:49 +02:00
Laurent Destailleur
1b21905c55 Fix test on uploaded modules
Conflicts:
	htdocs/admin/modules.php
2019-08-21 14:53:58 +02:00
Laurent Destailleur
e75d7e4686 Fix test on uploaded modules 2019-08-21 14:51:48 +02:00
ptibogxiv
5613532b80
Fix context in takepos
need downgrade in v10 of this PR fo fix hiden context https://github.com/Dolibarr/dolibarr/pull/11629
2019-08-21 13:30:31 +02:00
Laurent Destailleur
f98d3c5c48 FIX Do not show tooltip if tooltip is empty 2019-08-20 14:08:30 +02:00
Laurent Destailleur
def0311f9d Fix translation 2019-08-19 17:26:13 +02:00
Laurent Destailleur
15a765a79a Fix responsive 2019-08-19 13:28:24 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3 FIX too many record in sql request. Whena criteria is a filter, we must
use an inner join.
2019-08-18 23:59:24 +02:00
Laurent Destailleur
71be9f5b3f Fix test on terminal for 'cashdesk' module 2019-08-18 21:01:17 +02:00
Laurent Destailleur
cef88283b3 Fix missing error message 2019-08-18 20:52:18 +02:00
Laurent Destailleur
783e01588c FIX It was possible to create cashfence without entering data. 2019-08-18 20:47:40 +02:00
andreubisquerra
bbc1dfb0f7 Cashcontrol TakePOS fixes 2019-08-18 20:40:31 +02:00
Laurent Destailleur
477384105f FIX missing test on permission on button to delete ledger record 2019-08-18 19:25:36 +02:00
Laurent Destailleur
d8d927547f Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU 2019-08-18 19:09:53 +02:00
Laurent Destailleur
ad5f2dbe9d Fix update on id 2019-08-18 18:56:58 +02:00
Laurent Destailleur
8cf0671804 FIX Missing transaction 2019-08-18 18:56:21 +02:00
Laurent Destailleur
2ddf7c1d1f Fix responsive 2019-08-18 17:03:20 +02:00
Laurent Destailleur
b1be6bf4f2 FIX #11422 Can't edit his own events with standard rights 2019-08-18 01:24:54 +02:00
Laurent Destailleur
18eb2a83fe FIX #11671 CVE-2019-15062 2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100 FIX #11671 CVE-2019-15062 2019-08-17 22:16:27 +02:00
Laurent Destailleur
898996da4a FIX vulenrability in uploading file found by 美创科技安全实验室 2019-08-16 21:45:13 +02:00
Laurent Destailleur
d51a651ab4 Fix phpcs 2019-08-16 17:35:12 +02:00
Laurent Destailleur
ee50c41e74 Fix phpcs 2019-08-16 17:34:23 +02:00
Laurent Destailleur
1e93d3d790 Prepare v10.0.2 2019-08-16 17:03:11 +02:00
Laurent Destailleur
b63c4b74b8 Code comment 2019-08-16 16:56:28 +02:00
Laurent Destailleur
9692ea5faf FIX #11671 CVE-2019-15062 2019-08-16 16:41:53 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
Fix total on list and amount opened on thirdparty card (for supplier)
2019-08-15 21:14:03 +02:00
Laurent Destailleur
12e6dabc43 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-15 20:41:56 +02:00
Laurent Destailleur
64e52789d6 FIX #11591 FIX #11592 2019-08-15 20:39:47 +02:00
Laurent Destailleur
a8afb4549a
Merge pull request #11634 from fmarcet/9.0
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-15 20:22:27 +02:00
Laurent Destailleur
38fc05866d
Merge pull request #11619 from simnandez/10.0
Fix: allow access from any other class that inherits Form class.
2019-08-15 19:48:41 +02:00
Laurent Destailleur
ac8bf7b066
Update propal.class.php 2019-08-15 19:48:29 +02:00
Laurent Destailleur
c131af5ae1 FIX #11672 2019-08-15 19:16:52 +02:00
Laurent Destailleur
9cb5ba35dd
Merge pull request #11681 from hregis/10.0_mc
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
2019-08-15 19:08:42 +02:00
Laurent Destailleur
4534826583
Merge pull request #11633 from fmarcet/10.0
FIX: Make protected all pfd models functions
2019-08-15 19:04:32 +02:00
Laurent Destailleur
12bebdefbb Fix can replace PclZip with ZipArchive 2019-08-14 04:07:25 +02:00
Laurent Destailleur
fbf6cbe091 FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 04:07:02 +02:00
Laurent Destailleur
4a20c99656 FIX Content send before header warning 2019-08-14 04:06:50 +02:00
Laurent Destailleur
6de2118f11 FIX Bad error management in zip compress and web site export
Conflicts:
	htdocs/website/index.php
2019-08-14 04:06:29 +02:00
Laurent Destailleur
e1ab5089d7 FIX Missing some replacements in website module
Conflicts:
	htdocs/website/index.php
2019-08-14 04:02:57 +02:00
ptibogxiv
93d64bb84e
Update functions.lib.php 2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64
FIX for MAIN_MAXTABS_IN_CARD = $i card 2019-08-13 17:47:30 +02:00
Laurent Destailleur
b443b1b372 FIX permission check on API intervention 2019-08-13 14:21:43 +02:00
Regis Houssin
34579dd4db FIX phpcs 2019-08-13 07:46:03 +02:00
Regis Houssin
056f51bfc5 FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme 2019-08-13 07:14:42 +02:00
Laurent Destailleur
99473097a9 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks

Conflicts:
	htdocs/website/index.php
2019-08-13 06:43:28 +02:00
Laurent Destailleur
52d34edb03 FIX USEDOLIBARREDITOR not always set 2019-08-13 05:23:10 +02:00
Laurent Destailleur
8e0a023270 FIX Disabling a website does not put it offline 2019-08-13 05:05:19 +02:00
Laurent Destailleur
77c96a49e1 Update website template 2019-08-13 04:53:47 +02:00
Laurent Destailleur
f4e58aab22 FIX Enable web site 2019-08-13 04:49:49 +02:00
Laurent Destailleur
ac57e527ce Fix translation 2019-08-12 19:01:23 +02:00
Laurent Destailleur
b3e9cf3be7 Sync transifex 2019-08-12 17:37:23 +02:00
Juanjo Menent
7dab396d08 Fix: error creating a budget from an intervention 2019-08-12 17:29:25 +02:00
Laurent Destailleur
5346135a0c Fix removed duplicate load 2019-08-12 17:12:57 +02:00
Laurent Destailleur
446f0590dc FIX VAT number for Monaco (it uses FR) 2019-08-12 13:45:04 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
Laurent Destailleur
00660d4885 Fix responsive 2019-08-12 02:52:36 +02:00
Laurent Destailleur
49e2f447a8 Fix responsive 2019-08-12 02:41:27 +02:00
Laurent Destailleur
5ca988b3d2 Fix position of requests 2019-08-12 02:36:15 +02:00
Laurent Destailleur
e21d6289ea FIX Can't add a new chart of account 2019-08-10 02:09:59 +02:00
Laurent Destailleur
9c92acadaa Fix lang 2019-08-10 01:51:50 +02:00
Laurent Destailleur
d0f1a23f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:44:08 +02:00
Laurent Destailleur
96fb4c52ea Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-10 01:43:52 +02:00
Laurent Destailleur
babeb52986
Merge pull request #11624 from ptibogxiv/patch-208
Fix update stripe api for more compliance to API
2019-08-10 01:39:31 +02:00
Laurent Destailleur
5dc2fd8ca0
Merge pull request #11621 from ptibogxiv/patch-205
Fix application_fee_amount
2019-08-10 01:38:30 +02:00
Laurent Destailleur
31fa26c2be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-10 01:36:50 +02:00
Laurent Destailleur
0cb1210acc
Merge pull request #11622 from ptibogxiv/patch-206
Fix table in admin stripe.php
2019-08-10 01:33:57 +02:00
Laurent Destailleur
13a8ef8258
Merge pull request #11618 from ptibogxiv/patch-203
FIX author in message / ticket API
2019-08-10 01:33:21 +02:00
Laurent Destailleur
c647195689
Merge pull request #11632 from atm-greg/FIX_delivery_Extrafields
FIX delivery extrafields
2019-08-10 01:28:46 +02:00
Laurent Destailleur
76b0f42d4c
Merge pull request #11620 from ptibogxiv/patch-204
FIX document list for products in API
2019-08-10 01:27:52 +02:00
Laurent Destailleur
6089547e0e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:26:18 +02:00
Laurent Destailleur
46a5c05b75
Merge pull request #11623 from ptibogxiv/patch-207
FIX round for application fee in stripe
2019-08-10 01:25:07 +02:00
Laurent Destailleur
eea5ad9b81
Merge pull request #11627 from ptibogxiv/patch-209
FIX display payment intent in stripe's charge list
2019-08-10 01:23:06 +02:00
Laurent Destailleur
ab370137a8
Merge pull request #11628 from ptibogxiv/patch-210
FIX display only stripe sources for customer
2019-08-10 01:21:41 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
Laurent Destailleur
049a08f435
Merge pull request #11631 from frederic34/patch-9
Update admin.lang
2019-08-10 01:15:28 +02:00
Laurent Destailleur
cee92356c6
Merge pull request #11644 from frederic34/patch-11
Update price_parser.class.php
2019-08-10 01:11:02 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216
FIX qty in invoice list on product's stats
2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6 Update price_parser.class.php
Calculation with supplier_min_price work

Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 00:21:13 +02:00
Laurent Destailleur
f752b96a7e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 00:14:27 +02:00
Abbes Bahfir
8f2786cf7b fix:this is not accessible in static context 2019-08-10 00:09:36 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219
FIX duration when creating service
2019-08-09 23:53:55 +02:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
ptibogxiv
0fc92b92a2
Update facture.php 2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php 2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php 2019-08-06 11:47:34 +02:00
ptibogxiv
05ac4eec52
Update charge.php 2019-08-06 00:16:18 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
Ferran Marcet
32220dde2e FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES 2019-08-05 14:12:19 +02:00
Ferran Marcet
cda8b15c7f FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field 2019-08-05 14:00:15 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
atm-greg
1d4fc32c20 fix second bad test 2019-08-05 13:13:56 +02:00
atm-greg
41c07b9b43 fix bad test in delivery card 2019-08-05 13:10:26 +02:00
Frédéric FRANCE
baa2e870d0
Update admin.lang
found in admin/company.php
2019-08-05 11:01:58 +02:00
Laurent Destailleur
d663657f15 FIX format of field with type timestamp 2019-08-04 13:06:48 +02:00
ptibogxiv
4633af3f5d
Update charge.php 2019-08-03 21:19:47 +02:00
ptibogxiv
4ed1ff5b9b
Fix display only stripe sources for customer 2019-08-03 21:17:12 +02:00
Laurent Destailleur
5339bb71ac FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:57:21 +02:00
Laurent Destailleur
7f42380f83 FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:53:57 +02:00
Laurent Destailleur
f210e286bd Fix balance of div 2019-08-03 20:53:28 +02:00
Laurent Destailleur
f3e38f4b09 FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
2019-08-03 20:53:18 +02:00
ptibogxiv
07cc21a113
Fix display payment intent in stripe's charge list 2019-08-03 20:35:53 +02:00
Laurent Destailleur
b40f2cbcce Fix responsive 2019-08-03 20:20:09 +02:00
Laurent Destailleur
83412e3c90 Fix warning 2019-08-03 16:38:57 +02:00
Laurent Destailleur
25ee539f92 FIX Missing where on entity
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-08-03 16:35:15 +02:00
ptibogxiv
d30ce126e0
Fix update stripe api for more compliance to API 2019-08-03 13:00:52 +02:00
ptibogxiv
13eef54392
Fix round for application fee in stripe 2019-08-03 12:31:13 +02:00
Laurent Destailleur
55e9335cd2 Fix code comment 2019-08-02 19:26:04 +02:00
Laurent Destailleur
c34739ab3f Fix A file for a hidden feature provides a service without security
checks.
2019-08-02 19:25:50 +02:00
Laurent Destailleur
76b7aa2e0f Fix fields with visible = 3 must not be visible into list 2019-08-02 19:20:19 +02:00
Laurent Destailleur
55e8aca47e Fix skeleton of module 2019-08-02 19:06:40 +02:00