Commit Graph

73771 Commits

Author SHA1 Message Date
ATM john
60b3d9d4db Add extrafields on PDF object lines for compatible pdf 2020-02-22 18:07:15 +01:00
stickler-ci
2b027cfebf Fixing style errors. 2020-02-22 15:45:39 +00:00
ATM john
e209fd2973 Add extrafields on PDF object lines 2020-02-22 16:27:44 +01:00
Laurent Destailleur
0d474b2ec9 CSS 2020-02-22 14:20:42 +01:00
Laurent Destailleur
295d42b476 Fix trans of status 2020-02-22 14:19:23 +01:00
Laurent Destailleur
d741a025f3 Fix duplicate error message 2020-02-22 14:13:15 +01:00
gmilad
559fc9f61e
Update note.php
Fix : #13168
2020-02-22 13:07:25 +01:00
Laurent Destailleur
1d34ef213c Fix error management 2020-02-22 12:19:46 +01:00
ATM john
aa77d96f23 remove IDE warnings 2020-02-22 12:06:21 +01:00
javierybar
fddcc844ff Add orders to Receipt Printers module 2020-02-22 11:30:48 +01:00
futurehousestore
16b4e680f7 Add Products/Services by popularity in Orders 2020-02-22 02:45:58 +00:00
gmilad
6264f78e39
Update note.php
Bonsoir,
Correction pour l'issue #13168
Cordialement,
Gaëtan.
2020-02-21 23:01:16 +01:00
Laurent Destailleur
18533b635a CSS 2020-02-21 20:30:28 +01:00
Laurent Destailleur
1dbf3a7ae8 Look and feel v11 2020-02-21 20:14:55 +01:00
Laurent Destailleur
af76cd4387 Fix bad var 2020-02-21 20:05:06 +01:00
Laurent Destailleur
0aa4ee9d40
Merge branch 'develop' into patch-36 2020-02-21 19:54:15 +01:00
Laurent Destailleur
badc4327c2
Merge branch 'develop' into patch-3 2020-02-21 19:45:33 +01:00
Laurent Destailleur
c2677c0231
Update api_products.class.php 2020-02-21 19:44:02 +01:00
Laurent Destailleur
b4fdd9bc50
Merge pull request #13078 from hregis/10.0_mc
FIX #10309
2020-02-21 19:21:54 +01:00
Laurent Destailleur
e4b00c5c20
Merge branch 'develop' into master 2020-02-21 18:20:10 +01:00
Laurent Destailleur
4d3111ea4d
Merge pull request #13159 from oscim/patch-22
Update emailcollector.class.php
2020-02-21 18:18:37 +01:00
Laurent Destailleur
0ec4294d96
Update emailcollector.class.php 2020-02-21 18:15:31 +01:00
Frédéric FRANCE
8d507c4f32 fix workflow with multicurrency 2020-02-21 18:12:48 +01:00
Laurent Destailleur
c0098188af
Merge pull request #13154 from frederic34/patch-7
fix workflow with multicurrency
2020-02-21 18:12:27 +01:00
Laurent Destailleur
7907e85f60
Merge pull request #13153 from bb2a/patch-16
MAJ MAIN_FIRST_TO_UPPER LOW first uppercase letter of a lowercase chain
2020-02-21 18:11:45 +01:00
Laurent Destailleur
58a57a0411
Merge branch 'develop' into fix-modoristomouv 2020-02-21 18:05:13 +01:00
Frédéric FRANCE
327b827fb4 avoid warning if not an array
Conflicts:
	htdocs/projet/element.php
