Laurent Destailleur
a8fbec8491
Merge pull request #14216 from grandoc/new_branch_11_07_2020
...
Minimum version of PHP required by module
2020-07-18 19:12:50 +02:00
Laurent Destailleur
cd997d216e
Merge pull request #14230 from cfoellmann/fix-default-search
...
fix the global `DEFAULT_SEARCH_INTO_MODULE`
2020-07-18 19:11:23 +02:00
Laurent Destailleur
179f3d44c6
Merge pull request #14238 from dolibit-ut/patch-32
...
Update llx_c_incoterms.sql
2020-07-18 19:09:26 +02:00
Laurent Destailleur
f07a1a6d1e
FIX for #14253
2020-07-18 18:54:55 +02:00
Laurent Destailleur
6ad8145645
FIX for #14253
2020-07-18 18:52:33 +02:00
Oarces DEV
97826f140f
Add the possibility for the prospect to order
...
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 11:55:42 +02:00
stickler-ci
28bc001ba9
Fixing style errors.
2020-07-17 08:52:52 +00:00
Ferran Marcet
125be4271e
New: ##12972 Update supplier price also when product has batch
2020-07-17 10:50:24 +02:00
Abdessalam@MEGALOGI
9d481cf15e
Update card.php
...
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-15 20:21:27 +01:00
florian HENRY
d2e528d8c1
fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-15 17:45:45 +02:00
florian HENRY
3148a181e7
fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-15 17:45:34 +02:00
Alexandre SPANGARO
8d9f0dc4b2
Merge remote-tracking branch 'upstream/develop' into 13a1
2020-07-15 13:53:55 +02:00
Francis Appels
1bc1fd4cb4
Fix date in supplier price log tooltip.
2020-07-15 11:24:11 +02:00
UT from dolibit
60f904bbd3
Update llx_c_incoterms.sql
...
add column label for short standard term in english
(libelle to use for long description (in user language))
2020-07-14 14:15:44 +02:00
UT from dolibit
7184fba8c6
Update llx_c_incoterms.sql
...
add column 'label' for short term description in english
add new Incoterm DPU (DAT is obsolete , but let it stay for older documents)
2020-07-14 13:59:16 +02:00
florian HENRY
f4074428f8
fix filter wharehouse list on ref
2020-07-14 09:38:52 +02:00
Christian Foellmann
a4e9c478e7
fix the global DEFAULT_SEARCH_INTO_MODULE - current value will not push anything above the core modules
2020-07-13 18:14:57 +02:00
florian HENRY
72e0250117
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:53:00 +02:00
florian HENRY
1173059e7b
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:52:41 +02:00
florian HENRY
96d26be1d4
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:51:58 +02:00
florian HENRY
045fbad616
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:48:21 +02:00
BENKE Charlene
a2cf473891
add class for ticket edition (pdf or odt)
2020-07-13 14:24:07 +02:00
Christian Foellmann
4674367099
remove old commented out code lines
2020-07-13 14:18:16 +02:00
Christian Foellmann
d43c30defd
change level of left menu for thirdparty types
2020-07-13 14:17:12 +02:00
Matt Sidnell
50e3822465
Merge branch 'PSdevelop' of https://github.com/pstructures/dolibarr-core into PSdevelop
2020-07-12 21:22:06 +01:00
Matt Sidnell
2797c5e65f
Updated Issue with declared progress
2020-07-12 21:21:34 +01:00
mattsidnell
ac945b5d96
Merge pull request #14 from Dolibarr/develop
2020-07-12 20:35:42 +01:00
florian HENRY
32e4635e84
fix missing entity into fetch wharehouse
2020-07-12 21:34:13 +02:00
Matt Sidnell
378c8c4691
Error on time pent page where progress was getting unset
2020-07-12 20:34:04 +01:00
florian HENRY
7b5072a21b
fix missing entity
2020-07-12 10:10:46 +02:00
florian HENRY
2f8968478d
fix missing entity into fetch wahrehouse
2020-07-12 10:06:04 +02:00
Alfredo Altamirano
6aae68bb07
Change Mexico City name
...
Mexico City official name and code changed since 2016
2020-07-11 10:49:05 -05:00
Philippe GRAND
ffae6b02c1
Minimum version of PHP required by module
2020-07-11 15:11:39 +02:00
Philippe GRAND
448f031948
Minimum version of PHP required by module
2020-07-11 15:11:15 +02:00
Philippe GRAND
5902dd6df3
Minimum version of PHP required by module
2020-07-11 15:10:53 +02:00
Philippe GRAND
2906e9b848
Minimum version of PHP required by module
2020-07-11 15:10:26 +02:00
Philippe GRAND
fc778e433f
Minimum version of PHP required by module
2020-07-11 15:10:02 +02:00
Philippe GRAND
8c5bdb8fb6
Minimum version of PHP required by module
2020-07-11 15:09:36 +02:00
Philippe GRAND
3ee18e5852
Minimum version of PHP required by module
2020-07-11 15:09:15 +02:00
Philippe GRAND
1d5a1beb79
Minimum version of PHP required by module
2020-07-11 15:08:52 +02:00
Philippe GRAND
1bb60ca7cc
Minimum version of PHP required by module
2020-07-11 15:08:28 +02:00
Philippe GRAND
1358801316
Minimum version of PHP required by module
2020-07-11 15:08:00 +02:00
Philippe GRAND
b4252b899c
Minimum version of PHP required by module
2020-07-11 15:07:33 +02:00
Philippe GRAND
9451148928
Minimum version of PHP required by module
2020-07-11 15:07:09 +02:00
Philippe GRAND
bbde5a3c95
Minimum version of PHP required by module
2020-07-11 15:06:44 +02:00
Philippe GRAND
05b97dc134
Minimum version of PHP required by module
2020-07-11 15:06:17 +02:00
Philippe GRAND
eb602d8bae
Minimum version of PHP required by module
2020-07-11 15:05:49 +02:00
Philippe GRAND
2e6addae11
Minimum version of PHP required by module
2020-07-11 15:05:20 +02:00
Philippe GRAND
f453c2272a
Minimum version of PHP required by module
2020-07-11 15:04:54 +02:00
Philippe GRAND
3a4f526ccd
Minimum version of PHP required by module
2020-07-11 15:04:31 +02:00
Philippe GRAND
8f37bb5a69
Minimum version of PHP required by module
2020-07-11 15:04:06 +02:00
Philippe GRAND
d4562a91ff
Minimum version of PHP required by module
2020-07-11 15:03:38 +02:00
Philippe GRAND
8d06471a4e
Minimum version of PHP required by module
2020-07-11 15:03:00 +02:00
Philippe GRAND
b26a1042d2
Minimum version of PHP required by module
2020-07-11 15:02:03 +02:00
Philippe GRAND
b2af2320ef
Merge branch 'new_branch_11_07_2020' of github.com:grandoc/dolibarr into new_branch_11_07_2020
2020-07-11 14:57:26 +02:00
Philippe GRAND
a61955234f
Minimum version of PHP required by module
2020-07-11 14:54:23 +02:00
Philippe GRAND
b02b6db181
Minimum version of PHP required by module
2020-07-11 14:43:30 +02:00
Philippe GRAND
8a2db6bad5
Minimum version of PHP required by module
2020-07-11 14:42:53 +02:00
stickler-ci
0d58c55167
Fixing style errors.
2020-07-11 12:42:38 +00:00
Philippe GRAND
ece128c9c5
Minimum version of PHP required by module
2020-07-11 14:42:04 +02:00
Philippe GRAND
7c84406494
Minimum version of PHP required by module
2020-07-11 14:41:10 +02:00
Philippe GRAND
370a7bcf38
Minimum version of PHP required by module
2020-07-11 14:39:46 +02:00
Philippe GRAND
0531dd00d9
Minimum version of PHP required by module
2020-07-11 14:38:44 +02:00
Philippe GRAND
baa9c39ace
Minimum version of PHP required by module
2020-07-11 14:38:03 +02:00
Philippe GRAND
872b99be42
Minimum version of PHP required by module
2020-07-11 14:37:25 +02:00
Philippe GRAND
0fdb209045
Minimum version of PHP required by module
2020-07-11 14:36:22 +02:00
Philippe GRAND
7f5ebf2e31
Minimum version of PHP required by module
2020-07-11 14:35:36 +02:00
Philippe GRAND
c9c5d9cc70
Minimum version of PHP required by module
2020-07-11 14:34:11 +02:00
Philippe GRAND
fd01a4d154
Minimum version of PHP required by module
2020-07-11 14:31:16 +02:00
Laurent Destailleur
8b5f4fe9a6
Fix massaction delete on events
2020-07-11 12:21:53 +02:00
Laurent Destailleur
276bc4f908
Fix sql error
2020-07-11 11:21:28 +02:00
Laurent Destailleur
eede2f9944
Add telangana province for india
2020-07-11 10:39:12 +02:00
Laurent Destailleur
0d24b979c1
Fix phpcs
2020-07-11 01:20:20 +02:00
Laurent Destailleur
8972271be0
Add link to stock at date page
2020-07-10 21:12:15 +02:00
Laurent Destailleur
c91236244e
Enhance Stock at date feature
2020-07-10 20:33:06 +02:00
Laurent Destailleur
a155b20b2f
Trans
2020-07-10 16:27:59 +02:00
Laurent Destailleur
a059154fdf
FIX reposition
2020-07-10 13:59:54 +02:00
Laurent Destailleur
f92f279527
FIX Navigation from bank receipts
2020-07-10 13:56:54 +02:00
Laurent Destailleur
db6ed7a646
FIX Navigation from bank receipts
2020-07-10 13:40:33 +02:00
Anthony Berton
dc8bce2f43
Update list.php
2020-07-10 11:42:59 +02:00
Laurent Destailleur
2dc1008663
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 05:21:40 +02:00
Laurent Destailleur
c3375b176d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:21:01 +02:00
Laurent Destailleur
ff5a2d459d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-10 05:20:09 +02:00
Laurent Destailleur
071b909d38
FIX Fails to retraive accounting code of social contribution sometimes
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:19:21 +02:00
Laurent Destailleur
79a6246666
FIX Fails to retraive accounting code of social contribution sometimes
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:18:46 +02:00
Laurent Destailleur
86744a2e0c
FIX Fails to retraive accounting code of social contribution sometimes
2020-07-10 05:14:54 +02:00
Laurent Destailleur
17ebdd73fe
FIX Fails to retraive accounting code of social contribution sometimes
2020-07-10 05:13:24 +02:00
Laurent Destailleur
07b2053a4b
Fix regression
2020-07-10 03:59:28 +02:00
Laurent Destailleur
bb056fc811
Fix bad return value
2020-07-10 03:02:49 +02:00
Laurent Destailleur
f2c84fba3d
Merge pull request #14202 from pstructures/PSdevelop
...
Added Hook to showOptionals Function
2020-07-10 02:54:05 +02:00
Laurent Destailleur
b6452dbbc0
Merge pull request #14196 from Tim-Otte/fix-proposals-urgent
...
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-10 02:51:25 +02:00
Laurent Destailleur
a36c6a8dda
FIX #14209
2020-07-10 02:46:59 +02:00
Laurent Destailleur
96efb77b8c
FIX CSS
2020-07-10 02:38:37 +02:00
Laurent Destailleur
5cf9bfcb5f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:32:54 +02:00
Laurent Destailleur
2cc7e88f8e
clean code
2020-07-10 02:32:22 +02:00
Laurent Destailleur
96c583b84e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:28:34 +02:00
Laurent Destailleur
7fdccf4eb8
Fix error in stripe payment if no country defined
2020-07-10 02:28:00 +02:00
Laurent Destailleur
726d7e39e6
CSS
2020-07-10 02:17:08 +02:00
Laurent Destailleur
87913e8a5c
Fix prospect before customer
2020-07-10 02:11:23 +02:00
Laurent Destailleur
e8dd99a9cd
Trans
2020-07-10 01:11:37 +02:00
Laurent Destailleur
d18188d565
Fix missing trans
2020-07-10 00:57:29 +02:00
Laurent Destailleur
bd63b84f8e
Fix label of social contribution and button date
2020-07-09 23:18:19 +02:00
Laurent Destailleur
fd95551940
Fix upload of file in import module
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-07-09 21:52:27 +02:00
gauthier
25509e74d3
FIX : order by amount ht uses wrong column
2020-07-09 17:27:14 +02:00
atm-josselin
71a5cc7522
Show label on batch card
2020-07-09 17:13:53 +02:00
Laurent Destailleur
cb7f78e9d3
Fix tpl
2020-07-09 16:25:51 +02:00
Laurent Destailleur
6b5f46624c
Fix label of AWP
2020-07-09 16:19:40 +02:00
Laurent Destailleur
b8721e0c64
FIX Change position of line in BOM
2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e
Fix extrafields ordering on PDFs
2020-07-10 00:51:41 +11:00
Laurent Destailleur
a59b37cb72
Trans
2020-07-09 15:44:42 +02:00
Laurent Destailleur
6046f1f9d6
css
2020-07-09 14:12:19 +02:00
Laurent Destailleur
e6b241a083
NEW Show tags and status in search list of website pages
2020-07-09 14:07:41 +02:00
Laurent Destailleur
b55b0e505f
FIX wrap on contract ref
2020-07-09 13:56:29 +02:00
Laurent Destailleur
46119dc786
Fix per user
2020-07-09 12:49:48 +02:00
Laurent Destailleur
0394ce1865
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-07-09 12:46:10 +02:00
Laurent Destailleur
f756864670
CSS
2020-07-09 12:44:31 +02:00
Laurent Destailleur
49faaf750f
Trans
2020-07-09 12:39:43 +02:00
Laurent Destailleur
ce1649233d
FIX CSS
2020-07-09 12:39:00 +02:00
Laurent Destailleur
a9eccd80b1
FIX CSS
2020-07-09 12:38:05 +02:00
Laurent Destailleur
b2bd90ae1a
Fix link to list of event
2020-07-09 12:33:28 +02:00
Laurent Destailleur
8589e122c6
css
2020-07-09 11:58:44 +02:00
Laurent Destailleur
9592fdb3fc
CSS
2020-07-09 11:55:16 +02:00
Laurent Destailleur
0a708e46bf
css
2020-07-09 00:46:59 +02:00
Laurent Destailleur
56c90c289a
Prepare 12.0.2
2020-07-08 18:19:20 +02:00
Laurent Destailleur
1dfd2d565b
FIX Reposition and nav
2020-07-08 18:18:47 +02:00
Laurent Destailleur
96d935832c
FIX Reposition and nav
2020-07-08 18:18:08 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
edb4aac8d3
CSS
2020-07-08 18:09:35 +02:00
Laurent Destailleur
96729769f7
Standardize Agenda view
2020-07-08 18:06:14 +02:00
Matt Sidnell
39104009ef
Updated to match inline with code received from fork
2020-07-08 14:25:37 +01:00
Matt Sidnell
580b9db3e7
Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc...
2020-07-08 14:20:59 +01:00
Laurent Dinclaux
37401df106
Improve printStdColumnContent by passing the $pdf object.
...
It isn't possible to replace the pdf edition done by this method without the $pdf object.
2020-07-08 14:48:34 +11:00
Laurent Destailleur
bec27a04ba
Trans
2020-07-07 21:16:20 +02:00
Tim Otte
a73f77cfef
Fixed same error like before
2020-07-07 12:43:15 +02:00
Laurent Dinclaux
f2adc3de4f
Fix Dolibarr/dolibarr#14181 . Limits and accuracy form not saving modified values
2020-07-07 18:03:11 +11:00
stickler-ci
e032c2f7b9
Fixing style errors.
2020-07-07 05:09:28 +00:00
Alexandre SPANGARO
e4cc3e1b2c
NEW: Add column quantity in product margin page
2020-07-07 07:05:18 +02:00
Laurent Destailleur
cb5577826d
Look and feel v13
2020-07-07 03:50:14 +02:00
Laurent Destailleur
4fd970af28
Fix phpcs
2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b
NEW Can change VAT rate of all lines of a draft object in one step.
2020-07-06 22:48:22 +02:00
Laurent Destailleur
67c164df07
FIX reposition was broken if url end with #anchor
2020-07-06 22:27:19 +02:00
Laurent Destailleur
33a78dbcef
FIX reposition was broken if url end with #anchor
2020-07-06 22:26:19 +02:00
Laurent Destailleur
415398fc66
Better contrast
2020-07-06 21:06:32 +02:00
Laurent Destailleur
e13d3ce657
Trans
2020-07-06 20:57:47 +02:00
Laurent Destailleur
f72a836231
Fix look and feel v12
2020-07-06 16:59:25 +02:00
Laurent Destailleur
4dcc073b3a
Fix param GETPOST
2020-07-06 16:54:30 +02:00
Laurent Destailleur
3939a640e9
Fix note in creation
2020-07-06 16:52:28 +02:00
Laurent Destailleur
61a7f54877
Fix look and field
2020-07-06 15:55:41 +02:00
Laurent Destailleur
7d7ef1e72a
FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY
...
Fix setup of product
2020-07-06 15:34:26 +02:00
Laurent Destailleur
471f3e66e6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 12:27:43 +02:00
Laurent Destailleur
6a41d5bba8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/projet/tasks/list.php
2020-07-06 12:27:25 +02:00
Laurent Destailleur
70c3146aba
Merge pull request #14106 from OPEN-DSI/new-extrafields-category-multi-select-with-link
...
NEW show links for select and multi-select in category extra field
2020-07-06 12:12:31 +02:00
Laurent Destailleur
21bec139ca
Merge pull request #14183 from FHenry/12.0
...
remove warning when date end contract line empty
2020-07-06 12:06:42 +02:00
Laurent Destailleur
b4cd670b09
Merge pull request #14186 from atm-gauthier/10.0_fix_search_soc
...
FIX : soc filter doesn't work on task list
2020-07-06 12:05:40 +02:00
Laurent Destailleur
eb7f3b81d3
Merge pull request #14187 from atm-john/10.0_fix_email_spoofing
...
Fix email spoofing - with hidden conf
2020-07-06 12:01:35 +02:00
Laurent Destailleur
42917000a3
Update CMailFile.class.php
2020-07-06 12:01:00 +02:00
Laurent Destailleur
2f04b4c559
Update CMailFile.class.php
2020-07-06 12:00:14 +02:00
Laurent Destailleur
091fbb2824
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 11:55:06 +02:00
Laurent Destailleur
9b1163cfb8
Fix menu organisation.
2020-07-06 11:52:28 +02:00
Laurent Destailleur
1e9ae1bc02
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Laurent Destailleur
2629a98851
Fix regression
2020-07-06 11:31:05 +02:00
Laurent Destailleur
1399ac9b41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-06 11:28:17 +02:00
Laurent Destailleur
053a1a2230
Fix duplicate code
2020-07-06 11:22:30 +02:00
stickler-ci
cb7b66d52c
Fixing style errors.
2020-07-06 09:19:27 +00:00
Laurent Destailleur
056aa81ed3
Fix responsive
2020-07-06 10:59:23 +02:00
gauthier
466b7e84ef
FIX : soc filter doesn't work on task list
2020-07-06 09:58:44 +02:00
Laurent Destailleur
b76828df9f
Fix use of newtoken()
2020-07-06 09:39:26 +02:00
Laurent Destailleur
9cd8c3738f
Fix trans
2020-07-05 23:18:19 +02:00
Laurent Destailleur
0d3cfe445f
Fix phpcs
2020-07-05 14:16:57 +02:00
Laurent Destailleur
776e305272
Typo
2020-07-05 13:50:21 +02:00
Laurent Destailleur
1b2cea3f9f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-05 13:32:10 +02:00
Laurent Destailleur
8df431f525
Look and feel v12
2020-07-05 13:30:56 +02:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
54a77a604c
FIX Missing token
2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e
Look and feel v12
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5
Trans
2020-07-05 12:47:32 +02:00
Laurent Destailleur
c9e5536fbc
FIX Missing token
2020-07-05 12:46:53 +02:00
Laurent Destailleur
176f678a85
Look and feel v12
2020-07-05 12:46:15 +02:00
Laurent Destailleur
a0d6c9ce70
Trans
2020-07-05 12:30:04 +02:00
Laurent Destailleur
93a3efac3a
Fix phpcs
2020-07-04 19:26:51 +02:00
Laurent Destailleur
b726e96f4b
FIX Update form erased extrafields that were hidden
2020-07-04 17:09:20 +02:00
florian HENRY
03ae31eced
remove warning when date end contract line empty
2020-07-04 16:37:50 +02:00
florian HENRY
335a767f22
remove warning when date end contract line empty
2020-07-04 16:37:11 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
6a37d12bd9
Fix sql type
2020-07-04 16:10:13 +02:00
Laurent Destailleur
9912ffd555
Fix position of button
2020-07-04 13:45:28 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06
Fix trans
2020-07-04 13:04:53 +02:00
Laurent Destailleur
dd9cb8e781
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-03 19:27:42 +02:00
Laurent Destailleur
e256ce5c4b
Debug credit transfer module
2020-07-03 19:27:23 +02:00
Laurent Destailleur
1e7daa29a5
Hide a useless option
2020-07-03 01:46:50 +02:00
Laurent Destailleur
636f1e642d
Fix param of product id to switch to list of order
2020-07-03 01:31:48 +02:00
Laurent Destailleur
fce81a4bf1
Rename var and fix position of checkbox
2020-07-03 01:30:53 +02:00
Laurent Destailleur
6b3eeebe87
Merge branch 'develop' into dev-replenish
2020-07-03 01:03:35 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab
...
NEW multiselect type and date to date filter
2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846
Update company.lib.php
2020-07-03 00:57:15 +02:00
Laurent Destailleur
4fba3ec872
Merge pull request #14115 from atm-florian/10.0
...
fix entity on supplier order
2020-07-03 00:50:51 +02:00
Laurent Destailleur
03aa4873d1
Merge pull request #14141 from fappels/12_fix_extrafield_html
...
FIX html lost on html extrafield
2020-07-03 00:49:31 +02:00
Laurent Destailleur
b88e159495
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
2020-07-03 00:46:18 +02:00
Laurent Destailleur
ec98ffb492
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:40 +02:00
Laurent Destailleur
59049cd047
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:32 +02:00
Laurent Destailleur
8d8695ccd7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-03 00:41:06 +02:00
Laurent Destailleur
53c5ec51b8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-03 00:40:59 +02:00
oscim
ca66eac76c
Update project.class.php
...
Fix order of delete extra prev table of project
2020-07-03 00:40:15 +02:00
Laurent Destailleur
f85d240dcf
Merge pull request #14145 from oscim/patch-41
...
Update project.class.php
2020-07-03 00:39:45 +02:00
Laurent Destailleur
18fa4c4105
Update card.php
2020-07-03 00:38:31 +02:00
Laurent Destailleur
fd617658ef
Fix syntax
2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d
fix #14143
2020-07-03 00:34:50 +02:00
Tim Otte
bce0a93227
Hotfix for an error in v12
2020-07-03 00:33:54 +02:00
Laurent Destailleur
836ccfd595
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-03 00:32:25 +02:00
Laurent Destailleur
751174a983
Merge pull request #14156 from Tim-Otte/fix-proposals-urgent
...
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-03 00:32:03 +02:00
Laurent Destailleur
9c504c1b3d
Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields
...
FIX change selected fields on company card
2020-07-03 00:30:34 +02:00
Laurent Destailleur
cae55da399
Merge pull request #14160 from OPEN-DSI/new-societe-get-sales-representatives-order-by
...
NEW add order by lastname and firstname by default
2020-07-03 00:29:38 +02:00
Laurent Destailleur
a08e4bdf3f
Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop
...
NEW get all child recursively
2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da
Update commonobject.class.php
2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875
Merge pull request #14159 from Je2fb/develop
...
FIX #14143 DynamicPrice
2020-07-03 00:25:38 +02:00
Laurent Destailleur
8109145fe3
Merge pull request #14162 from laurantines/develop
...
Update list.php in Adherents
2020-07-03 00:24:54 +02:00
Laurent Destailleur
0ea55209ae
Merge pull request #14165 from ptibogxiv/patch-345
...
FIX non numeric value on comm/card.php
2020-07-03 00:24:32 +02:00
ksar
0a13e03792
FIX : Correct ModuleBuilder left menu
2020-07-03 00:21:39 +02:00
Laurent Destailleur
70b58b5755
Merge pull request #14169 from ksar-ksar/develop
...
FIX : Correct ModuleBuilder left menu
2020-07-03 00:20:59 +02:00
Laurent Destailleur
d24c6f7a81
Merge pull request #14164 from ptibogxiv/patch-344
...
FIX takepos 12 hook
2020-07-03 00:20:28 +02:00
Laurent Destailleur
91266babea
Merge pull request #14170 from andreubisquerra/master
...
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-03 00:19:35 +02:00
Laurent Destailleur
75409e3ed0
Merge pull request #14171 from hregis/12.0_bug
...
FIX missing possibility to change entity when propal cloning
2020-07-03 00:18:35 +02:00
Laurent Destailleur
6c01cc16f8
Update commande.class.php
2020-07-03 00:14:22 +02:00
Laurent Destailleur
16b327f106
Debug module credit transfer
2020-07-02 15:45:11 +02:00
BENKE Charlene
b3396a6454
better look & feel icon on dropdown
2020-07-02 14:40:56 +02:00
quentin
642e75c3dd
FIX wrong origin
2020-07-02 14:16:31 +02:00
Regis Houssin
a5431a40da
FIX missing possibility to change entity when propal cloning
2020-07-02 10:16:20 +02:00
Laurent Destailleur
cfcb40dd2a
Fix scrutinizer errors
2020-07-02 03:48:32 +02:00
Laurent Destailleur
6b16f64928
Fix properties used that does not exists
2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62
Fix scrutinizer errors
2020-07-02 03:37:01 +02:00
Laurent Destailleur
26c6e2d92e
Clean code
2020-07-02 03:34:28 +02:00
andreubisquerra
452cca503a
Fixes
2020-07-02 00:11:17 +02:00
andreubisquerra
9e4d7627f3
Fix travis
2020-07-01 22:55:00 +02:00
andreubisquerra
d2a78b8aa4
Update appearance.php
2020-07-01 22:44:18 +02:00
jove@bisquerra.com
76f3724191
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-01 22:34:35 +02:00
ksar
22448b19f4
FIX : Correct ModuleBuilder left menu
2020-07-01 22:19:10 +02:00
Laurent Destailleur
ae0c738980
FIX Entry from stripe intent were reported into SEPA payments
...
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
2020-07-01 19:42:28 +02:00
Laurent Destailleur
d3c23428d5
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:01:46 +02:00
Laurent Destailleur
226c907e35
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:00:52 +02:00
John Botella
2a9311b2d8
Fix email spoofing - with hidden conf
2020-07-01 16:55:23 +02:00
ptibogxiv
cc132775f3
FIX non numeric value on comm/car.php
2020-07-01 16:18:19 +02:00
stickler-ci
92f4744d11
Fixing style errors.
2020-07-01 13:22:43 +00:00
ptibogxiv
5e259d26ab
FIX takepos hook
...
can add more than 1 button within 1 module
2020-07-01 15:20:42 +02:00
Laurent Destailleur
e2a9743dd4
Debug module credit transfer
2020-07-01 14:19:47 +02:00
quentin
d2a364eea8
NEW get all child recursively
2020-07-01 14:10:43 +02:00
quentin
39651953b3
FIX refacto
2020-07-01 14:04:41 +02:00
quentin
267aa7605b
Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab
2020-07-01 14:00:49 +02:00
Laurent Destailleur
5f2486049e
Fix trans
2020-07-01 13:22:15 +02:00
Laurent Destailleur
5f37f54675
Fix warning
2020-07-01 13:16:06 +02:00
laurantines
a34c6ec7b0
Update list.php in Adherents
...
Add Address in search
2020-07-01 13:12:52 +02:00
lvessiller
caa3661eeb
NEW add order by lastname and firstname by default in get sales representatives
2020-07-01 09:16:44 +02:00
lvessiller
918e669c98
FIX change selected fields on company card
2020-06-30 16:33:18 +02:00
Laurent Destailleur
b8ea58f18c
Fix phpcs
2020-06-30 16:15:10 +02:00
Tim Otte
94a1d71fba
Hotfix for an error in v12
2020-06-30 15:20:30 +02:00
Laurent Destailleur
4baa00ba89
Fix phpcs
2020-06-30 13:20:46 +02:00
Laurent Destailleur
5afd518718
Update vat rate for Congo
2020-06-30 13:06:44 +02:00
Laurent Destailleur
4f1ac84a19
Fix can't find link to edit table plan
2020-06-30 12:07:24 +02:00
gauthier
6553c40bea
FIX : create a deposit with amount using comma didn't work
2020-06-30 11:23:55 +02:00
Laurent Destailleur
88cf904ced
Fix edit of tag of website
2020-06-30 02:50:58 +02:00
Laurent Destailleur
9bb0ef04f5
Fix upload of file in import module
2020-06-29 18:07:51 +02:00
Laurent Destailleur
146c521efd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
bb74804b74
NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
2020-06-29 17:58:04 +02:00
Laurent Destailleur
f34a3785f0
FIX CSS
2020-06-29 16:02:50 +02:00
Laurent Destailleur
2d0d2e0019
FIX CSS
2020-06-29 16:02:08 +02:00
Laurent Destailleur
3d8d55a531
Fix bad path in import section
2020-06-29 14:42:09 +02:00
Laurent Destailleur
b64fc7dc3f
FIX Avoid warning when creating a module with already existing files
2020-06-29 14:37:36 +02:00
Laurent Destailleur
5b3670f300
FIX SQL syntax error when editing extrafields
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-06-29 14:28:53 +02:00
oscim
eb22947c07
Update project.class.php
...
Fix order of delete extra prev table of project
2020-06-29 14:01:48 +02:00
Laurent Destailleur
7c5b0be6a3
FIX SQL syntax error when editing extrafields
2020-06-29 13:48:00 +02:00
Laurent Destailleur
8bb11039dc
Clean code
2020-06-29 09:56:04 +02:00
Laurent Destailleur
7c4e737668
Clean code
2020-06-29 09:53:55 +02:00
Laurent Destailleur
68b4866438
Trans
2020-06-29 09:43:39 +02:00
Laurent Destailleur
eb30f6ed1a
Prepare 12.0.1
2020-06-29 09:15:49 +02:00
Francis Appels
5d65b5f660
fix html should not do price2num
2020-06-29 09:07:54 +02:00
Laurent Destailleur
600a24346a
Some people are missing this table
2020-06-28 22:09:17 +02:00
Laurent Destailleur
a5893db106
FIX upload documents into manual ECM was reported a permission error
2020-06-28 22:05:55 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
70efaa4235
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-28 21:48:02 +02:00
Laurent Destailleur
95729e2375
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
Laurent Destailleur
aab1358b0d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:43:46 +02:00
Laurent Destailleur
b47ae06973
Clean code
2020-06-28 21:43:34 +02:00
Laurent Destailleur
b35550a3dd
Merge pull request #14122 from TobiasSekan/CommonListForLeaveLog
...
New: Common list behavior for leave log
2020-06-28 21:30:49 +02:00
Laurent Destailleur
aa91bada07
Merge pull request #14114 from atm-maxime/new_project_task_progress_filter
...
NEW filter on progress column in task list
2020-06-28 21:22:33 +02:00
Laurent Destailleur
960512acd9
Update fournisseur.commande.class.php
...
Action with filter on rowid does not need to have test on entity
2020-06-28 21:21:35 +02:00
Laurent Destailleur
1194c61857
Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2
...
FIX 10.0 - fatal with postgreSQL
2020-06-28 21:20:20 +02:00
Laurent Destailleur
b725aca8aa
Merge branch 'develop' into 11.0_bug
2020-06-28 21:19:11 +02:00
Laurent Destailleur
dfb7c3e194
Update fournisseur.commande.class.php
2020-06-28 21:14:49 +02:00
Laurent Destailleur
cf899364f3
Merge pull request #14116 from aspangaro/12p1
...
FIX: SQL Problem in customer invoice list
2020-06-28 21:13:17 +02:00
Laurent Destailleur
df7996a8eb
Merge pull request #14126 from OPEN-DSI/fix-import-upload-file
...
FIX upload file in import module
2020-06-28 21:13:00 +02:00
Laurent Destailleur
d98c54c445
Merge pull request #14132 from aspangaro/12p2
...
FIX: SQL Problem in supplier invoice list
2020-06-28 21:11:56 +02:00
Laurent Destailleur
08b3cc5033
Merge pull request #14133 from aspangaro/12p3
...
FIX: SQL Problem in social contribution list
2020-06-28 21:11:35 +02:00
Laurent Destailleur
a11f7d1070
Update list.php
2020-06-28 21:11:25 +02:00
Laurent Destailleur
3fa98a4f01
Merge pull request #14135 from OPEN-DSI/new-export-societe-contact-region
...
NEW add region in export companies and contacts
2020-06-28 21:09:56 +02:00
Laurent Destailleur
8f409f4c58
Merge pull request #14137 from TobiasSekan/CommonListMonthlyLeaveView
...
NEW: Common behavior for monthly leave list view
2020-06-28 21:09:27 +02:00
Laurent Destailleur
0aa08edb38
Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative
...
NEW can edit and set sales representatives directly on thirdparty card
2020-06-28 21:08:24 +02:00
Laurent Destailleur
4dfd016504
Merge pull request #14140 from fappels/12_missing_translate
...
Fix missing translate key
2020-06-28 21:07:49 +02:00
Laurent Destailleur
2de1433818
FIX #14142
2020-06-28 21:05:36 +02:00
Laurent Destailleur
518c126abf
NEW Add a page to list Stock at a given date.
2020-06-28 20:31:07 +02:00
Laurent Destailleur
a3ae7a76b8
WIP Stock at date
2020-06-28 19:35:24 +02:00
Je2fb
245ba93895
fix #14143
2020-06-28 17:53:48 +02:00
Laurent Destailleur
d22a0f702e
WIP Stock at date
2020-06-28 17:34:30 +02:00
Francis Appels
731978fda6
FIX html lost on html extrafield
2020-06-28 16:33:44 +02:00
Laurent Destailleur
194b92e70f
Fix load of menu when 'perm' or 'enabled' is '0'.
2020-06-27 15:27:09 +02:00
Laurent Destailleur
41c6155922
Hiden useless entry
2020-06-27 14:44:38 +02:00
Laurent Destailleur
d5324ff3db
Fix template
2020-06-27 14:41:11 +02:00
Laurent Destailleur
781f571a15
Fix template
2020-06-27 14:38:40 +02:00
Laurent Destailleur
5a4ed34c0d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-27 03:28:44 +02:00
Laurent Destailleur
4d01030fd9
Fix phpcs
2020-06-27 02:00:42 +02:00
Laurent Destailleur
90bcc64547
Fix phpcs
2020-06-27 01:59:08 +02:00
Laurent Destailleur
ec5cfee150
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-27 01:57:18 +02:00
Laurent Destailleur
443558e3a2
Fix phpcs
2020-06-27 01:57:01 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Laurent Destailleur
3655f6f407
FIX #14109
2020-06-26 20:38:41 +02:00
Laurent Destailleur
6df049e05c
FIX #14112
2020-06-26 20:35:06 +02:00
Laurent Destailleur
8e324c36ff
Prepare 11.0.5
2020-06-26 19:39:01 +02:00
Laurent Destailleur
ee0bdde8c1
FIX Filter on status, closing opening status
2020-06-26 19:36:22 +02:00
Laurent Destailleur
d6346522b8
Code comment
2020-06-26 19:36:15 +02:00
Laurent Destailleur
be5729de23
FIX Filter on status, closing opening status
2020-06-26 19:35:09 +02:00
Laurent Destailleur
b0d46d0c4c
Code comment
2020-06-26 18:56:05 +02:00
Francis Appels
f4494db73f
Fix missing translate key
2020-06-26 17:34:11 +02:00
Laurent Destailleur
29ba9c82c3
Fix #14120
2020-06-26 17:17:13 +02:00
lvessiller
ad36447295
NEW can edit and set sales representatives directly on thirdparty card
2020-06-26 12:20:53 +02:00
stickler-ci
a8ad21c011
Fixing style errors.
2020-06-26 08:59:50 +00:00
Tobias Sekan
2bb8efa86f
Common behavior for monthly leave list view
2020-06-26 10:54:27 +02:00
gauthier
858a751eef
FIX : $_POST must be GETPOST
2020-06-26 10:51:04 +02:00
lvessiller
3eb695ffa8
NEW add region in export companies and contacts
2020-06-26 09:14:06 +02:00
Laurent Destailleur
e2b1b853c0
Minor performance enhancements
2020-06-26 01:44:21 +02:00
Laurent Destailleur
10a4188eff
Clean template
2020-06-26 01:14:24 +02:00
Alexandre SPANGARO
0c60c9fd0d
FIX: SQL Problem in social contribution list
2020-06-25 20:53:03 +02:00
Alexandre SPANGARO
62f55b8549
FIX: SQL Problem in supplier invoice list
2020-06-25 20:43:41 +02:00
lvessiller
c689b91539
FIX upload file in import module
2020-06-25 16:59:48 +02:00
Florian Mortgat
ccfe6f18fe
FIX 10.0 - fatal with postgres
...
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +02:00
stickler-ci
adb3cc72f9
Fixing style errors.
2020-06-25 12:44:57 +00:00
Tobias Sekan
289886cd29
missing update
2020-06-25 14:37:09 +02:00
Tobias Sekan
22f708b95a
Add search, sort, select for leave log view
2020-06-25 14:36:42 +02:00
Laurent Destailleur
e4922f38ab
Add missing extrafield and trigger in template invoice creation
2020-06-25 14:01:38 +02:00
Laurent Destailleur
a6ecf6dbbc
Fix syntax error
2020-06-25 12:18:57 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
18c23680f7
Fix bad object
2020-06-25 12:17:06 +02:00
Laurent Destailleur
2f5dbdc8a3
Fix bad property
2020-06-25 11:54:37 +02:00
Laurent Destailleur
bbb8c9418e
Fix bad property
2020-06-25 11:51:46 +02:00
Laurent Destailleur
e146d0fe21
Fix url
2020-06-25 02:51:14 +02:00
Laurent Destailleur
c32151d356
Prepare page for stock at date
2020-06-25 01:07:30 +02:00
Laurent Destailleur
ee5156034d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-24 20:03:40 +02:00
Laurent Destailleur
9c23890c26
Fix phpcs
2020-06-24 20:03:12 +02:00
Laurent Destailleur
02e022ebfa
Fix class not found for supplier credit. Class must be into
...
commoninvoice
2020-06-24 19:59:06 +02:00
Alexandre SPANGARO
ffaf7068d5
FIX: SQL Problem in customer invoice list
2020-06-24 14:03:16 +02:00
Laurent Destailleur
2865d6bd15
Fix set of free product
2020-06-24 13:39:00 +02:00
Laurent Destailleur
de62037ba5
Fix signed only in margin calculation of project
2020-06-24 12:58:10 +02:00
florian HENRY
77868ad2a3
fix entity on supplier order
2020-06-24 12:42:41 +02:00
florian HENRY
a7f022dcea
Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0
2020-06-24 12:24:55 +02:00
florian HENRY
8c1af0fdb8
fix enbtoty on supplier order
2020-06-24 12:24:47 +02:00
Maxime Kohlhaas
69b320f347
New : filter on progress column in task list
2020-06-24 10:17:46 +02:00
Laurent Destailleur
b6c1cdad7c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
1762e10e69
Fix return code not returned
2020-06-24 09:55:10 +02:00
Laurent Destailleur
a854d955b8
Fix rounding
2020-06-23 16:08:31 +02:00
Laurent Destailleur
0363717476
Fix PROJECT_ELEMENTS_FOR_MINUS_MARGIN
2020-06-23 16:05:00 +02:00
Laurent Destailleur
7c992eac5e
Fix option PROJECT_ELEMENTS_FOR_MINUS_MARGIN
2020-06-23 15:52:17 +02:00
Laurent Destailleur
d05c60baf0
Fix css
2020-06-23 14:33:34 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
4d2cbf7006
Fix alert picto of expired services not visible
...
Fix CSS
2020-06-23 11:27:40 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
daba55762f
Fix missing filter on status enabled
2020-06-22 13:07:34 +02:00
Laurent Destailleur
84d3d633e5
Fix typo
2020-06-22 11:34:54 +02:00
Laurent Destailleur
194a094d23
Fix deletion of a thirdparty must not delete the stripe account.
2020-06-22 11:32:58 +02:00
Regis Houssin
32844a8d0c
FIX clean code
2020-06-22 09:26:42 +02:00
lvessiller
bf338b4d4f
NEW show links for select and multi-select in category extra field
2020-06-22 08:57:52 +02:00
Laurent Destailleur
4cfb9dc7c5
css
2020-06-22 04:40:04 +02:00
Laurent Destailleur
058a0d4fa7
Fix look and feel v12
2020-06-22 04:27:16 +02:00
Laurent Destailleur
d816d45331
Look and feel v13
2020-06-22 04:10:13 +02:00
Laurent Destailleur
1ce5b78a6b
Fix error message not reported
2020-06-22 01:02:17 +02:00
Regis Houssin
9a4f5e3d9a
FIX We force "modify" for avoid some field not modify
2020-06-21 21:10:51 +02:00
Laurent Destailleur
0139a840ae
Fix setup
2020-06-21 20:49:34 +02:00
Laurent Destailleur
501fd2f7a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Regis Houssin
03fbd72d66
FIX For better compatibility with Samba4 AD
2020-06-21 19:52:15 +02:00
Marc Guenneugues
f86f4c1e1d
Change label of checkbox to be more explicit
2020-06-21 19:02:20 +02:00
Laurent Destailleur
cdcc87a565
Fix lang
2020-06-21 15:25:34 +02:00
Laurent Destailleur
d84fbb7165
css
2020-06-20 18:59:13 +02:00
Laurent Destailleur
3a0f950ad0
Fix phpcs
2020-06-20 18:46:49 +02:00
Laurent Destailleur
bb3320f103
FIX #14104
2020-06-20 18:34:19 +02:00
Laurent Destailleur
fe1f88d2ac
FIX #14092 #14093
2020-06-20 16:09:53 +02:00
Laurent Destailleur
ccc55dcb1e
Debug Receipt printer module and reduce duplicate translation key
2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
b54c18730b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
2020-06-20 12:25:08 +02:00
andreubisquerra
515d18020d
Add security check
2020-06-20 12:21:14 +02:00
andreubisquerra
532fe82c6e
Fix travis
2020-06-20 12:21:06 +02:00
jove@bisquerra.com
ad432e1e9b
Printable QR
2020-06-20 12:20:53 +02:00
Laurent Destailleur
70039d0c41
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-20 12:19:36 +02:00
Laurent Destailleur
450c340cb1
Trans
2020-06-20 12:19:25 +02:00
Laurent Destailleur
c919d3d5aa
Merge pull request #14100 from atm-florian/12_fixAdvTargetTplWarning
...
fix: warning and clean old code about multiselect category for advtarget tpl
2020-06-20 12:18:35 +02:00
Laurent Destailleur
378db9ab9a
Merge pull request #14099 from atm-florian/12.0
...
fix: same feature on thirdparty extrafields transport to invoice as existing on orders
2020-06-20 12:16:57 +02:00
Laurent Destailleur
5a53a16c17
Merge pull request #14101 from mistraloz/patch-5
...
Fix: Bug when delete payment when already deleted in account
2020-06-20 12:15:59 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php
2020-06-20 12:15:48 +02:00
Laurent Destailleur
8eb23c5ee5
Merge pull request #14103 from atm-florian/12_fix_invoicelist_filterbySalesRep
...
fix f.fk_user_author unknow because after stange join with coma
2020-06-20 12:14:48 +02:00
Laurent Destailleur
2de3eb8ac0
Fix CSS
2020-06-20 00:00:17 +02:00
Laurent Destailleur
d632f1c6b2
Fix url
2020-06-19 23:08:29 +02:00
Laurent Destailleur
d8927143fa
Fix chrome style
2020-06-19 20:01:57 +02:00
Laurent Destailleur
f24e73141e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc
FIX #13877
2020-06-19 14:50:33 +02:00
Laurent Destailleur
989737af6b
Update website templates
2020-06-19 10:36:19 +02:00
florian HENRY
07923e0baf
fix f.fk_user_author unknow because after stange join with coma
2020-06-19 10:08:19 +02:00
florian HENRY
c2920083d8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fixAdvTargetTplWarning
2020-06-19 09:49:50 +02:00
florian HENRY
29c049e358
set correct global conf
2020-06-19 09:49:43 +02:00
Laurent Destailleur
01914980d9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/notice.php
2020-06-19 00:45:06 +02:00
Laurent Destailleur
623a9db4e7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/composition/card.php
htdocs/public/notice.php
2020-06-19 00:42:20 +02:00
Laurent Destailleur
22ca5e0671
Fix XSS reported by C. Weiler <sak1.s3curity@gmail.com> in notice.php
2020-06-19 00:39:27 +02:00
Laurent Destailleur
b8c0ed13f3
Fix can't find link to generate barcode sheets
2020-06-19 00:25:59 +02:00
Mistral Oz - LWEP
2f7bb18e2b
Fix: Bug when delete payment when already deleted in account
...
Related to :
https://github.com/Dolibarr/dolibarr/blame/11.0/htdocs/compta/bank/class/account.class.php#L1976
Mistake between id / rowid. I prefere add the fix here (but a fix in account class can be also a good fix).
And best fix may use setter to do it (but to complicated : maybe latter ? i may check it in september if you want in all CommonObject properties)
2020-06-18 20:56:46 +02:00
florian HENRY
7fef9a813e
fix warning and clean old code about multiselect category
2020-06-18 20:03:03 +02:00
florian HENRY
a705cc41ae
fix: same feature on invoice as on orders
2020-06-18 19:44:24 +02:00
florian HENRY
835f6d42d8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0
2020-06-18 19:42:34 +02:00
florian HENRY
e82d71c949
fix: same feature on invoice as on orders
2020-06-18 19:42:23 +02:00
Laurent Destailleur
b9218a1c4c
Debug v12
2020-06-18 19:21:21 +02:00
Laurent Destailleur
4cfe1fcd6b
Typo
2020-06-18 15:57:50 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
c1a9826455
Fix color of tags
2020-06-18 15:33:52 +02:00
Laurent Destailleur
531bfe217b
Merge fields
2020-06-18 15:11:35 +02:00
Laurent Destailleur
6e761d5c98
Can get first image from index using a path without name
2020-06-18 15:07:43 +02:00
Laurent Destailleur
c986ab95cf
FIX Edit of a time spent line
2020-06-18 14:09:43 +02:00
Laurent Destailleur
ade542eee7
Sync language
2020-06-18 10:05:00 +02:00
Laurent Destailleur
fded55ddef
Fix sepa supplier count
2020-06-18 03:44:26 +02:00
Laurent Destailleur
eef07afc90
Try to solve pb with too many columns. Merge 2 columns of amounts in 1
2020-06-18 03:32:13 +02:00
Laurent Destailleur
a4059882a9
Fix update pagination
2020-06-18 03:03:02 +02:00
Laurent Destailleur
1ed649ff28
Fix tooltip on project not visible sometimes
2020-06-18 02:50:46 +02:00
Laurent Destailleur
a5ce3ada0a
Keep feature experimental as it need a lot of change
2020-06-18 02:35:08 +02:00
Laurent Destailleur
c0b269b9ee
Fix Permissions on MO and API for MO
2020-06-18 01:09:30 +02:00
Laurent Destailleur
dc70cab2cb
Fix tooltip
2020-06-17 22:29:05 +02:00
Laurent Destailleur
42860d752c
Fix templates
2020-06-17 22:11:22 +02:00
Laurent Destailleur
6c2d70d43b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 19:27:39 +02:00
Laurent Destailleur
54596d2286
FIX #13967
2020-06-17 19:26:17 +02:00
Laurent Destailleur
de5a2d738b
FIX #14001
2020-06-17 18:39:25 +02:00
Laurent Destailleur
32eaa9137c
FIX #14034
2020-06-17 18:29:29 +02:00
Laurent Destailleur
2f687a3c40
FIX #14033
2020-06-17 17:57:32 +02:00
Laurent Destailleur
adb988a18b
FIX Add missing label of event for #14094 . Still missing link to object
2020-06-17 15:45:26 +02:00
Laurent Destailleur
13cdd5bc45
FIX #14095
2020-06-17 15:42:55 +02:00
Laurent Destailleur
8f4a181380
css
2020-06-17 15:35:52 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 13:42:38 +02:00
Laurent Destailleur
fdbb6debc9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-17 13:30:43 +02:00
Laurent Destailleur
6660923e94
FIX Privilege escalation reported by wizlynx WLX-2020-011
2020-06-17 13:29:43 +02:00
Laurent Destailleur
d863f9a7ad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 13:04:34 +02:00
Laurent Destailleur
7d3c176727
Prepare convertion of field "montant" into "amount"
2020-06-17 12:45:56 +02:00
Laurent Destailleur
9f69e31950
Merge pull request #14089 from atm-quentin/NEW_hide_contract_closed_lines
...
NEW hide closed contract lines
2020-06-17 12:11:00 +02:00
Florian Mortgat
3d69a1dc70
FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn
2020-06-17 11:06:31 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
bbbcd5b6b3
Fix phpcs
2020-06-16 22:48:19 +02:00
Xebax
5d76b4781e
FIX Upload of documents for members using the REST API.
2020-06-16 22:48:14 +02:00
Laurent Destailleur
64b2a2d92f
Fix phpcs
2020-06-16 22:46:36 +02:00
Laurent Destailleur
18d20f3a0e
Merge pull request #14080 from EuskalMoneta/develop
...
FIX Upload of documents for members using the REST API.
2020-06-16 22:43:19 +02:00
Laurent Destailleur
f0e4fa40f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:42:07 +02:00
Laurent Destailleur
b90a45ed7a
Complete #14078
2020-06-16 22:41:50 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2
2020-06-16 22:40:45 +02:00
Laurent Destailleur
6ea4928c79
Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports
...
11.0 - FIX - missing currency columns in supplier exports
2020-06-16 22:00:56 +02:00
Laurent Destailleur
cbd99ea7a2
FIX #14088
2020-06-16 21:57:49 +02:00
Laurent Destailleur
e8b44ef89e
css
2020-06-16 17:55:46 +02:00
gauthier
e50d239322
FIX : force rounding 2 on export ld compta
2020-06-16 11:40:01 +02:00
Florian Mortgat
18d5ec7750
11.0 - FIX - missing currency columns in supplier exports
...
(copy-pasted from modFacture.class.php)
2020-06-16 10:56:10 +02:00
stickler-ci
3384763c6b
Fixing style errors.
2020-06-16 08:54:50 +00:00
atm-quentin
e3d94d44ab
NEW hide closed contract lines
2020-06-16 10:45:49 +02:00
Laurent Destailleur
9ec8051a37
NEW Add param to not show links when output tags
2020-06-16 02:56:48 +02:00
Laurent Destailleur
e28bbfbd63
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-15 16:10:49 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
7b64e8643f
Trans and css
2020-06-15 16:08:48 +02:00
Laurent Destailleur
40e16672e3
FIX BlindBoolean SQL injection reported by Christian Weiler
...
<sak1.s3curity@gmail.com>
2020-06-15 15:08:52 +02:00
Laurent Destailleur
1736ecfa26
Fix phpcs
2020-06-15 04:32:59 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507
Fix escape fields
2020-06-14 21:49:25 +02:00
Laurent Destailleur
f9da31e658
Fix rounding
2020-06-14 21:49:19 +02:00
Laurent Destailleur
83263cc174
Fix supplier sepa
2020-06-14 21:49:12 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
Laurent Destailleur
abb8cd260f
Fix escape fields
2020-06-14 21:22:44 +02:00
Laurent Destailleur
c22a9781d8
Fix rounding
2020-06-14 21:21:18 +02:00
Laurent Destailleur
f0ca29cc6e
Fix supplier sepa
2020-06-14 21:19:31 +02:00
Xebax
a22c89da96
FIX Upload of documents for members using the REST API.
2020-06-14 14:58:09 +02:00
stickler-ci
79a7e4c149
Fixing style errors.
2020-06-13 07:44:48 +00:00
DEMAREST Maxime (Indelog)
9217ec47dc
Fix replace loan_calcmens() by loanCalcMonthlyPayment()
2020-06-13 09:33:02 +02:00
DEMAREST Maxime (Indelog)
44445ff9e6
Fix stickler
2020-06-13 09:32:54 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2
Fix and improvement on Loan module
...
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
with the new value.
* Can't modify interest in payment if schedule is used (causes the
inconsistency for value in schedule).
* User right verification on schedule page.
2020-06-13 09:32:44 +02:00
Laurent Destailleur
b763b40d8c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 19:37:27 +02:00
Laurent Destailleur
2c327aae66
Prepare v12
2020-06-12 19:30:23 +02:00
Laurent Destailleur
b7e7ccee54
Update demo
2020-06-12 18:55:36 +02:00
Laurent Destailleur
c90ab62989
Fix We must include version into filename
2020-06-12 15:31:12 +02:00
Laurent Destailleur
2a20fc3968
Fix missing author into export_alias
2020-06-12 15:27:28 +02:00
Laurent Destailleur
c9cb978c39
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 15:21:06 +02:00
Laurent Destailleur
9bb5135317
Fix We never add .noexe of files into medias dir
2020-06-12 15:20:28 +02:00
Laurent Destailleur
72130dacb9
Merge pull request #14061 from atm-gauthier/10.0_fix_progress_pdf
...
FIX : percent must be displayed on one line
2020-06-12 14:50:49 +02:00
Laurent Destailleur
acd0abf1ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 14:36:34 +02:00
Laurent Destailleur
6e81542148
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 14:36:11 +02:00
Laurent Destailleur
5d5fb46af6
Fix We never add .noexe of files into medias dir
2020-06-12 14:35:50 +02:00
Laurent Destailleur
1ba03566dc
Fix case of delete contact not correctly implemented.
2020-06-12 02:15:02 +02:00
Laurent Destailleur
cc9a964b5d
Update products.lang
2020-06-12 01:58:47 +02:00
Laurent Destailleur
a0b6d9c4e0
css
2020-06-12 01:19:50 +02:00
Laurent Destailleur
dc87d89204
Update 12.0.0-13.0.0.sql
2020-06-12 01:03:58 +02:00
Laurent Destailleur
c27eb5e623
Update llx_const.sql
2020-06-12 01:03:34 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-12 01:00:15 +02:00
Laurent Destailleur
012574b487
Update html.form.class.php
2020-06-12 00:51:19 +02:00
Laurent Destailleur
77c1c46285
Merge pull request #14032 from ptibogxiv/patch-343
...
NEW convert all subscription in datetime
2020-06-12 00:47:55 +02:00
Laurent Destailleur
d7cbd8a1d4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-11 23:41:43 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/takepos/admin/setup.php
2020-06-11 23:36:55 +02:00
Laurent Destailleur
0023d14e65
Merge pull request #14037 from OPEN-DSI/v10-fix-takepos-free-text-html
...
FIX free text on cash desk
2020-06-11 23:33:31 +02:00
Laurent Destailleur
3527d011f5
Merge pull request #14006 from bafbes/abb110215
...
fix:The label must be a dictionary key
2020-06-11 23:15:52 +02:00
Laurent Destailleur
4b47a270af
Update index.php
2020-06-11 23:15:00 +02:00
Laurent Destailleur
073a4acd10
Merge pull request #14058 from indelog/showmailpj
...
NEW Add show preview for mail attachement on form mail
2020-06-11 23:09:26 +02:00
Laurent Destailleur
ffb345e724
Merge pull request #14062 from atm-florianm/11.0_FIX_missing_translation
...
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
2020-06-11 23:05:55 +02:00
Laurent Destailleur
83df96f7d1
Merge pull request #14054 from OPEN-DSI/fix-takepos-terminal-free-text
...
FIX replace filter parameter "none" by "restricthtml" on cash desk
2020-06-11 23:02:46 +02:00
Laurent Destailleur
9aafb82fd3
Merge pull request #14059 from atm-florianm/FIX_10.0_missing_global_langs_when_activating_modContrat
...
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
2020-06-11 23:02:19 +02:00
Laurent Destailleur
3698af39f1
Merge pull request #14060 from indelog/fix_measuringunitstring
...
Fix 11.0 - undef func measuringUnitString() in From::select_produits_fournis…
2020-06-11 23:02:01 +02:00
Laurent Destailleur
7d4a7a4be0
Merge pull request #14067 from atm-john/11.0_fix_ticket_file_save
...
Fix ticket file save
2020-06-11 23:01:33 +02:00
Laurent Destailleur
f1f37c7b29
Merge pull request #14064 from atm-florianm/FIX_11.0_postgresql_fatal_on_contact_agenda
...
FIX 11.0 - fatal with postgres on contact/agenda.php
2020-06-11 23:01:01 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php
2020-06-11 22:58:58 +02:00
Anthony Berton
c00b55c980
Update 11.0.0-12.0.0.sql
2020-06-11 18:45:35 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:44:38 +02:00
Anthony Berton
94e7fc20be
Create html.form.class.php
2020-06-11 18:41:52 +02:00
Anthony Berton
ce7767a154
Create 11.0.0-12.0.0.sql
2020-06-11 18:39:44 +02:00
Anthony Berton
3214b5f199
Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:37:25 +02:00
Laurent Destailleur
ee611fa7a0
Fix bad definition of field for parent
2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507
Fix bad definition of field for parent
2020-06-11 18:31:26 +02:00
Laurent Destailleur
c70cd01971
Fix css
2020-06-11 17:58:00 +02:00
Laurent Destailleur
3831b56423
Missing tags
2020-06-11 17:07:41 +02:00
Laurent Destailleur
78204f92e6
Fix tag
2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a
Fix tag at bad place
2020-06-11 16:59:24 +02:00
Regis Houssin
997cb214f1
FIX avoid error "Call to undefined function measuringUnitString()"
2020-06-11 16:52:24 +02:00
Laurent Destailleur
503206af88
Fix analytics tag
2020-06-11 16:38:58 +02:00
Anthony Berton
4a77d06b1e
o
2020-06-11 15:45:31 +02:00
Anthony Berton
182a34616f
Add files via upload
2020-06-11 15:39:05 +02:00
Anthony Berton
848c9df537
Add files via upload
2020-06-11 15:38:05 +02:00
Anthony Berton
9d43827844
Revert "Delete html.form.class.php"
...
This reverts commit aa275f2a79 .
2020-06-11 15:18:10 +02:00
Laurent Destailleur
a48f263af2
Fix phpcs
2020-06-11 13:58:12 +02:00
Laurent Destailleur
5bc9e656bf
Fix phpcs
2020-06-11 13:03:21 +02:00
Laurent Destailleur
6a3547f8af
css
2020-06-11 02:11:17 +02:00
Laurent Destailleur
5b882e333d
Fix tooltip on localtaxes
2020-06-10 23:00:17 +02:00
Laurent Destailleur
e94ef09977
css
2020-06-10 22:24:15 +02:00
Laurent Destailleur
5e13a7f1e2
css
2020-06-10 22:05:49 +02:00
ATM john
564b9df1e7
Fix ticket file save
2020-06-10 17:01:57 +02:00
gauthier
58ff96af30
FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php
2020-06-10 16:48:02 +02:00
Florian Mortgat
5bc80f8626
FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax
2020-06-10 16:22:48 +02:00
Laurent Destailleur
5794b1abea
Fix for use with text browser
...
Conflicts:
htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
9bbdaffe9d
FIX Sharing buttons
2020-06-10 12:45:02 +02:00
Laurent Destailleur
bd22ad4174
Fix for use with text browser
2020-06-10 12:35:39 +02:00
Laurent Destailleur
764b8a15de
FIX Sharing buttons
2020-06-10 00:01:41 +02:00
Laurent Destailleur
4b2a570a23
Error message
2020-06-09 22:44:25 +02:00
Laurent Destailleur
a86e209a75
Fix message
2020-06-09 22:43:37 +02:00
Laurent Destailleur
c175fbd697
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/website/class/website.class.php
htdocs/website/index.php
2020-06-09 22:09:57 +02:00
Laurent Destailleur
a9b85222c0
NEW The global header of a website can also have dynamic content
2020-06-09 22:07:06 +02:00
Laurent Destailleur
756ef0b583
Fix disallow < > into meta info
...
Fix message page regenerated
2020-06-09 21:43:42 +02:00
Florian Mortgat
d19febc2ca
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
2020-06-09 17:34:24 +02:00
gauthier
92b89437d1
FIX : percent must be displayed on one line
2020-06-09 16:02:41 +02:00
DEMAREST Maxime (Indelog)
1ac341e651
Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list
2020-06-09 15:33:10 +02:00
Florian Mortgat
0a2099e0ac
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
2020-06-09 14:22:32 +02:00
DEMAREST Maxime (Indelog)
e628730a3f
Add show preview for mail attachement on form mail
2020-06-09 11:35:46 +02:00
Laurent Destailleur
0f1447cf05
Fix position of clone
2020-06-08 23:42:48 +02:00
Laurent Destailleur
738fa35471
Fix clone web site
2020-06-08 23:37:49 +02:00
Laurent Destailleur
063b3263cc
Trans
2020-06-08 23:12:45 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
Laurent Destailleur
233c7e53f1
Debug v12
2020-06-08 20:31:09 +02:00
Laurent Destailleur
cf976a2b98
Fix translation
2020-06-08 17:00:58 +02:00
stickler-ci
b4dd11ec98
Fixing style errors.
2020-06-08 14:00:57 +00:00
atm-quentin
3dd7c81f54
FIX stickler
2020-06-08 15:58:20 +02:00
Laurent Destailleur
f4f0da6de2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39
Show more info to help fix corrupted data
2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1
Error message
2020-06-08 15:12:07 +02:00
Laurent Destailleur
2e06ce306a
Tooltip
2020-06-08 15:03:10 +02:00
atm-quentin
69db790cf5
NEW multiselect type and date to date filter
2020-06-08 14:43:14 +02:00
Laurent Destailleur
aed5e8a4ce
fix url
2020-06-08 12:25:17 +02:00
Laurent Destailleur
70bdd59548
Fix trans
2020-06-08 11:52:43 +02:00
VESSILLER
f010184008
FIX replace filter parameter "none" by "restricthtml"
2020-06-08 11:48:31 +02:00
Laurent Destailleur
c386f4b2e3
Maxi debug of direct debit order
2020-06-08 11:43:20 +02:00
Laurent Destailleur
a70e493c5d
Migration
2020-06-08 11:43:00 +02:00
VESSILLER
7bba9db2f0
FIX replace filter parameter "none" by "restricthtml"
2020-06-08 11:28:05 +02:00
Laurent Destailleur
c41e4d9b15
Fix page disabled
2020-06-07 23:25:12 +02:00
Laurent Destailleur
6ec2ff01f1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/website/index.php
2020-06-07 23:15:13 +02:00
Laurent Destailleur
f7563818ac
css
2020-06-07 23:12:56 +02:00
Laurent Destailleur
7ce7905d31
Fix check for mrp
2020-06-07 23:03:58 +02:00
Laurent Destailleur
87a60a501f
Security on disabling a web page
2020-06-07 23:00:38 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
9f8a3916c2
FIX #14051 #14052
2020-06-07 19:37:42 +02:00
Laurent Destailleur
09047dc19c
Doc
2020-06-07 19:26:37 +02:00
Laurent Destailleur
81c80b254e
Fix lang property on database menu entry was not propagated
2020-06-07 19:25:25 +02:00
Laurent Destailleur
5e6ce8ea70
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-07 18:59:57 +02:00
Laurent Destailleur
941362e683
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
2a1d547267
Celan dead code
2020-06-07 18:44:37 +02:00
Laurent Destailleur
4020d97362
FIX Can create a credit note on situation invoice if previous is also
...
credit note
2020-06-07 18:36:58 +02:00
Laurent Destailleur
180a0a4557
Info for debug
2020-06-07 18:30:46 +02:00
ptibogxiv
37007d6d1a
Update subscription.class.php
2020-06-07 16:12:28 +02:00
Marc Guenneugues
bd12972d7b
replenish : select expedition quantities only from opened orders when using virtual stocks
2020-06-07 14:14:11 +02:00
Vaadasch
7b53ee2a6f
Update byratecountry.php
...
Add "cc.code" in the "GROUP BY" clause. Error in PGSQL if absent.
Add ORDER BY country / product_type / vatrate
2020-06-07 14:13:57 +02:00
Laurent Destailleur
e17818c3dd
Merge pull request #14048 from simicar29/11.0-replenish
...
replenish : select expedition quantities only from opened orders when…
2020-06-07 14:12:38 +02:00
Laurent Destailleur
42d44e996f
Fix link to setup page
2020-06-07 13:50:58 +02:00
Laurent Destailleur
f2e54b9ad5
Fix link to setup page
2020-06-07 13:49:49 +02:00
Laurent Destailleur
04f68d25cd
css
2020-06-07 01:34:26 +02:00
Laurent Destailleur
4169aa716c
FIX can install module even if (x) was appended during download.
2020-06-07 00:23:20 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
115b827115
Prepare v12
2020-06-06 22:52:36 +02:00
Laurent Destailleur
e9a0b0c290
Merge pull request #14029 from atm-maxime/fix_user_validator_test
...
Fix missing test on module enabled for user validators
2020-06-06 22:23:30 +02:00
Laurent Destailleur
30ea9a497d
Merge pull request #14030 from atm-maxime/fix_contact_update_socialnetworks
...
Fix #14027 : emptying social network value on contact wasn't working
2020-06-06 21:57:32 +02:00
Laurent Destailleur
b221c65165
Merge
2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-06 21:52:55 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php
2020-06-06 21:47:27 +02:00
Laurent Destailleur
38d95aa5cd
Update societe.class.php
2020-06-06 21:45:53 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php
2020-06-06 21:41:33 +02:00
Laurent Destailleur
87806346c7
Update commonobject.class.php
2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da
Update commonobject.class.php
2020-06-06 21:37:53 +02:00
Laurent Destailleur
af440b7c49
Update societe.class.php
2020-06-06 21:32:25 +02:00
Laurent Destailleur
a66926cf08
Update commonobject.class.php
2020-06-06 21:30:08 +02:00
Laurent Destailleur
4f2af3bf67
Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets
...
FIX : Tickets mail models doesn't work
2020-06-06 21:24:04 +02:00
Laurent Destailleur
30c6ae394b
Update html.formticket.class.php
2020-06-06 21:23:35 +02:00
Laurent Destailleur
cd8dd236f4
Merge pull request #14028 from aspangaro/10.0_p38
...
FIX: Show ref_customer, amount on contract link object
2020-06-06 21:22:11 +02:00
Laurent Destailleur
a5b74189e6
Merge pull request #14031 from atm-florianm/10.0_FIX_copy_payment_value_date_on_account_line
...
FIX: copy value date of VariousPayment onto the new AccountLine
2020-06-06 21:19:11 +02:00
Laurent Destailleur
f30b522ab6
Merge pull request #14035 from OPEN-DSI/new-takepos-terminal-free-text
...
NEW add free text on each terminal of cash desk
2020-06-06 21:10:56 +02:00
Laurent Destailleur
f19064abfa
Merge pull request #14044 from dolibit-ut/patch-29
...
create index.html
2020-06-06 21:08:11 +02:00
Laurent Destailleur
4e4e7a38c3
Merge pull request #14041 from bb2a/VCARD
...
NEW add vcard for aderent and user
2020-06-06 20:58:37 +02:00
Laurent Destailleur
233810d41d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 20:37:36 +02:00
Laurent Destailleur
123265bf4c
Fix redirect url in multilang
2020-06-06 20:37:17 +02:00
Laurent Destailleur
148bdec96f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 20:25:24 +02:00
Laurent Destailleur
fb02edf254
Fix For select language component, we force on root
2020-06-06 20:25:05 +02:00
Laurent Destailleur
788ec1f87d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 20:18:51 +02:00
Laurent Destailleur
34778937c3
Fix link to image
2020-06-06 20:16:07 +02:00
Laurent Destailleur
f00b2d1e6f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 20:11:57 +02:00
Laurent Destailleur
2d87da8815
Fix link
2020-06-06 20:11:01 +02:00
Laurent Destailleur
88aaec63f7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 18:57:41 +02:00
Laurent Destailleur
7061e9b4cb
Fix deletion of website page
2020-06-06 18:57:24 +02:00
Laurent Destailleur
e31e889595
Add url in error message
2020-06-06 18:30:04 +02:00
florian HENRY
0943b13ecc
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-06-06 17:51:31 +02:00
Laurent Destailleur
36bc266d67
css
2020-06-06 17:33:26 +02:00
Laurent Destailleur
3197f717c3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 17:12:58 +02:00
Laurent Destailleur
dd5b5e9bbf
Fix lang suggested in clone of page
2020-06-06 17:12:37 +02:00
Laurent Destailleur
5669eb81af
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 15:39:50 +02:00
Laurent Destailleur
919cc0da87
Fix num payment
2020-06-06 15:39:18 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Marc Guenneugues
cefc8dcca2
replenish : select expedition quantities only from opened orders when using virtual stocks
2020-06-06 11:39:49 +02:00
Laurent Destailleur
5dd9f4e4c4
Fix travis false positive
2020-06-06 11:36:24 +02:00
UT from dolibit
38b359392a
create index.html
2020-06-06 02:06:55 +02:00
Laurent Destailleur
2344435416
Fix XSS CWE-ID CWE-79
2020-06-05 23:41:29 +02:00
Laurent Destailleur
a59961dae6
Fix td alignment
2020-06-05 23:06:59 +02:00
Anthony Berton
ee10c6f10b
vcard
2020-06-05 17:57:13 +02:00
Laurent Destailleur
4fcaaa3387
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-05 17:48:02 +02:00
Laurent Destailleur
ca3f62e4ac
Doc repair Row size too large
2020-06-05 17:47:52 +02:00
Alexandre SPANGARO
e5f8f38fbf
FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon
2020-06-05 17:24:59 +02:00
VESSILLER
81fbb80823
FIX end div for responsive table
2020-06-05 14:20:38 +02:00
Laurent Destailleur
d252248319
Fix back to link in ECM menu
...
Fix picto in search_page
2020-06-05 13:41:33 +02:00
VESSILLER
ded7b79a6f
FIX free text on cash desk
2020-06-05 12:10:03 +02:00
VESSILLER
304c44560d
NEW add free text on each terminal of cash desk
2020-06-05 10:47:45 +02:00
Laurent Destailleur
b75700cc0b
Fix virtualstock activation when MRP module is on
2020-06-05 10:27:34 +02:00
Laurent Destailleur
630525b59c
css
2020-06-05 02:22:16 +02:00
florian HENRY
699557adbe
forget[]
2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737
forget[]
2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a
Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0
2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d
Fixing style errors.
2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c
fix comment
2020-06-04 20:20:43 +02:00
florian HENRY
9a3e68b594
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-06-04 20:14:29 +02:00
florian HENRY
7115bd7033
better fix
2020-06-04 20:14:19 +02:00
Laurent Destailleur
c7a614bd50
Fix clean data
2020-06-04 17:07:22 +02:00
ptibogxiv
319710d6aa
Update 12.0.0-13.0.0.sql
2020-06-04 16:50:24 +02:00
ptibogxiv
7da6a063f9
Update llx_subscription.sql
2020-06-04 16:46:36 +02:00
Florian Mortgat
c393f8149c
FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date
2020-06-04 11:29:51 +02:00
Alexandre SPANGARO
ede084a111
Fix stickler
2020-06-04 05:11:00 +02:00
Maxime Kohlhaas
f6e0ed08e2
Fix #14027 : emptying social network value on contact wasn't working
2020-06-04 00:30:17 +02:00
Maxime Kohlhaas
e19f496d62
Fix missing test on module enabled for user validators
2020-06-03 23:30:06 +02:00
Alexandre SPANGARO
9e5c7d0acf
FIX: Show ref_customer, amount on contract link object
2020-06-03 23:00:53 +02:00
Laurent Destailleur
bd56210e97
doc
2020-06-03 19:24:26 +02:00
Laurent Destailleur
7f1fea1e09
Add json-ld structure 'qa'
2020-06-03 19:23:36 +02:00
Laurent Destailleur
474860d546
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59
Fix webp support
2020-06-03 14:05:18 +02:00
Laurent Destailleur
8023bc2fbb
Fix cancel in media filemanager
2020-06-03 12:39:06 +02:00
Laurent Destailleur
51c578840c
Fix cancel in media filemanager
2020-06-03 12:39:00 +02:00
Laurent Destailleur
ae3d786593
Fix crop on media file manager
...
Conflicts:
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/photos_resize.php
htdocs/theme/eldy/global.inc.php
2020-06-03 12:38:42 +02:00
Laurent Destailleur
93320deddc
Fix cancel in media filemanager
2020-06-03 12:34:09 +02:00
Laurent Destailleur
66df7fca41
Fix cancel in media filemanager
2020-06-03 11:40:51 +02:00
Laurent Destailleur
8894570054
Fix crop on media file manager
2020-06-03 11:20:59 +02:00
Laurent Destailleur
f92426034f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:06:27 +02:00
Laurent Destailleur
2965dda815
Typo
2020-06-03 01:02:48 +02:00
Laurent Destailleur
a37a4031e9
FIX Delete of website page need permission. Conflict with mass action.
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1
FIX Delete of website page need permission. Conflict with mass action.
2020-06-03 00:46:09 +02:00
Laurent Destailleur
71cb17b58b
css
2020-06-02 20:58:56 +02:00
Laurent Destailleur
3755c7d25b
css
2020-06-02 20:58:18 +02:00
Laurent Destailleur
9e6bb6f784
Sanitize params
2020-06-02 20:19:45 +02:00
Laurent Destailleur
a2287b3061
Trans
2020-06-02 20:19:14 +02:00
gauthier
68bb552dcc
FIX : Tickets mail models doesn't work
2020-06-02 17:06:49 +02:00
Laurent Destailleur
054d5c5f4c
css
2020-06-02 17:00:08 +02:00
Laurent Destailleur
a9973ad60e
Fix language key and css
2020-06-02 15:30:07 +02:00
Laurent Destailleur
658e7a2f87
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-02 13:32:09 +02:00
Laurent Destailleur
9a30d4ca44
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-02 13:32:02 +02:00
Laurent Destailleur
9651b5a7c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-02 13:31:33 +02:00
Laurent Destailleur
3b4fe0d582
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/product/class/html.formproduct.class.php
2020-06-02 13:31:22 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php
2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php
2020-06-02 12:12:07 +02:00
Laurent Destailleur
c6a53d9b3d
Update pdf_blochet.class.php
2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0
Fix line heiht overflow for blochet template
...
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
2020-06-02 11:17:37 +02:00
atm-lena
ae9c490134
Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_NEW_AddHook_SelectWarehouses
2020-06-02 09:55:56 +02:00
atm-lena
99b4bfc91e
Movement of hook "selectwarehouse"
2020-06-02 09:53:30 +02:00
Laurent Destailleur
cd4c161ca7
Merge pull request #14005 from bafbes/abb110214
...
Fix:To get translated, the key need to be one single word
2020-06-01 21:09:53 +02:00
Laurent Destailleur
9a6b2f9dd7
Merge pull request #14004 from bafbes/abb110213
...
new:DEFAULT_WAREHOUSE to define default in warehouse selections
2020-06-01 21:05:48 +02:00
Laurent Destailleur
ebc65f7df7
Update stockcorrection.tpl.php
2020-06-01 21:05:32 +02:00
Laurent Destailleur
6ddabd51c0
Update commonobject.class.php
2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf
fix:le résultat de explode est troujours un array
2020-06-01 21:02:45 +02:00
Laurent Destailleur
14a3ab68e6
Merge pull request #14008 from bafbes/abb110217
...
fix:the result of explode is always an array
2020-06-01 21:02:15 +02:00
Laurent Destailleur
d3a769a0ab
Update commonobject.class.php
2020-06-01 21:02:05 +02:00
bahfir abbes
cb551cfd5a
fix:non editable fields must not be editable in creation either
2020-06-01 20:58:20 +02:00
Laurent Destailleur
56e5a3dae6
Merge pull request #14009 from bafbes/abb110218
...
fix:non editable fields must not be editable in creation either
2020-06-01 20:57:55 +02:00
Laurent Destailleur
bdeee9ea99
Merge pull request #14007 from bafbes/abb110216
...
fix:replace some bd field types by their correspondant field type
2020-06-01 20:55:06 +02:00
Laurent Destailleur
52d0c1a9ae
Update index.php
2020-06-01 20:54:24 +02:00
Laurent Destailleur
0f5eed60a2
Update commonobject.class.php
2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752
fix:bad database quotation for booleans
2020-06-01 20:40:51 +02:00
Laurent Destailleur
9bf69f11c4
Merge pull request #14010 from bafbes/abb110220
...
fix:bad database quotation for booleans
2020-06-01 20:39:58 +02:00
Laurent Destailleur
2dac87621a
Update commonobject.class.php
2020-06-01 20:39:49 +02:00
Laurent Destailleur
33859bac2c
Merge pull request #14012 from andreubisquerra/master
...
TakePOS QR customer menu
2020-06-01 20:37:29 +02:00
Laurent Destailleur
69c3b4b4ea
Merge pull request #14015 from ptibogxiv/patch-342
...
FIX php error
2020-06-01 20:17:22 +02:00
Laurent Destailleur
b20e8b9d6b
Merge pull request #14013 from bafbes/abb110222
...
fix:this is required to navigate by id
2020-06-01 20:15:48 +02:00
Laurent Destailleur
0362d28cf7
Update commonobject.class.php
2020-06-01 20:13:27 +02:00
Laurent Destailleur
5141fe0a74
Merge pull request #14017 from andreubisquerra/12.0
...
Fix QR and add QR customer menu
2020-06-01 20:07:21 +02:00
andreubisquerra
b0f904508a
Fix travis
2020-06-01 17:52:38 +02:00
Florian Mortgat
3213148d87
FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message
2020-06-01 17:12:02 +02:00
andreubisquerra
8abe60db0b
Add Restaurant QR menu
2020-06-01 17:05:22 +02:00
andreubisquerra
3cc249a887
Update QR
2020-06-01 17:04:23 +02:00
andreubisquerra
5325971517
Update settings
2020-06-01 17:02:11 +02:00
andreubisquerra
c60982ce60
Update langs
2020-06-01 16:58:05 +02:00
Laurent Destailleur
2324834b73
Debug modulebuilder for doc generation
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
38001a4e89
Fix perms
2020-06-01 16:46:11 +02:00
Laurent Destailleur
58e76947ac
Debug modulebuilder for doc generation
2020-06-01 16:44:22 +02:00
Laurent Destailleur
b648f30482
Fix perms
2020-06-01 14:52:26 +02:00
Laurent Destailleur
adb20c6a90
checkstyle
2020-06-01 12:36:09 +02:00
Laurent Destailleur
c4d8f0b6cc
css
2020-06-01 12:35:27 +02:00
florian HENRY
c655720b78
fix travis
2020-06-01 10:51:50 +02:00
florian HENRY
2337d75d92
better fix for #13968
2020-06-01 10:43:57 +02:00
florian HENRY
face2d644e
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-06-01 10:05:07 +02:00
Laurent Destailleur
c8d0476728
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908
Fix several troubles into numbering modules.
...
Prefix for takepos moved from TK to TC (TK was already used for tasks)
2020-06-01 04:02:47 +02:00
Laurent Destailleur
838a13cec1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-01 02:41:11 +02:00
Laurent Destailleur
5a8c4ad3f5
Debug modulebuilder
2020-06-01 00:01:23 +02:00
Laurent Destailleur
4af17a342c
Doc
2020-06-01 00:00:24 +02:00
Laurent Destailleur
e83b754e6f
Debug modulebuilder
2020-05-31 23:32:36 +02:00
Laurent Destailleur
f63aa7f527
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
2020-05-31 23:27:20 +02:00
Laurent Destailleur
28df07225d
Debug modulebuilder
2020-05-31 23:23:56 +02:00
Laurent Destailleur
3349144f5e
Fix lose enabled and default when editing field signatures in
...
modulebuilder
2020-05-31 23:23:42 +02:00
Laurent Destailleur
67f007ea40
Fix length of field. Make some module die.
2020-05-31 23:12:26 +02:00
Laurent Destailleur
62dacfa713
Debug modulebuilder
2020-05-31 23:11:49 +02:00
Laurent Destailleur
c04903d15c
Fix debug modulebuilder for doc and ref generation
...
Conflicts:
htdocs/core/class/commonobject.class.php
2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae
Fix debug modulebuilder for doc and ref generation
2020-05-31 22:59:33 +02:00
Laurent Destailleur
6e55abe831
Rename var to include "array" into name
2020-05-31 20:57:16 +02:00
ptibogxiv
a33f503a0d
FIX php error
...
Fatal error: Uncaught Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Call Stack: 0.0001 409544 1. {main}() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:0 0.1935 3017200 2. Form->select_produits() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:215 0.1935 3017200 3. Form->select_produits_list() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2134 0.1983 3439880 4. Form->constructProductListOption() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2451
2020-05-31 14:28:41 +02:00
Laurent Destailleur
b24c0e57a6
Fix transifex
2020-05-31 10:29:38 +02:00
bahfir abbes
f76c025a7b
fix:this is required to navigate by id
2020-05-31 02:01:33 +01:00
bahfir abbes
e5a51eb732
fix:bad database quotation for booleans
2020-05-31 01:41:04 +01:00
andreubisquerra
3ddce9f0df
Fix travis
2020-05-31 02:34:46 +02:00
bahfir abbes
26f280b74b
fix:non editable fields must not be editable in creation either
2020-05-31 01:33:34 +01:00
bahfir abbes
d6247bfc97
fix:le résultat de explode est troujours un array
2020-05-31 01:23:35 +01:00
stickler-ci
a5ed630a57
Fixing style errors.
2020-05-31 00:19:21 +00:00
jove@bisquerra.com
5f49586f12
TakePOS customer menu QR
2020-05-31 02:17:33 +02:00
bahfir abbes
fe52539787
fix:rempalcement de qqes valeurs de champs de BDDs par les valeurs adéquates
2020-05-31 01:14:44 +01:00
bahfir abbes
ef890a29eb
fix:Le label doit être une clé de dictionnaire
2020-05-31 01:10:27 +01:00
bahfir abbes
cf68317ae7
fix:Clé de langue dans les titres de menus
2020-05-31 00:56:51 +01:00
Bahfir Abbes
819984cfe0
replace with better normalized constant
2020-05-31 00:43:05 +01:00
stickler-ci
0813329070
Fixing style errors.
2020-05-30 23:39:16 +00:00
bahfir abbes
5873d41f64
Fix: DEFAULT_WAREHOUSE to define default in warehouse selections
2020-05-31 00:36:33 +01:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
6123596ec9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/fichinter/list.php
2020-05-31 00:28:40 +02:00
Laurent Destailleur
2b317120d3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-31 00:25:33 +02:00
Laurent Destailleur
8b03a5e225
Fix phpcs
2020-05-31 00:22:17 +02:00
Laurent Destailleur
94e02269ee
Fix: missing fk_project
2020-05-31 00:20:01 +02:00
Laurent Destailleur
ddebe1bbba
FIX Missing ref into popup
2020-05-30 23:52:47 +02:00
Laurent Destailleur
90b9fd1461
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-30 23:51:13 +02:00
Laurent Destailleur
02bf646abe
FIX Missing ref into popup
2020-05-30 23:51:02 +02:00
Laurent Destailleur
e8016a5e7e
Fix credit-transfer vs direct debit
2020-05-30 23:46:14 +02:00
Laurent Destailleur
f191cec3ef
Merge pull request #13999 from OPEN-DSI/fix_erreur_facture
...
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-30 17:24:31 +02:00
Laurent Destailleur
82455681d6
Merge pull request #13582 from TobiasSekan/UseCatApiForProjectList
...
NEW Use new category API for project list view
2020-05-30 17:22:43 +02:00
Laurent Destailleur
52af430ae2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-30 14:20:16 +02:00
Laurent Destailleur
e223189507
FIX #14002
2020-05-30 14:20:04 +02:00
Laurent Destailleur
dfb5f02f4b
Fix token renewal
2020-05-30 02:40:05 +02:00
Laurent Destailleur
b61b8ee1fb
Fix token renewal
2020-05-30 02:27:10 +02:00
Laurent Destailleur
8146e4fdbd
Fix tooltip
2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e
Debug module Payment by credit transfer
2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8
Debug module Payment by credit transfer
2020-05-30 02:10:02 +02:00
Laurent Destailleur
f9ac4c2ada
Fix template
2020-05-30 01:25:51 +02:00
Laurent Destailleur
a69be00d37
Fix template
2020-05-30 01:23:47 +02:00
Laurent Destailleur
48596122e4
Fix template
2020-05-30 01:17:23 +02:00
Laurent Destailleur
c4bbf12e72
Fix css
2020-05-30 00:58:11 +02:00
Laurent Destailleur
af3c24d0a9
Fix css
2020-05-30 00:56:51 +02:00
Laurent Destailleur
e2656ff2f8
Update template
2020-05-30 00:49:11 +02:00
Laurent Destailleur
0fd3292715
Fix show error message
2020-05-30 00:35:11 +02:00
Laurent Destailleur
926a9f68c4
Trans
2020-05-30 00:23:14 +02:00
Laurent Destailleur
455ba002b4
css
2020-05-29 22:13:10 +02:00
Laurent Destailleur
7fc6917cfd
Debug feature of alternate languages
2020-05-29 22:01:02 +02:00
Laurent Destailleur
b3118d0189
Debug feature of alternate languages
2020-05-29 21:59:33 +02:00
Laurent Destailleur
540a64bbba
Fix templates
2020-05-29 21:48:33 +02:00
Laurent Destailleur
264fd709e4
Fix template
2020-05-29 21:48:27 +02:00
Laurent Destailleur
30aa50684f
Trans
2020-05-29 21:47:59 +02:00
Laurent Destailleur
c2a9819daa
Debug establishment management
2020-05-29 21:45:50 +02:00
Laurent Destailleur
9d2f67bf8c
Trans
2020-05-29 16:35:01 +02:00
kamel
1e208e537f
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-29 16:24:07 +02:00
kamel
a4800f7b9b
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-29 16:18:27 +02:00
Laurent Destailleur
21c58e9fab
Error management
2020-05-29 15:29:47 +02:00
Laurent Destailleur
7f8c0d0e7a
Fix templates
2020-05-29 15:29:33 +02:00
Laurent Destailleur
972430d50c
Fix template
2020-05-29 15:13:16 +02:00
Laurent Destailleur
91f5f8053a
Fix label
2020-05-29 13:46:27 +02:00
Laurent Destailleur
ab82797dfc
var not defined
2020-05-29 13:20:33 +02:00
Laurent Destailleur
f38118790e
Trans
2020-05-29 12:18:47 +02:00
Laurent Destailleur
b9051bbe22
Fix admin report
2020-05-29 09:50:38 +02:00
Laurent Destailleur
b11ef125c3
FIX Force of HTML content only for ckeditor
...
Conflicts:
htdocs/modulebuilder/index.php
2020-05-29 03:27:30 +02:00
Laurent Destailleur
a0a440cf5f
FIX Force of HTML content only for ckeditor
2020-05-29 03:26:05 +02:00
Laurent Destailleur
9224061aed
Fix test to upload a file
2020-05-29 03:20:44 +02:00
Laurent Destailleur
5a9d968a75
Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting
2020-05-29 00:02:03 +02:00
Laurent Destailleur
bc9201b073
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-28 21:36:16 +02:00
Laurent Destailleur
3b22b6192d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-28 21:36:08 +02:00
Laurent Destailleur
60dfcdba00
Fix var type
2020-05-28 21:29:30 +02:00
Laurent Destailleur
46a362b7d8
doxygen
2020-05-28 21:25:47 +02:00
Laurent Destailleur
c1b4f7ec28
Fix phpcs
2020-05-28 21:24:46 +02:00
Laurent Destailleur
2e0cf05e55
phpcs
2020-05-28 21:20:30 +02:00
Laurent Destailleur
79c2d96375
Merge pull request #13679 from TobiasSekan/cleanupUserRightsSupplierProposalCard
...
Cleanup user rights on supplier proposal card
2020-05-28 21:12:37 +02:00
Laurent Destailleur
ba1e067d32
Merge pull request #13678 from TobiasSekan/cleanupUserRightsForunCommandeCard
...
Cleanup user rights forun commande card
2020-05-28 21:12:23 +02:00
Laurent Destailleur
c7eb71e19e
Merge pull request #13676 from TobiasSekan/CleanupUserRightsForunFactureCard
...
Cleanup user rights on forun facture card
2020-05-28 21:11:58 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Laurent Destailleur
5cec3eb052
Prepare 12.0
2020-05-28 20:12:49 +02:00
Laurent Destailleur
6cbb87f224
FIX #13995 #13994 manually.
2020-05-28 20:12:06 +02:00
Laurent Destailleur
7fbacf4352
phpcs
2020-05-28 20:04:30 +02:00
Laurent Destailleur
1992b633ba
Fix phpcs
2020-05-28 20:02:07 +02:00
Laurent Destailleur
56d3a5ecf2
Fix look and feel v12
2020-05-28 19:43:12 +02:00
Laurent Destailleur
11aedcd71a
Fix look and feel v12
2020-05-28 19:42:10 +02:00
Laurent Destailleur
f8b92e507c
Clean code
2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9
Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse-
...
NEW Add option to define a default warehouse at user level
2020-05-28 18:41:54 +02:00
Laurent Destailleur
a92e952960
Merge branch 'NewVendorInvoiceArea' of
...
https://github.com/TobiasSekan/dolibarr into
TobiasSekan-NewVendorInvoiceArea
# Conflicts:
# htdocs/langs/en_US/bills.lang
2020-05-28 18:32:52 +02:00
Laurent Destailleur
1e76101c41
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-28 18:30:32 +02:00
Laurent Destailleur
791d147992
Merge branch 'NewCustomerInvoiceArea' of
...
https://github.com/TobiasSekan/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/bills.lang
2020-05-28 18:29:59 +02:00
Laurent Destailleur
113144ea21
Merge pull request #13993 from glu000/11.0-fix-13991
...
Fix #13991
2020-05-28 18:27:39 +02:00
Laurent Destailleur
278f413a7a
Merge pull request #13980 from OPEN-DSI/new_save_filter_project_index
...
NEW Save filter of the project homepage
2020-05-28 18:26:26 +02:00
Supermanu
fd868b9d67
Fix compatibility with delete perm in massactions
2020-05-28 17:57:00 +02:00
Laurent Destailleur
c657fb41fb
Merge pull request #13987 from Supermanu/fix_old_perm
...
FIX compatibility with delete perm in massactions
2020-05-28 17:56:31 +02:00
Laurent Destailleur
7a8b61b125
Merge pull request #13986 from Supermanu/mass_action_deletion
...
NEW Add mass deletion for events
2020-05-28 17:52:05 +02:00
Laurent Destailleur
3883d73f20
Merge pull request #13970 from atm-quentin/FIX_missing_menu_accountancy_report
...
FIX missing accountancy report menu for simple accountancy conf
2020-05-28 17:51:06 +02:00
Laurent Destailleur
873b378852
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-28 17:50:27 +02:00
Laurent Destailleur
3ae61fcd73
Merge pull request #13981 from atm-florianm/11.0_FIX_pgsql_error_in_adherents_module
...
11.0 FIX postgreSQL error on landing page when "members" module is on
2020-05-28 17:50:08 +02:00
Laurent Destailleur
9d7a4cae00
Fix default value
2020-05-28 17:49:56 +02:00
Laurent Destailleur
f7e57da9f9
Merge pull request #13974 from andreubisquerra/12.0
...
Update to Auto Order last version in Dolibarr 12
2020-05-28 17:40:30 +02:00
Laurent Destailleur
8360ca4b20
Update pdf_crabe.modules.php
2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae
Update pdf_crabe.modules.php
2020-05-28 17:37:53 +02:00
Laurent Destailleur
f008338fde
Merge pull request #13990 from cfoellmann/fix-batch-delivery
...
fix #13988 - missing batch field extension
2020-05-28 17:32:30 +02:00
Laurent Destailleur
2f0a5b2634
Merge pull request #13976 from OPEN-DSI/new_ticket_public_notify_new_message
...
NEW Ticket message notifications when edited from public interface
2020-05-28 17:31:26 +02:00
stickler-ci
56259bae9a
Fixing style errors.
2020-05-28 14:18:00 +00:00
glu000
9915d97adf
Fix #13991
2020-05-28 16:11:02 +02:00
Christian Foellmann
50bac41399
fix #13988 - missing batch field extension
2020-05-28 15:19:48 +02:00
atm-lena
edc6abcea8
FIX Rounding Total TVA in "crabe" model pdf
2020-05-28 15:19:37 +02:00
Supermanu
e9d94c878b
Fix compatibility with delete perm in massactions
2020-05-28 14:56:20 +02:00
stickler-ci
029f5570e5
Fixing style errors.
2020-05-28 12:55:29 +00:00
Supermanu
0baea21947
NEW Add mass deletion for events
...
Only users with the right `allactions->delete` will be able to mass delete.
2020-05-28 14:45:54 +02:00
Laurent Destailleur
537b291fab
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/bons.php
2020-05-28 12:24:55 +02:00
Laurent Destailleur
df5aead4f3
Merge pull request #13984 from Supermanu/agenda_date_picker
...
NEW Add calendar selection for agenda view
2020-05-28 12:20:37 +02:00
Laurent Destailleur
88475025af
Trans
2020-05-28 12:04:52 +02:00
Laurent Destailleur
2afcfa8463
Fix missing stat on products
2020-05-28 12:01:19 +02:00
Laurent Destailleur
1838cf92ef
Look and feel v12
2020-05-28 11:51:49 +02:00
Laurent Destailleur
32aecb553b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec
FIX Bad use/detetion of text/html when forging template email.
2020-05-28 11:41:48 +02:00
Supermanu
721b99bb2f
Add calendar selection for agenda view
2020-05-28 11:24:37 +02:00
Laurent Destailleur
f66555b396
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-27 23:38:46 +02:00
Laurent Destailleur
622b5c4ac9
Doxygen
2020-05-27 23:37:22 +02:00
Laurent Destailleur
57c503091f
Doxygen
2020-05-27 23:35:17 +02:00
Laurent Destailleur
57a753c303
Doxygen
2020-05-27 23:33:23 +02:00
Laurent Destailleur
029596bc40
Fix error assignement
2020-05-27 23:32:24 +02:00
Laurent Destailleur
2bababb73e
Fix doc
2020-05-27 23:30:52 +02:00
Laurent Destailleur
6881610892
Doxygen
2020-05-27 23:23:01 +02:00
Laurent Destailleur
689289acd0
Doc
2020-05-27 23:20:26 +02:00
Laurent Destailleur
479ca770ba
Removed database handler for MSSql since it rely on a function that does
...
not exist anymore in PHP 7+
2020-05-27 23:15:41 +02:00
Laurent Destailleur
e787978890
Doc
2020-05-27 23:12:26 +02:00
Laurent Destailleur
8aba46a5ed
Fix doc
2020-05-27 23:08:33 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
fbaf705c2a
Look and feel v12
2020-05-27 22:50:38 +02:00
Anthony Berton
c0b6fd1811
Update html.formproduct.class.php
2020-05-27 22:35:55 +02:00
Laurent Destailleur
e37e45f984
Debug credit transfer
2020-05-27 22:35:55 +02:00
Laurent Destailleur
15f2165c12
Fix work on payment by bank transfer (avoid confusion between record)
2020-05-27 20:14:11 +02:00
Florian Mortgat
d491f2cf54
[pgsql] type of llx_adherent_type.subscription is VARCHAR(3) so quotes are mandatory
2020-05-27 18:27:10 +02:00
kamel
6e10abe427
[NEW] Save filter of the project homepage
...
Save the filter into the user parameters
2020-05-27 15:51:25 +02:00
Laurent Destailleur
ada9c9addc
Fix count of records
2020-05-27 15:37:30 +02:00
Laurent Destailleur
7c653c0873
Fix count of records
2020-05-27 15:36:16 +02:00
Laurent Destailleur
2f1e653f2f
Fix css
2020-05-27 15:29:09 +02:00
Laurent Destailleur
00e88fcf76
Fix backtourl
2020-05-27 15:26:38 +02:00
Laurent Destailleur
264c1d6491
List website into combo sorted by position, ref fields
2020-05-27 14:50:10 +02:00
Anthony Berton
9efcc631d7
Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse-
2020-05-27 14:47:20 +02:00
Laurent Destailleur
34d7dbe7e9
Fix css
2020-05-27 14:42:17 +02:00
Laurent Destailleur
ceda05a879
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-27 14:39:38 +02:00
Laurent Destailleur
e2680fa29a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-05-27 14:39:19 +02:00
Laurent Destailleur
16625af34e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php
htdocs/core/tpl/filemanager.tpl.php
2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/ecm/class/ecmfiles.class.php
htdocs/ecm/index.php
2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2
FIX XSS using the renaming of .noexe files - reported by Nolan.
2020-05-27 13:12:18 +02:00
Florian Mortgat
954c29786e
FIX 10.0 - pagination in prelevement/bons.php
2020-05-27 12:15:42 +02:00
kamel
54a68d888e
Correction Stickler CI
2020-05-27 11:45:04 +02:00
kamel
fe8eddac5e
[NEW] Ticket message notifications from public interface
...
Can send an email when a new message is added from public interface
close issue #12181
2020-05-27 11:39:06 +02:00
Laurent Destailleur
0b48ffe3cd
Removed not used var $useglobalvars
2020-05-27 11:38:28 +02:00
andreubisquerra
3b884c4051
Fix travis
2020-05-27 07:03:57 +02:00
andreubisquerra
8891595993
Fix travis
2020-05-27 06:57:12 +02:00
andreubisquerra
896e3166b7
Update phone.css
2020-05-27 06:49:37 +02:00
andreubisquerra
7d323f4379
Update index.php
2020-05-27 06:48:40 +02:00
andreubisquerra
abf7fce108
Update auto_order.php
2020-05-27 06:44:00 +02:00
Laurent Destailleur
479e8ceceb
Look and feel v12
2020-05-27 03:19:37 +02:00
Laurent Destailleur
3f4ae8875f
Fix bad tooltip
2020-05-27 02:45:09 +02:00
Laurent Destailleur
d3e21c82f2
CSS
2020-05-27 02:38:54 +02:00
Laurent Destailleur
e308170ed8
CSS
2020-05-27 02:38:12 +02:00
Laurent Destailleur
c0ce584487
Look and feel v12
2020-05-27 00:26:04 +02:00
Laurent Destailleur
00484d5938
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 23:23:31 +02:00
Laurent Destailleur
9aeb79e80c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b
FIX Default bank account was not loaded for document generation.
2020-05-26 23:22:14 +02:00
andreubisquerra
7e792928e0
Update invoice.php for Auto Order
2020-05-26 23:03:47 +02:00
andreubisquerra
56708e8c35
Update phone.php for Auto Order
2020-05-26 22:52:55 +02:00
Laurent Destailleur
c607c2daa0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 22:31:47 +02:00
Laurent Destailleur
44273e0570
Fix duplicate code
2020-05-26 22:31:27 +02:00
Laurent Destailleur
91ecd3455f
Fix CSS
2020-05-26 22:30:11 +02:00
Laurent Destailleur
da8bd7507e
NEW Add mass action to set category on a list of website pages.
2020-05-26 22:29:46 +02:00
florian HENRY
ceb0a5b0b5
space
2020-05-26 21:32:18 +02:00
florian HENRY
e5edc06f3d
spelling
2020-05-26 21:29:47 +02:00
florian HENRY
7ada0de654
FIX : #13968
2020-05-26 21:27:46 +02:00
Laurent Destailleur
7ceb236a09
Fix look and field v12
2020-05-26 14:45:45 +02:00
Laurent Destailleur
48137f8cad
Fix look and field v12
2020-05-26 14:43:50 +02:00
Laurent Destailleur
d51bf44f55
Add picto
2020-05-26 12:53:58 +02:00
Laurent Destailleur
05ac3de2f0
Enhance search / filter
2020-05-26 12:46:51 +02:00
Laurent Destailleur
2d30d33303
NEW Can filter on container type, language and tags in the list of pages
...
of website module.
2020-05-26 12:25:41 +02:00
atm-quentin
1c45866409
FIX missing accountancy report menu for simple accountancy conf
2020-05-26 10:33:07 +02:00
Laurent Destailleur
b6308f6dfa
Fix phpcs
2020-05-26 01:16:18 +02:00
Laurent Destailleur
3aaefd15b0
Fix set of categories
2020-05-26 01:07:43 +02:00
Laurent Destailleur
0ea8d9f651
Update products.lang
2020-05-26 00:35:01 +02:00
stickler-ci
ce79989a9c
Fixing style errors.
2020-05-25 22:33:02 +00:00
Laurent Destailleur
957a265fbd
Merge branch 'develop' into cleanupUserRightsSupplierProposalCard
2020-05-26 00:31:04 +02:00
Laurent Destailleur
714d01bdab
Merge branch 'develop' into CleanupUserRightsForunFactureCard
2020-05-26 00:25:38 +02:00
Laurent Destailleur
5f90596bb7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 00:20:36 +02:00
Laurent Destailleur
ab176cd078
Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
...
add new rule
2020-05-26 00:20:12 +02:00
Laurent Destailleur
f9f5beb064
NEW Can set tags/categories to website pages.
2020-05-26 00:19:32 +02:00
Laurent Destailleur
89e32d33a4
Merge pull request #13969 from Dolibarr/revert-13782-free_email
...
Revert "NEW enable free emails input with select2"
2020-05-25 23:13:13 +02:00
Laurent Destailleur
80ace3b52c
Revert due to regressions
2020-05-25 23:05:29 +02:00
Laurent Destailleur
a80270ebb5
Revert "clean"
...
This reverts commit 7e7a10f8d2 .
2020-05-25 23:01:25 +02:00
Laurent Destailleur
faf7a379ba
Revert "clean"
...
This reverts commit 8f9ee3250d .
2020-05-25 23:01:20 +02:00
Laurent Destailleur
d169162ef1
Revert "NEW enable free emails input with select2"
2020-05-25 22:56:29 +02:00
Laurent Destailleur
26eab1f285
Merge pull request #13782 from frederic34/free_email
...
NEW enable free emails input with select2
2020-05-25 22:55:36 +02:00
laurantines
416d1d0301
Update list.php
...
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
2020-05-25 22:53:03 +02:00
Laurent Destailleur
972cb08aa6
Merge pull request #13966 from laurantines/develop
...
[FIX] Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
2020-05-25 22:51:12 +02:00
Laurent Destailleur
4d13fa532f
Merge pull request #13852 from bb2a/MultiPriceInListe
...
Add columns for multiprices in product list
2020-05-25 22:50:16 +02:00
Laurent Destailleur
49c4ed5a08
Update list.php
2020-05-25 22:50:00 +02:00
stickler-ci
5fe4520385
Fixing style errors.
2020-05-25 20:43:35 +00:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
4e0d8ba518
Merge pull request #13962 from andreubisquerra/develop
...
TakePOS Auto Order improvements
2020-05-25 22:34:22 +02:00
Laurent Destailleur
d08fc174c4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:23:51 +02:00
Laurent Destailleur
2fe8e03ed6
Fix missing quote
2020-05-25 22:23:22 +02:00
Laurent Destailleur
41d5d9b6f8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:21:52 +02:00
Laurent Destailleur
ba047428e2
Fix duplicate \n
2020-05-25 22:21:36 +02:00
Laurent Destailleur
17382051c2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:19:50 +02:00
Laurent Destailleur
19bcdb6418
Fix structured data
2020-05-25 22:19:28 +02:00
Laurent Destailleur
02b9ce5901
Fix length of title
2020-05-25 18:16:36 +02:00
Laurent Destailleur
e4ef6334aa
Look and feel v12
2020-05-25 14:08:36 +02:00
Laurent Destailleur
26177489c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 13:46:39 +02:00
Laurent Destailleur
25d1a2a1d8
Restore missing png file
2020-05-25 13:36:56 +02:00
Laurent Destailleur
160ac14eb3
Update logo
2020-05-25 13:32:57 +02:00
Laurent Destailleur
0b9e1e6ec6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 13:01:49 +02:00
Laurent Destailleur
0409ec00d7
CSS
2020-05-25 13:01:32 +02:00
Laurent Destailleur
056206098b
CSS
2020-05-25 12:51:17 +02:00
Laurent Destailleur
0dbb8224fb
Fix logo
2020-05-25 12:50:54 +02:00
Laurent Destailleur
9e77dc0a26
CSS
2020-05-25 12:50:29 +02:00
laurantines
962d795740
Update list.php
...
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
2020-05-25 12:26:05 +02:00
Laurent Destailleur
384e1e31ad
Fix Popup
2020-05-25 11:30:57 +02:00
Laurent Destailleur
c67eeeaf6c
CSS
2020-05-25 11:30:52 +02:00
Laurent Destailleur
a44f0d24eb
Fix Popup
2020-05-25 11:06:16 +02:00
Laurent Destailleur
61545703d1
CSS
2020-05-25 10:58:18 +02:00
Laurent Destailleur
2595f571c7
Fix exclude credit note when searching situation invoice to use for next
2020-05-25 00:21:09 +02:00
Laurent Destailleur
47465f4108
Fix for situation invoice (exclude credit not when searching last
...
invoice to use)
2020-05-25 00:20:00 +02:00
Laurent Destailleur
0041bca82f
Fix ambiguous param
2020-05-24 23:49:33 +02:00
Laurent Destailleur
6158e41822
CSS
2020-05-24 23:44:04 +02:00
Laurent Destailleur
aee6fce9f8
Fix remove bad use
2020-05-24 20:04:26 +02:00
andreubisquerra
d60bcb871f
Fix travis
2020-05-24 18:24:41 +02:00
Laurent Destailleur
84ec747109
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-24 18:04:26 +02:00
andreubisquerra
957c40e072
Fix travis
2020-05-24 18:03:07 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-24 17:58:18 +02:00
andreubisquerra
3632111705
Fix travis
2020-05-24 17:29:35 +02:00
andreubisquerra
c80989d74f
phone.php improvements
2020-05-24 16:31:22 +02:00
andreubisquerra
221e8d8ce1
invoice.php improvements
2020-05-24 16:30:42 +02:00
andreubisquerra
26ee0d1949
genimg improvements
2020-05-24 16:29:42 +02:00
Laurent Destailleur
65708ec360
Fix responsive
2020-05-24 15:07:57 +02:00
Laurent Destailleur
dacb326c15
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-24 01:10:41 +02:00
Laurent Destailleur
509ce9f571
CSS
2020-05-24 01:09:45 +02:00
Laurent Destailleur
fd61214b97
Merge
2020-05-24 01:06:45 +02:00
Laurent Destailleur
4cb0ffeb1f
Fix css
2020-05-24 01:04:56 +02:00
Laurent Destailleur
6056ed2755
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-24 01:02:08 +02:00
Laurent Destailleur
ef17ed2f87
Look and feel v12
2020-05-24 00:01:52 +02:00
Laurent Destailleur
2b963479a8
Sync transifex
2020-05-23 23:50:00 +02:00
Laurent Destailleur
c843da5272
Sync transifex
2020-05-23 22:29:45 +02:00
Frédéric FRANCE
67b8ab13c9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 21:45:18 +02:00
Frédéric FRANCE
a7e0fe24ff
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-23 21:44:14 +02:00
Frédéric FRANCE
5c78eca68a
prepare new rule
2020-05-23 21:14:44 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Laurent Destailleur
024e62a582
Fix navigation
2020-05-23 20:27:25 +02:00
Laurent Destailleur
7bfbf3c88b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-23 20:20:53 +02:00
Laurent Destailleur
fe6453194e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-23 20:18:17 +02:00
Laurent Destailleur
45ddde6940
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-23 20:18:10 +02:00
Laurent Destailleur
9fdd718c22
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 20:11:20 +02:00
Laurent Destailleur
40777cbcd9
Fix phpcs
2020-05-23 20:11:10 +02:00
Laurent Destailleur
97a4c32870
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-23 20:09:41 +02:00
Laurent Destailleur
127534ef55
Fix common var name seems to be $objref for subdir of doc
2020-05-23 20:09:31 +02:00
Laurent Destailleur
28bd962559
Merge pull request #13703 from frederic34/entrepotlibelle
...
remove deprecated libelle to fix phpunit
2020-05-23 19:25:04 +02:00
Laurent Destailleur
be641c3d09
Merge pull request #13914 from aspangaro/12.0_a27
...
NEW Add employee in expense report binding page
2020-05-23 19:23:20 +02:00
Laurent Destailleur
d6470519eb
Update list.php
2020-05-23 19:21:03 +02:00
Laurent Destailleur
1ed3b385fa
Update lines.php
2020-05-23 19:19:28 +02:00
Laurent Destailleur
558a441b41
Update lines.php
2020-05-23 19:18:13 +02:00
Laurent Destailleur
e086cdcf2a
Update lines.php
2020-05-23 19:17:09 +02:00
Laurent Destailleur
2ccd6c1e9a
Update lines.php
2020-05-23 19:16:37 +02:00
Laurent Destailleur
6c3a238981
Update lines.php
2020-05-23 19:14:33 +02:00
Laurent Destailleur
173662e98c
Update lines.php
2020-05-23 19:14:05 +02:00
Laurent Destailleur
b10976562f
Merge pull request #13958 from fappels/12_ref_int_deprication
...
Fix ref_int deprecation.
2020-05-23 19:12:21 +02:00
Frédéric FRANCE
6522bb70fd
fix merge
2020-05-23 19:06:01 +02:00
Frédéric FRANCE
48f12c8307
Merge remote-tracking branch 'origin/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:58:18 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
stickler-ci
66637ba0b6
Fixing style errors.
2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
8e113888d8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 17:02:27 +02:00
Laurent Destailleur
64f72daa7e
Fix hreflang if canonical page
2020-05-23 17:01:22 +02:00
Francis Appels
efa4ffa326
Fix ref_int deprecation.
...
Add to changelog and allow to use ref_ext for shipments.
2020-05-23 16:46:42 +02:00
Laurent Destailleur
051e009c47
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 15:50:25 +02:00
Laurent Destailleur
748a120b71
Show button for categories if module is enabled
2020-05-23 15:50:15 +02:00
Laurent Destailleur
bf0327952b
Merge pull request #13875 from ptibogxiv/patch-339
...
NEW Date shipment from order accepts hours
2020-05-23 15:42:24 +02:00
Laurent Destailleur
9b54ed766b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 15:37:08 +02:00
Laurent Destailleur
aec5200a98
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Laurent Destailleur
7c92bb218e
Fix no hreflang if not a canonical page
2020-05-23 15:33:04 +02:00
Laurent Destailleur
4913d10724
Merge branch 'develop' into patch-339
2020-05-23 15:14:06 +02:00
Laurent Destailleur
d8d5907aff
Merge pull request #13939 from grandoc/develop
...
Fix : some comment and translation
2020-05-23 15:11:32 +02:00
Laurent Destailleur
697d4d684e
Merge pull request #13899 from andreubisquerra/master
...
TakePOS Auto Order improvements
2020-05-23 15:11:01 +02:00
Laurent Destailleur
394ea5075f
Merge pull request #13823 from aspangaro/12.0_a25
...
NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
2020-05-23 15:07:27 +02:00
Laurent Destailleur
c2b2e17b58
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl
...
NEW conf to allow show full arbo in warehouse getnomurl
2020-05-23 15:05:08 +02:00
Laurent Destailleur
5bbbabf653
Update stocks.lang
2020-05-23 15:04:59 +02:00
Laurent Destailleur
abe7472ee5
Update stocks.lang
2020-05-23 15:03:57 +02:00
Philippe Grand
af17781b2b
fix : personnal font file within tcpdf
2020-05-23 15:01:40 +02:00
Philippe Grand
6c15ff2ac1
fix : personnal font file within tcpdf
2020-05-23 15:01:25 +02:00
Philippe Grand
d80afa7536
fix : personnal font file within tcpdf
2020-05-23 15:01:08 +02:00
Philippe Grand
f49374c72d
fix : personnal font file within tcpdf
2020-05-23 15:00:48 +02:00
Philippe Grand
20898d783a
fix : personnal font file within tcpdf
2020-05-23 15:00:30 +02:00
Philippe Grand
b1e7085857
fix : personnal font file within tcpdf
2020-05-23 15:00:11 +02:00
Laurent Destailleur
b4ceb2e97e
Update entrepot.class.php
2020-05-23 15:00:06 +02:00
Philippe Grand
462b043efc
fix : personnal font file within tcpdf
2020-05-23 14:59:52 +02:00
Philippe Grand
c9c5dc4ebe
fix : personnal font file within tcpdf
2020-05-23 14:59:30 +02:00
Philippe Grand
60f1bcfb70
fix : personnal font file within tcpdf
2020-05-23 14:59:06 +02:00
Laurent Destailleur
263bfda8bd
Merge pull request #13916 from altatof/tracking
...
NEW : add tracking number in list and search_all items
2020-05-23 14:58:45 +02:00
Laurent Destailleur
4004aeb257
Merge pull request #13915 from atm-quentin/Fix_missing_getnomurl_warehouse_hook
...
FIX missing GetNomURL Hook in warehouse class
2020-05-23 14:57:28 +02:00
Laurent Destailleur
7d8323b0a7
Merge pull request #13920 from altatof/dispatch
...
NEW : edit or delete dispatched lines
2020-05-23 14:56:04 +02:00
Philippe Grand
19598bad8a
fix : personnal font file within tcpdf
2020-05-23 14:41:30 +02:00
Philippe Grand
471d86ff39
fix : personnal font file within tcpdf
2020-05-23 14:41:08 +02:00
Philippe Grand
76e32781a3
fix : personnal font file within tcpdf
2020-05-23 14:40:45 +02:00
Philippe Grand
51db2be3f4
fix : personnal font file within tcpdf
2020-05-23 14:39:56 +02:00
Philippe Grand
fdea4db671
fix : personnal font file within tcpdf
2020-05-23 14:39:18 +02:00
Laurent Destailleur
5f3a82423f
Fix regression in look and feel v12
2020-05-23 14:38:37 +02:00
Philippe Grand
0becc47b30
fix : personnal font file within tcpdf
2020-05-23 14:38:26 +02:00
Laurent Destailleur
b4223dbdec
Merge branch '12.0' into fix_board_expensereport_toapprove
2020-05-23 14:32:12 +02:00
Laurent Destailleur
4e3fbb9d05
Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent
...
NEW mass-actions for the event list view
2020-05-23 14:26:51 +02:00
Laurent Destailleur
7397806ae7
Update actioncomm.class.php
2020-05-23 14:26:28 +02:00
Laurent Destailleur
b7fbda8d08
Merge pull request #13924 from atm-lena/11.0_AddHook_Massstockmove
...
Add Hook "Massstockmove"
2020-05-23 14:25:12 +02:00
Laurent Destailleur
1e6cc80438
Merge pull request #13923 from atm-gauthier/11.0_rename_bank_releve
...
FIX : We must only rename current bank receipt
2020-05-23 14:24:51 +02:00
Laurent Destailleur
e29d2588cf
Merge pull request #13931 from altatof/fixdispatch
...
FIX missing rollbacks on trigger bad return
2020-05-23 14:24:15 +02:00
Tobias Sekan
babcdfc99a
Fix not working default value (re...)
2020-05-23 14:22:40 +02:00
Tobias Sekan
58e32aa2ff
Fix not wokring default values for date (re...)
2020-05-23 14:22:30 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice
...
FIX not working default date values for new invoices
2020-05-23 14:21:50 +02:00
Frédéric FRANCE
8b4dcbaa64
Update datapolicycron.class.php
2020-05-23 14:19:28 +02:00
Laurent Destailleur
d8250fdc75
Merge pull request #13934 from frederic34/patch-4
...
Update datapolicycron.class.php
2020-05-23 14:19:12 +02:00
Frédéric FRANCE
3a93dcf2c4
Update paymentloan.class.php
...
same picto in loan
2020-05-23 14:18:47 +02:00
Laurent Destailleur
e2cdbf6cec
Merge pull request #13935 from frederic34/patch-6
...
Update paymentloan.class.php
2020-05-23 14:18:08 +02:00
Laurent Destailleur
1979647650
Merge pull request #13954 from fappels/12_fix_batch
...
Fix migration, missing batch update to varchar(128)
2020-05-23 13:54:12 +02:00
Laurent Destailleur
3a15688f17
FIX #13951
2020-05-23 13:53:47 +02:00
Laurent Destailleur
a9b5feb680
Merge branch 'develop' into keep_child_label_if_modified
2020-05-23 13:51:13 +02:00
Laurent Destailleur
726f86e73d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:49:22 +02:00
Laurent Destailleur
acaab1fd45
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:49:15 +02:00
Laurent Destailleur
83ecbef9bc
FIX #13911 #13940
2020-05-23 13:46:37 +02:00
Laurent Destailleur
493becde8b
Update list.php
2020-05-23 13:39:06 +02:00
Laurent Destailleur
15de6194c4
Update list.php
2020-05-23 13:38:59 +02:00
gael.langlais
af5de05a31
Change some curly braces #13929
2020-05-23 13:38:50 +02:00
Laurent Destailleur
4884dcd62e
Merge pull request #13950 from Langlais115/fix_some_curly_braces
...
Change some curly braces #13929
2020-05-23 13:37:56 +02:00
Laurent Destailleur
9e95342e2f
Update list.php
2020-05-23 13:36:39 +02:00
Laurent Destailleur
072d8c6222
Update list.php
2020-05-23 13:36:02 +02:00
Laurent Destailleur
b4fa56d07e
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices
...
FIX not working default values for payment on new invoices
2020-05-23 13:33:01 +02:00
Laurent Destailleur
d4b1485c97
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:11:30 +02:00
Laurent Destailleur
755c47f900
Fix save of wrapper missing
2020-05-23 13:10:33 +02:00
Laurent Destailleur
333ae9d496
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 12:58:18 +02:00
Laurent Destailleur
aff2872fc1
Fix RSS
2020-05-23 12:57:58 +02:00
Laurent Destailleur
50d063256e
NEW Povide a RSS Feed for blogposts
2020-05-23 12:54:06 +02:00
Laurent Destailleur
e947ddba10
Fix RSS feed
2020-05-23 12:51:44 +02:00
Laurent Destailleur
f2c02f5559
FIX Language for RSS
2020-05-23 12:41:06 +02:00
Francis Appels
875230ed13
Fix missing batch update to varchar(128)
2020-05-23 10:23:26 +02:00
stickler-ci
74662d3ecd
Fixing style errors.
2020-05-23 08:18:41 +00:00
Philippe Grand
e7c2bd830a
fix merge issue
2020-05-23 10:17:48 +02:00
Philippe Grand
b137775046
fix merge issue
2020-05-23 10:12:14 +02:00
Laurent Destailleur
c460cff01c
Fix calculation and add tooltip to understand it.
2020-05-23 01:17:01 +02:00
gael.langlais
dce93197d7
FIX #13908 keep child label if modified by user
2020-05-22 17:58:24 +02:00
gael.langlais
e349b9323f
Change some curly braces #13929
2020-05-22 17:42:06 +02:00
Frédéric FRANCE
70995d3499
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-22 15:03:09 +02:00
Laurent Destailleur
2f8b364454
Code comment
2020-05-22 13:18:47 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-22 08:27:12 +02:00
stickler-ci
2873f4dacf
Fixing style errors.
2020-05-22 06:08:12 +00:00
Tobias Sekan
53080be245
fix not working default values for payment
2020-05-22 08:01:29 +02:00
Tobias Sekan
d9a2d2b982
fix not working default values for payment
2020-05-22 08:00:26 +02:00
Laurent Destailleur
38c8ebd627
Add link into toolbar to create website tags
2020-05-22 01:01:27 +02:00
Laurent Destailleur
60f865fbb8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-22 00:58:27 +02:00
Laurent Destailleur
43103f40a5
Fix make page of categories of web site working
2020-05-22 00:55:34 +02:00
Laurent Destailleur
e81e4032f7
Fix make page of categories of web site working
2020-05-22 00:54:53 +02:00
Maxime Kohlhaas
6b1eef9827
Fix board exepense report to approve
2020-05-22 00:50:13 +02:00
Laurent Destailleur
5d78f6dac5
NEW Add link to edit property from search result of website pages
2020-05-22 00:38:01 +02:00
Maxime Kohlhaas
fb0f31c142
Fix board filters for expense report and holiday
2020-05-22 00:33:30 +02:00
Maxime Kohlhaas
6434f255c3
Fix load_state_board doesn't take parameters
2020-05-22 00:32:55 +02:00
Maxime Kohlhaas
f89195e39f
Fix SQL IF for PGSQL
2020-05-21 23:23:59 +02:00
Laurent Destailleur
76823d3e39
Clean CSS, clean code
2020-05-21 20:59:02 +02:00
Laurent Destailleur
9e295d44f0
Code comment
2020-05-21 17:14:42 +02:00
Frédéric FRANCE
726d7817c4
add new rule
2020-05-21 16:13:46 +02:00
Frédéric FRANCE
37202a54e9
add new rule
2020-05-21 16:04:52 +02:00
Frédéric FRANCE
5940d3705a
add new rule
2020-05-21 16:00:12 +02:00
Frédéric FRANCE
3a786ca766
add new rule
2020-05-21 15:25:42 +02:00
Frédéric FRANCE
623783e948
Merge remote-tracking branch 'origin/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-21 15:21:05 +02:00
Frédéric FRANCE
674b0e38c8
add new rule
2020-05-21 15:13:31 +02:00
stickler-ci
459154edc0
Fixing style errors.
2020-05-21 13:11:06 +00:00
Frédéric FRANCE
d9f42f85d1
add new rule
2020-05-21 15:08:14 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
b58060f899
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-21 13:29:43 +02:00
Laurent Destailleur
8a481b297c
Clean CSS, clean code
2020-05-21 13:06:36 +02:00
Philippe GRAND
c77a1be176
fix comment and add some translation
2020-05-21 11:35:32 +02:00
Philippe GRAND
23282acfbc
update
2020-05-21 11:20:01 +02:00
Frédéric FRANCE
85625a46bb
add new rule
2020-05-21 09:35:30 +02:00
Tobias Sekan
44ffb8dbf7
Fix not working default value (re...)
2020-05-21 09:34:20 +02:00
Frédéric FRANCE
f4011520a3
add new rule
2020-05-21 09:31:49 +02:00
Tobias Sekan
2efe3d7da0
Fix not wokring default values for date (re...)
2020-05-21 09:31:06 +02:00
Frédéric FRANCE
ba8cf2b398
add new rule
2020-05-21 09:21:30 +02:00
Frédéric FRANCE
ccc859ec80
add new rule
2020-05-21 09:12:18 +02:00
Frédéric FRANCE
def53338de
add new rule
2020-05-21 09:07:10 +02:00
Frédéric FRANCE
a636f81eac
add new rule
2020-05-21 02:17:21 +02:00
Frédéric FRANCE
ae06b35c63
add new rule
2020-05-21 02:06:40 +02:00
Frédéric FRANCE
e5fc928fda
add new rule
2020-05-21 02:02:54 +02:00
Frédéric FRANCE
a25ed0e041
add new rule
2020-05-21 01:56:06 +02:00
Frédéric FRANCE
f5688b2eec
add new rule
2020-05-21 01:52:25 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
Frédéric FRANCE
416e6dd90d
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-21 01:11:45 +02:00
Frédéric FRANCE
b70efb5d7b
add new rule
2020-05-21 01:10:33 +02:00
Frédéric FRANCE
4be4f975b0
add new rule
2020-05-21 01:03:03 +02:00
Frédéric FRANCE
ccadb1ec7a
add new rule
2020-05-21 00:47:16 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule
2020-05-21 00:02:33 +02:00
Laurent Destailleur
15f3c97fff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:59:11 +02:00
Laurent Destailleur
86de0d5e14
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/projet/class/project.class.php
2020-05-20 23:58:32 +02:00
Laurent Destailleur
9e3e8df60f
Fix phpcs
2020-05-20 23:56:06 +02:00
Laurent Destailleur
a78bc86465
Trans
2020-05-20 23:51:46 +02:00
Laurent Destailleur
036617570e
Doc
2020-05-20 23:46:48 +02:00
Laurent Destailleur
662970f232
Clean sql file
2020-05-20 23:42:28 +02:00
Laurent Destailleur
92cbff7749
Clean code
2020-05-20 23:40:04 +02:00