2020-02-21 18:01:04 +01:00
Frédéric FRANCE
f6eba36575 fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
2020-02-21 18:00:12 +01:00
Laurent Destailleur
964b8d74f6
Merge pull request #13160 from frederic34/patch-8
avoid warning if not an array
2020-02-21 17:58:50 +01:00
Laurent Destailleur
9b9f6d5da4
Merge pull request #13151 from frederic34/patch-6
fix CATEGORY_ADD_DESC_INTO_DOC
2020-02-21 17:55:19 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4 Fix remove a lot of warnings on Eclipse 2020-02-21 17:47:36 +01:00
stickler-ci
7f9944afa7 Fixing style errors. 2020-02-21 16:42:18 +00:00
Pierre Ardoin
7457796a95
Add Dark mode 2020-02-21 17:38:10 +01:00
Pierre Ardoin
501728ce36
AD 2020-02-21 17:31:53 +01:00
Laurent Destailleur
ec09e7222d Fix remove a lot of warnings on Eclipse 2020-02-21 17:31:37 +01:00
Laurent Destailleur
7e4af04886 CSS For bookmark dropdown 2020-02-21 17:18:01 +01:00
Laurent Destailleur
60f394a53c Fix CSS for RTL languages 2020-02-21 17:07:22 +01:00
Laurent Destailleur
df1851838e Main language of a web site is now mandatory 2020-02-21 16:37:07 +01:00
Laurent Destailleur
ea19ab96c3 Fix compatibility with php 7.4 2020-02-21 14:46:02 +01:00
Laurent Destailleur
d3f8c7af1e Fix compatibility with php 7.4 2020-02-21 14:41:36 +01:00
Laurent Destailleur
be3ecb3093 Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless 2020-02-21 14:32:53 +01:00
Laurent Destailleur
89b7c8dfd6 NEW Can select which element to export in export accounting documents. 2020-02-21 14:20:05 +01:00
Laurent Destailleur
5243cee0b8 Fix duplicate field in insert 2020-02-21 13:48:05 +01:00
VESSILLER
ec19b2feef FIX phpcs nestling too high level 2020-02-21 12:00:16 +01:00
Laurent Destailleur
7909055ee8 Enhance multilangue support in website module 2020-02-21 11:36:16 +01:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
Frédéric FRANCE
4801117c37
avoid warning if not an array 2020-02-21 09:24:24 +01:00
oscim
d255c95661
Update emailcollector.class.php
For support multiple () and select last () in result regex 
Sample: object.email=EXTRACT:BODY:E-mail(:([a-zA-Z0-9_@.-]*)\n|\r);
2020-02-21 09:04:24 +01:00
Laurent Destailleur
1f4b639ba0 Debug MRP module 2020-02-20 17:44:03 +01:00
Laurent Destailleur
92752439de fix css 2020-02-20 17:06:14 +01:00
Laurent Destailleur
6cd4d15245 Debug the new bookmark in top menu + support for MD theme 2020-02-20 17:05:28 +01:00
andreubisquerra
e316061a9a
Fix travis 2020-02-20 16:26:30 +01:00
DEMAREST Maxime
4630525973 Fix: Mouvementstock::get_origin modulenme whith origintype 2020-02-20 16:19:28 +01:00
andreubisquerra
7a241ba042
Fix travis 2020-02-20 15:47:40 +01:00
andreubisquerra
7200472427
Travis fix 2020-02-20 15:45:42 +01:00
Laurent Destailleur
c29e1e78f3 NEW Bookmarks are now in top menu bar 2020-02-20 15:43:31 +01:00
Laurent Destailleur
593091f399 FIX etrafield with visibilty=5 were not in read only
FIX CSS
FIX option for topbar search and bookmarks

Conflicts:
	htdocs/theme/eldy/global.inc.php
2020-02-20 15:29:59 +01:00
Laurent Destailleur
a3fce650d9 FIX etrafield with visibilty=5 were not in read only
FIX CSS
FIX option for topbar search and bookmarks
2020-02-20 15:25:32 +01:00
javierybar
2942e85e47 More elegant and easy to understand printer setup 2020-02-20 15:16:17 +01:00
Frédéric FRANCE
3df3a2560c
fix workflow with multicurrency 2020-02-20 15:11:31 +01:00
Laurent Destailleur
52c7f908a0 Doxygen 2020-02-20 14:02:27 +01:00
Laurent Destailleur
2c477c7169 Fix doxygen 2020-02-20 13:54:41 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
b41c1c10a0 Fix doxygen 2020-02-20 13:00:27 +01:00
Laurent Destailleur
7234d841e1 Fix doxygen 2020-02-20 12:59:53 +01:00
Laurent Destailleur
1064c7ea4e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-20 12:39:37 +01:00
Laurent Destailleur
e73d83767c Fix phpcs 2020-02-20 12:35:48 +01:00
Anthony Berton
298853138a
Update contact.class.php 2020-02-20 12:17:55 +01:00
Ferran Marcet
9ff424e23b FIX: Visualization rights correction on last modified contacts box 2020-02-20 11:45:46 +01:00
Frédéric FRANCE
523e161f33
fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
2020-02-20 09:45:17 +01:00
Alexandre SPANGARO
a7ca7dfbb6 FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD 2020-02-20 06:00:17 +01:00
Laurent Destailleur
d6d0c9eaef
Merge pull request #12560 from Tetras-Libre/takepos-sort-product
NEW Takepos : Sort products by reference
2020-02-20 01:39:52 +01:00
Laurent Destailleur
ac5e9ce5b3 Fix doc 2020-02-20 01:34:33 +01:00
Laurent Destailleur
1be6c43ed2 Try to fix scrutinizer warnings 2020-02-20 01:29:34 +01:00
Laurent Destailleur
76f0df138b Try to fix doc 2020-02-20 01:26:40 +01:00
Laurent Destailleur
e7ba73bf2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-20 01:09:43 +01:00
Laurent Destailleur
5c48f6f405 Lang of web site is optional 2020-02-20 01:08:53 +01:00
Laurent Destailleur
7796724d63
Update list.php 2020-02-20 01:07:41 +01:00
Laurent Destailleur
960302c012
Merge branch 'develop' into patch-35 2020-02-20 01:07:08 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
2cfca2a45e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/index.php
	htdocs/core/boxes/box_fournisseurs.php
	htdocs/core/boxes/box_propales.php
	htdocs/societe/index.php
2020-02-20 00:18:58 +01:00
Laurent Destailleur
c14daa2790 Can set main language and sublanguages of a website 2020-02-19 18:32:04 +01:00
Laurent Destailleur
44c2909696 FIX Multicompany compatibility 2020-02-19 16:08:33 +01:00
Laurent Destailleur
3fafbb372b Remove call of $mc->dao than hangs. Replaced with $mc use. 2020-02-19 15:51:27 +01:00
Laurent Destailleur
91899d2f56 Fix list of opportunity with filter on search_usage_opportunity 2020-02-19 14:32:12 +01:00
Laurent Destailleur
ace0c7f89d Fix list of opportunity with filter on search_usage_opportunity 2020-02-19 14:31:32 +01:00
Laurent Destailleur
0c571c0376 Restore common behaviour: Draft object are on left under graph.
Open and live objects are on right
2020-02-19 14:20:55 +01:00
Laurent Destailleur
db1e324ba5 Fix trans 2020-02-19 13:58:04 +01:00
Laurent Destailleur
f109864670 NEW Add a profil to import contact categories
Load roles of contact only when required
2020-02-19 13:22:24 +01:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
Laurent Destailleur
394c256ca1
Merge pull request #13129 from mapiolca/patch-33
Fix issue with unselect data
2020-02-19 11:37:52 +01:00
Laurent Destailleur
ac16857501 GETPOST(..., 'alpha') remove " if found instead of returning '' 2020-02-19 11:33:45 +01:00
Pierre Ardoin
bebc37abe3
Update list.php 2020-02-19 08:54:10 +01:00
Pierre Ardoin
34d7fb887f
Show project Ref support if enable
Add search and Project Ref column in the list, only if project module is enable.
2020-02-19 08:50:49 +01:00
Laurent Destailleur
d0d352be1a FIX #13118 2020-02-19 03:37:28 +01:00
Laurent Destailleur
7c07589850 FIX #13124 2020-02-19 03:07:12 +01:00
Laurent Destailleur
43b173ef76 FIX #13131 2020-02-19 01:23:54 +01:00
Laurent Destailleur
016c7ad875 FIX #13135 2020-02-19 01:17:16 +01:00
Laurent Destailleur
f1d16d6961
Merge pull request #13138 from indelog/indelog-dev
NEW: Allow custom module class origine type in Mouvementstock
2020-02-19 00:53:04 +01:00
Laurent Destailleur
9883c0b688
Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount
NEW add weighted amount on project/opportunity
2020-02-19 00:03:03 +01:00
Laurent Destailleur
973539db39
Update index.php 2020-02-18 23:59:53 +01:00
Laurent Destailleur
979d7eb548
Merge pull request #13133 from OPEN-DSI/v10-fix-action-card-assigned-users
FIX keep assigned users in session when loading projects and tasks
2020-02-18 23:51:13 +01:00
Laurent Destailleur
ce3e977fc3
Merge pull request #13141 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2020-02-18 23:49:10 +01:00
Laurent Destailleur
9b522d105e
Merge pull request #13112 from josemariagomezroncero/patch-3
FIX Correction bug dynamic price
2020-02-18 23:48:53 +01:00
Laurent Destailleur
88b104bc2f
Merge pull request #13121 from aspangaro/12.0_a14
NEW: Donation - Update FR CERFA to 11580*04
2020-02-18 23:48:08 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
dacf896f80 FIX Can read salary if permission + user under hierarchy 2020-02-18 23:44:36 +01:00
Laurent Destailleur
ce09ec8805 Fix phpcs 2020-02-18 23:35:45 +01:00
oscim
b0016764c4 Update bank.php
For authorize line manager to see wages paid
2020-02-18 22:59:56 +01:00
Laurent Destailleur
afdca18886 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-18 22:59:03 +01:00
Laurent Destailleur
8c52f324ac Fix doxygen 2020-02-18 22:58:51 +01:00
Laurent Destailleur
b9e522114e
Merge pull request #13123 from oscim/patch-21
Update bank.php
2020-02-18 22:56:45 +01:00
Laurent Destailleur
97b4f68e48
Update bank.php 2020-02-18 22:56:37 +01:00
Laurent Destailleur
0212bc5cf2 Try to fix eclipse warnings on doxygen 2020-02-18 22:54:03 +01:00
Laurent Destailleur
97081affdc Fix perm 2020-02-18 22:50:13 +01:00
Laurent Destailleur
b859d4670a Fix perm 2020-02-18 22:49:53 +01:00
Laurent Destailleur
ac2b13ea52
Merge pull request #13119 from ptibogxiv/patch-305
NEW : api for  get user's documents
2020-02-18 22:46:27 +01:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
fa16063875 Fix bad accounting code set 2020-02-18 22:39:01 +01:00
Laurent Destailleur
31ae0bc06e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/product/card.php
2020-02-18 22:38:30 +01:00
root
0dcb83e6bf referer XSS patches 2020-02-18 22:31:24 +01:00
Laurent Destailleur
5c99355e10 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-18 22:30:31 +01:00
Laurent Destailleur
2069438115
Merge pull request #13125 from 418sec/develop
dolibarr - Cross-site Scripting (XSS) - Fix:
2020-02-18 22:29:53 +01:00
Laurent Destailleur
8d9577137a
Merge pull request #13130 from hregis/10.0_mc2
FIX Multicompany compatibility
2020-02-18 22:28:15 +01:00
Laurent Destailleur
18b99254a1 Experiment ORDER_ENABLE_NEGATIVE 2020-02-18 20:55:22 +01:00
stickler-ci
c6b05040a3 Fixing style errors. 2020-02-18 17:36:00 +00:00
Pierre Ardoin
afadf9dc0e
Fix Not Display Photo with Multicompany 2020-02-18 18:34:15 +01:00
DEMAREST Maxime
30ef5f54dd Allow custom module class origine type in Mouvementstock 2020-02-18 18:24:54 +01:00
atm-ph
bb64d2d353 Fix create supplier invoice from supplier order don't keep source object as linked obkect 2020-02-18 16:00:12 +01:00
Laurent Destailleur
6a97b1b9c8 css 2020-02-18 13:56:24 +01:00
Laurent Destailleur
24bb61b5e4 FIX Usage of project not available in export. 2020-02-18 12:51:53 +01:00
Laurent Destailleur
b6be42e103 FIX List of viewed projects too large in task widget 2020-02-18 12:40:50 +01:00
Laurent Destailleur
67eb584a7f FIX Missing field "billed" in export 2020-02-18 12:22:25 +01:00
Laurent Destailleur
7e814e2a08 FIX Menu truncated. Add tooltip to have all content. 2020-02-18 12:01:19 +01:00
Laurent Destailleur
9ce0e6869e Fix trans 2020-02-18 11:55:39 +01:00
VESSILLER
d1e9f3a505 FIX keep assigned users in session when loading projects and tasks 2020-02-18 11:18:00 +01:00
David Beniamine
1cd566f1ae
Merge tag 'develop' of https://github.com/Dolibarr/dolibarr into takepos-sort-product 2020-02-18 11:09:45 +01:00
Regis Houssin
110a23623b FIX an external user can not approved 2020-02-18 11:04:11 +01:00
Laurent Destailleur
b618581692 More ajax button in setup. Can reload after on ajaxonoff. 2020-02-18 09:38:34 +01:00
Pierre Ardoin
dbb7db376b
fix error code 2020-02-18 09:16:12 +01:00
Regis Houssin
4511cf1060 FIX missing "statut" for getNomUrl() function 2020-02-18 09:03:25 +01:00
Regis Houssin
1034e4a472 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_mc2 2020-02-18 09:02:35 +01:00
Regis Houssin
f6f0d9d4a2 FIX better method to check user rights AND usergroup rights ! 2020-02-18 08:35:51 +01:00
Pierre Ardoin
49dd8e30aa
Fix not display data 2020-02-18 08:28:39 +01:00
Laurent Destailleur
7b4c674bdc Fix css 2020-02-17 21:43:53 +01:00
Laurent Destailleur
1d760f0e42 Add MO in project overwiew 2020-02-17 21:24:59 +01:00
Laurent Destailleur
6555f5d74f More default hmtl tags in restricthtmlonly 2020-02-17 20:55:17 +01:00
Pierre Ardoin
ef64e20367
Fix not display value 2020-02-17 19:34:09 +01:00
Pierre Ardoin
f8e18a3826
Fix Not displayed email 2020-02-17 19:25:25 +01:00