Commit Graph

80319 Commits

Author SHA1 Message Date
Regis Houssin
111f73bd86 FIX add default value of timestamp for avoid error 2020-10-08 12:29:01 +02:00
Laurent Destailleur
b8681c0b41 css 2020-10-08 11:59:33 +02:00
Laurent Destailleur
24d35ff9b5 CSS 2020-10-08 11:52:58 +02:00
Regis Houssin
aa84b76b6a FIX Multicompany compatibility (missing entity value) 2020-10-08 11:43:12 +02:00
Laurent Destailleur
3cd953bc41 Fix colspan 2020-10-08 11:40:05 +02:00
quentin
77552c6508 Merge branch 'NEW_helper_functions' of github.com:atm-quentin/dolibarr into NEW_helper_functions 2020-10-08 10:50:08 +02:00
atm-lena
74ae9a2618 FIX CA report by product/service : subcategory filter 2020-10-08 10:49:46 +02:00
quentin
7591ec6cf6 FIX style 2020-10-08 10:49:29 +02:00
stickler-ci
f4c3d9d7bb Fixing style errors. 2020-10-08 08:38:28 +00:00
stickler-ci
f5b34370b6 Fixing style errors. 2020-10-08 08:34:40 +00:00
quentin
fe8d7f7f1b missing public parameter 2020-10-08 10:32:16 +02:00
Sekan, Tobias
7e3a3a4cf3 Add more filter for leave log view 2020-10-08 10:30:09 +02:00
quentin
bf97d2a50f NEW helper functions for export with phpspreadsheet 2020-10-08 10:26:30 +02:00
Laurent Destailleur
4674eda45a Standardize columns comment 2020-10-08 10:13:44 +02:00
Laurent Destailleur
688d915cca CSS 2020-10-08 10:04:36 +02:00
Laurent Destailleur
70fa262293 CSS 2020-10-08 09:30:15 +02:00
Aurélien
9c02390066
fix migration12->13.sql #14697
fix drop constraint
fix error on update extrafields
2020-10-07 21:50:54 +02:00
Aurélien
16e076d182
fix UPDATE llx_extrafields.elementtype = livraison to delivery #14697 2020-10-07 20:54:56 +02:00
Ahmad Jamaly Rabib
40e16cc840 NEW ADDED IMPORT TOOL FOR PO
Added Purchase Order import functionality
2020-10-08 00:34:53 +06:00
Laurent Destailleur
ff739dcbd2 Increase size of small image (used by PDF) 2020-10-07 19:39:17 +02:00
Laurent Destailleur
1a39e963a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-07 17:41:55 +02:00
Laurent Destailleur
eb41a72e27 Properties ->titre have been renamed into ->title 2020-10-07 17:41:36 +02:00
Laurent Destailleur
532cdd639f
Merge pull request #14955 from Dolisupport/develop
Improved emailconfirmation of ticket module when you create a new ticket
2020-10-07 17:19:56 +02:00
Laurent Destailleur
561ca757d7 phpcs 2020-10-07 17:17:13 +02:00
Hans
57acfb738f
Update card.php 2020-10-07 16:48:50 +02:00
Hans
f6f164893e
Update ticket.class.php 2020-10-07 16:45:06 +02:00
Laurent Destailleur
24295b309d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-07 15:38:24 +02:00
Laurent Destailleur
c7ca99accb Fix default value of enabled property of menu entry 2020-10-07 15:38:07 +02:00
Laurent Destailleur
213cefb570
Merge pull request #14941 from aspangaro/13a22
WIP NEW Add clone functionality on miscellaneous payment
2020-10-07 15:31:09 +02:00
Laurent Destailleur
45762ecccb Use ajax select2 beautifier in select component of type of holiday 2020-10-07 15:28:19 +02:00
Laurent Destailleur
85f38f7504 css 2020-10-07 15:27:50 +02:00
Laurent Destailleur
400146bed4
Merge pull request #14953 from TobiasSekan/MoreFilterOnMonthlyStatementList
NEW Add more filters on monthly statement list
2020-10-07 15:23:47 +02:00
Laurent Destailleur
ad5641dc76
Merge pull request #14951 from TobiasSekan/SelectableColumnsOnSupplierInvoicePaymentList
NEW Select-able columns on supplier invoice payment list
2020-10-07 15:19:19 +02:00
Laurent Destailleur
415840e346
Merge pull request #14952 from TobiasSekan/AllowZeroQualityOnSupplierOrderLines
NEW Allow zero quality on supplier/vendor order line
2020-10-07 15:07:53 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
96ab66ea5a Add function 2020-10-07 14:58:54 +02:00
Laurent Destailleur
4c87949be0 Fix scrutinizer 2020-10-07 14:53:10 +02:00
Sekan, Tobias
a119a75fe0 add more filter on monthly statement list 2020-10-07 14:00:32 +02:00
Laurent Destailleur
5da923c80d phpcs 2020-10-07 13:42:46 +02:00
Laurent Destailleur
3ace9f638a Clean code 2020-10-07 13:20:38 +02:00
Sekan, Tobias
3f39766064 Allow zero quality on supplier order line 2020-10-07 13:10:04 +02:00
Laurent Destailleur
33fe5eb85f Fix sql request 2020-10-07 12:53:17 +02:00
Laurent Destailleur
e369610538 Fix 2020-10-07 12:48:05 +02:00
Laurent Destailleur
59e89fd53a Fix 2020-10-07 12:42:41 +02:00
Laurent Destailleur
145b1e97ca Fix sql 2020-10-07 12:41:25 +02:00
Laurent Destailleur
d1c2772ee7 NEW Add function dolButtonToOpenUrlInDialogPopup() to be able to open
any url into a dialog popup.
2020-10-07 12:31:15 +02:00
Florian HENRY
36353f7c9b Merge github.com:Dolibarr/dolibarr into develop 2020-10-07 12:04:18 +02:00
stickler-ci
85b7458b02 Fixing style errors. 2020-10-07 09:24:37 +00:00
Sekan, Tobias
e26ab93179 missing code remove from last commit 2020-10-07 11:22:23 +02:00
Sekan, Tobias
29ee420f3e Selectable columns on sup. invoice payment list 2020-10-07 11:18:31 +02:00
Alexandre SPANGARO
973502bb1e Fix 2020-10-07 09:36:29 +02:00
Laurent Destailleur
8febb19b50 Translation 2020-10-07 01:12:27 +02:00
Laurent Destailleur
294688891d CSS 2020-10-07 01:10:26 +02:00
Laurent Destailleur
84105e996a Fix for #14940 2020-10-07 01:03:48 +02:00
Laurent Destailleur
ea8ec4ea90 Clean code 2020-10-07 00:59:05 +02:00
Laurent Destailleur
31f4d99e19 css 2020-10-07 00:53:01 +02:00
Laurent Destailleur
e9bcd95c39 Add information column on page to export source of accounting document 2020-10-07 00:49:19 +02:00
Laurent Destailleur
77788a0591 Clean code 2020-10-07 00:26:03 +02:00
Laurent Destailleur
f16a58a62c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modSocialNetworks.class.php
2020-10-06 23:36:15 +02:00
Laurent Destailleur
47c80f0d14
Merge pull request #14942 from TobiasSekan/ShowProjectOverviewCount
Show count on project overview tab
2020-10-06 23:34:43 +02:00
Laurent Destailleur
13ec304b79
Update project.lib.php 2020-10-06 23:30:51 +02:00
Laurent Destailleur
04f8de4188 Remove dependency 2020-10-06 17:59:31 +02:00
Laurent Destailleur
2c5d396546 Fix upload file 2020-10-06 17:45:08 +02:00
Laurent Destailleur
b0d20f92dc FIX autofocus on first setup 2020-10-06 17:32:55 +02:00
Laurent Destailleur
459ebe2e56 css 2020-10-06 17:26:55 +02:00
Laurent Destailleur
00e9a9a509 Sanitize color 2020-10-06 17:10:00 +02:00
Laurent Destailleur
ca189099dd Look and feel v13 2020-10-06 17:00:17 +02:00
Laurent Destailleur
663f149982 Better error management 2020-10-06 16:48:48 +02:00
Laurent Destailleur
a744abce94 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 16:30:12 +02:00
Laurent Destailleur
e247b2de61 FIX list of fields in list of recurring invoices was empty 2020-10-06 16:29:29 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697 2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697 2020-10-06 15:57:50 +02:00
Laurent Destailleur
4ea102f1de css 2020-10-06 15:18:32 +02:00
Laurent Destailleur
95f67309e2 Clean code 2020-10-06 15:11:45 +02:00
Alexandre SPANGARO
503f190fd4 Fix 2020-10-06 14:39:10 +02:00
Aurélien
d103a9aede
rename table on migration #14697 2020-10-06 14:35:27 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Laurent Destailleur
254d9edbb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 13:18:58 +02:00
Laurent Destailleur
6933b7ec9c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/agenda.lib.php
2020-10-06 13:15:52 +02:00
Laurent Destailleur
989074f13a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-06 13:13:31 +02:00
Laurent Destailleur
3f5db927bc Fix phpcs 2020-10-06 13:13:07 +02:00
Laurent Destailleur
c3b2371c6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 13:08:34 +02:00
Laurent Destailleur
4701656d95 Fix look and field v13 2020-10-06 13:08:20 +02:00
Sekan, Tobias
3ceb5c217f Show count on project overview tab 2020-10-06 12:56:28 +02:00
Laurent Destailleur
222b49b3cf
Merge pull request #14799 from atm-greg/New_trigger_handler_in_modulebuilder
new handle trigger method
2020-10-06 12:36:51 +02:00
Laurent Destailleur
a32456afc5
Update interface_99_modMyModule_MyModuleTriggers.class.php 2020-10-06 12:35:18 +02:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
ef2e531d34
Merge pull request #14928 from TobiasSekan/SelectableColumnsOnCustomerInvoicePaymentList
NEW Select-able columns on customer invoice paymnet list
2020-10-06 12:28:20 +02:00
Laurent Destailleur
1c38379622 Better message 2020-10-06 12:22:58 +02:00
Laurent Destailleur
38acd83f4d Review some titles and tooltip help to be more clear. 2020-10-06 12:17:33 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6
change variable #14697 2020-10-06 11:37:55 +02:00
Aurélien
140200213e
change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
lvessiller
496150d747 FIX extrafield required error after submit 2020-10-06 10:21:24 +02:00
Laurent Destailleur
c5c8bd7838
Merge pull request #14937 from aspangaro/13a21
NEW Accountancy - Move to real ledger, real journals, menu disposition
2020-10-06 10:04:41 +02:00
Alexandre SPANGARO
050a4770d3 WIP NEW Add clone functionality on miscellaneous payment 2020-10-06 10:04:15 +02:00
Laurent Destailleur
8d0b9169bc
Merge pull request #14936 from aspangaro/13a20
NEW Vat report - Invert constant to show by default zero vat in reports
2020-10-06 10:00:00 +02:00
Laurent Destailleur
4ca3957349
Merge pull request #14934 from frederic34/patch-4
fix typo
2020-10-06 09:58:13 +02:00
Laurent Destailleur
48ed3f5783
Merge pull request #14933 from ptibogxiv/patch-386
FIX php error in takepos
2020-10-06 09:57:40 +02:00
Laurent Destailleur
351f80c540
Update index.php 2020-10-06 09:57:04 +02:00
Laurent Destailleur
9ad75b46d9
Merge pull request #14935 from frederic34/patch-6
doxygen
2020-10-06 09:55:51 +02:00
Laurent Destailleur
9ada5c7427
Merge pull request #14938 from ppenelon/ppenelon-patch-1
FIX Require Discount class on markAsCreditAvailable API method
2020-10-06 09:55:28 +02:00
Laurent Destailleur
054c58df16 Add currency into the select 2020-10-06 09:53:29 +02:00
Laurent Destailleur
4290395375 Fix according to PR #14939 2020-10-06 09:53:10 +02:00
Laurent Destailleur
7c6c319607 Trans 2020-10-06 09:31:54 +02:00
stickler-ci
8f542a8572 Fixing style errors. 2020-10-06 06:56:08 +00:00
Sekan, Tobias
33b7d06bb9 address feedback + tooltip + reduce indent 2020-10-06 08:46:53 +02:00
stickler-ci
b9cc780c3c Fixing style errors. 2020-10-05 21:58:00 +00:00
Pierre Penelon
609a29219d
FIX|Missing require in API : markAsCreditAvailable
Quick fix of a problem I encountered earlier when using `markAsCreditAvailable` API method for invoice routes.
The method was using the `DiscountAbsolute` class without importing it resulting in a 500 HTTP error.
2020-10-05 23:54:37 +02:00
Alexandre SPANGARO
6745c377a6 Double line 2020-10-05 22:35:12 +02:00
Alexandre SPANGARO
6a0f2233a6 NEW Accountancy - Move to real ledger, real journals, menu disposition 2020-10-05 21:44:39 +02:00
Alexandre SPANGARO
d83d9895e0 NEW Vat report - Invert constant to show by default zero vat in reports 2020-10-05 20:52:31 +02:00
Frédéric FRANCE
83eb7a8d8d
doxygen 2020-10-05 20:16:18 +02:00
Frédéric FRANCE
005cc093b9
fix typo 2020-10-05 20:02:23 +02:00
ptibogxiv
bb0b9dc128
FIX php error in takepos 2020-10-05 18:16:32 +02:00
Laurent Destailleur
73b40828c8 Trans 2020-10-05 18:15:37 +02:00
Laurent Destailleur
25b9460521 Look and feel v12 2020-10-05 18:05:26 +02:00
Laurent Destailleur
ad087ac360 Use color of RH module for type "employee" 2020-10-05 17:24:47 +02:00
Laurent Destailleur
9b768b5eab
Merge pull request #14926 from aspangaro/13a17
NEW Accountancy - Add chart of sub accounts
2020-10-05 17:20:14 +02:00
Laurent Destailleur
03226ad2a5
Merge pull request #14810 from TobiasSekan/FixAdminCanRemoveAllHisUserRights
FIX that a admin can remove all his user rights
2020-10-05 17:18:24 +02:00
Laurent Destailleur
9309048bda
Merge pull request #14923 from ptibogxiv/patch-385
New display currency in takepos payment
2020-10-05 16:45:17 +02:00
Laurent Destailleur
23f1137c84
Merge pull request #14920 from rabib-metroworks/import-vendor-invoice
NEW Can import Supplier invoice
2020-10-05 16:44:49 +02:00
Laurent Destailleur
bb39d7b205
Merge pull request #14916 from ptibogxiv/patch-382
Fix  and save change of currency in invoice (takepos)
2020-10-05 16:44:28 +02:00
Laurent Destailleur
44ecc15a07
Merge pull request #14915 from ptibogxiv/patch-380
Fix reload display when invoice deleting in takepos
2020-10-05 16:43:55 +02:00
Laurent Destailleur
196cb9c7f6
Merge pull request #14929 from rabib-metroworks/import-order-module
NEW Can import sales order
2020-10-05 16:43:29 +02:00
Laurent Destailleur
0fdad1b63d
Merge pull request #14914 from ptibogxiv/patch-379
Fix better display print/send button on takepos
2020-10-05 16:43:11 +02:00
Laurent Destailleur
10d21eee03
Merge pull request #14911 from ptibogxiv/patch-376
Fix display stock rights in takepos
2020-10-05 16:42:31 +02:00
Laurent Destailleur
24527c973d
Merge pull request #14910 from ptibogxiv/patch-375
Fix multicompany in activity box
2020-10-05 16:42:14 +02:00
Laurent Destailleur
ffc0f51827
Merge pull request #14909 from ptibogxiv/patch-374
Fix multicurrency modal in takepos
2020-10-05 16:41:56 +02:00
Laurent Destailleur
099c19cefb
Merge pull request #14912 from ptibogxiv/patch-378
NEW multicurrency total in takepos
2020-10-05 16:40:59 +02:00
Laurent Destailleur
a26f9b66f6
Merge pull request #14919 from frederic34/patch-4
doxygen
2020-10-05 16:39:14 +02:00
Laurent Destailleur
e5cdffcdec
Merge pull request #14922 from andreubisquerra/develop
TakePOS connector compatibility with RECEIPT PRINTERS module
2020-10-05 16:38:56 +02:00
Laurent Destailleur
243d576f83
Update invoice.php
Log for debug
2020-10-05 16:38:40 +02:00
Laurent Destailleur
1b9b04db87
Merge pull request #14925 from zedzedtop/develop
Enable TPL overriding for document_actions_post_headers.tpl.php
2020-10-05 16:36:35 +02:00
Aurélien
c1b0c1f6a2
rename folder ref to Module Delivery 2020-10-05 15:32:29 +02:00
stickler-ci
0e7d429991 Fixing style errors. 2020-10-05 13:24:17 +00:00
Christian Foellmann
fb7ed3afc1 optimize mail templates edit screen 2020-10-05 15:20:27 +02:00
Florian HENRY
4e711d4e30 fix bad test syntax 2020-10-05 15:15:15 +02:00
Laurent Destailleur
afd6da3b94 Better error management 2020-10-05 14:51:28 +02:00
Laurent Destailleur
5c3b83b82e Show small image in setup page 2020-10-05 14:06:14 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697 2020-10-05 13:59:59 +02:00
Ahmad Jamaly Rabib
4a6000c750 NEW ADDED IMPORT TOOL FOR CUSTOMER ORDER
Added Order import functionality in import module
2020-10-05 16:39:26 +06:00
Laurent Destailleur
ee40aeecce Standardize API 2020-10-05 12:21:54 +02:00
Laurent Destailleur
cfc3c01815 Factorize code to know if a parameter is used to store a secret 2020-10-05 12:13:06 +02:00
Sekan, Tobias
8447817f8c fix swapped array entries 2020-10-05 11:38:07 +02:00
Sekan, Tobias
3984d8c2b8 Add selectable columns on cust. invoice pay. list 2020-10-05 11:27:44 +02:00
Alexandre SPANGARO
8d4fe7567a Merge branch '13a17' of https://github.com/aspangaro/dolibarr into 13a17 2020-10-05 10:11:32 +02:00
Alexandre SPANGARO
8ee7861276 Typo 2020-10-05 10:11:19 +02:00
stickler-ci
cf76a67712 Fixing style errors. 2020-10-05 08:10:39 +00:00
Alexandre SPANGARO
cab6ef092f NEW Accountancy - Add chart of sub accounts 2020-10-05 10:05:21 +02:00
Laurent Destailleur
8a079cf716 Code comment 2020-10-05 09:31:12 +02:00
Sébastien
6c11f7823a
Enable TPL overriding for document_actions_post_headers.tpl.php
Currently it is not possible to override the "document_actions_post_headers.tpl.php" template via a third party module. This addition of code adds this possibility
2020-10-05 10:16:30 +04:00
Laurent Destailleur
62177edab1 NEW Can force the antivirus from conf file or autoprepend ini setup. 2020-10-05 05:00:59 +02:00
Laurent Destailleur
a68ba1704b Fix phpcs 2020-10-05 02:25:57 +02:00
Laurent Destailleur
800c0d2b00 Fix method must return a string not print on output 2020-10-05 02:24:45 +02:00
Laurent Destailleur
fb15277c15 Better tooltip 2020-10-04 23:53:15 +02:00
ptibogxiv
078459fc44
New display currency in takepos payment
to do in next PR (payment with multicurrency in other currency that principal)
2020-10-04 23:35:19 +02:00
Laurent Destailleur
a6fe03bd14 Fix doc 2020-10-04 23:30:41 +02:00
Laurent Destailleur
63415e9728 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_shipments.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/core/tpl/objectline_edit.tpl.php
2020-10-04 23:27:52 +02:00
Laurent Destailleur
ca16606b4f Fix phpcs 2020-10-04 23:21:24 +02:00
andreubisquerra
1c34a7acda
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:50:27 +02:00
andreubisquerra
65c6881fc9
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:49:47 +02:00
ptibogxiv
1a407e4c22
NEW set entity when creating invoice on takepos
usefull for marketplace, coworking, multibranding shop
2020-10-04 22:09:40 +02:00
Ahmad Jamaly Rabib
66a1aa9a86 NEW ADDED IMPORT TOOL FOR SUPPLIER INVOICE
Added supplier invoice import functionality in import module
2020-10-05 00:39:35 +06:00
Frédéric FRANCE
4aa47d14b4
Update bookkeeping.class.php 2020-10-04 20:29:57 +02:00
Laurent Destailleur
07e1646b3a Minor fixes 2020-10-04 19:09:25 +02:00
Laurent Destailleur
aeb895b1c6 CSS 2020-10-04 18:43:56 +02:00
ptibogxiv
55764779c4
Update invoice.php 2020-10-04 17:12:01 +02:00
ptibogxiv
e280fc3ad1
Fix and save change of currency in invoice (takepos) 2020-10-04 16:53:31 +02:00
stickler-ci
32a882e83c Fixing style errors. 2020-10-04 13:56:36 +00:00
ptibogxiv
fac60bdf24
Fix reload display when invoice deleting 2020-10-04 15:54:23 +02:00
ptibogxiv
eaedcff2a8
Fix better display print/send button on takepos 2020-10-04 15:01:22 +02:00
ptibogxiv
1e6ad59856
Update invoice.php 2020-10-04 14:42:16 +02:00
stickler-ci
d25c5bf36a Fixing style errors. 2020-10-04 12:40:52 +00:00
ptibogxiv
31dd9885e6
NEW multicurrency total in takepos 2020-10-04 14:39:02 +02:00
ptibogxiv
415deb1500
Fix display stock rights in takepos
only display if user have read right
2020-10-04 14:27:03 +02:00
ptibogxiv
4aafe72bf2
Fix multicompany in activity box 2020-10-04 14:19:53 +02:00
ptibogxiv
36fc987f1e
Fix multicurrency modal
+ avoid loud page if not used
2020-10-04 14:04:44 +02:00
ptibogxiv
dd1904c521
Fix multicompany in last action box 2020-10-04 13:58:46 +02:00
Laurent Destailleur
2ca28c37b6
Merge pull request #14790 from c3do/patch-14
FIX API paymentsdistributed accept multicurrency part payment
2020-10-04 11:28:33 +02:00
Laurent Destailleur
f09258713e
Merge pull request #14907 from andreubisquerra/master
NEW: TakePOS Multicurrency compatibility
2020-10-04 11:26:58 +02:00
andreubisquerra
4c64b99235
Lang fix 2020-10-03 23:16:13 +02:00
andreubisquerra
d43d1e8519
Clean 2020-10-03 23:03:08 +02:00
andreubisquerra
18cd870307
Fix travis 2020-10-03 22:31:55 +02:00
jove@bisquerra.com
017d4946fe NEW: TakePOS Multicurrency compatibility 2020-10-03 22:13:32 +02:00
Laurent Destailleur
cab2c24e27
Merge branch 'develop' into patch-43 2020-10-03 15:51:38 +02:00
Laurent Destailleur
c806ae2654
Merge pull request #14792 from c3do/patch-15
FIX API Order unlink contact did not work like expected
2020-10-03 15:30:07 +02:00
Laurent Destailleur
9b3cd421ee Fix doc 2020-10-03 14:56:04 +02:00
Laurent Destailleur
f764b36a64 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-03 14:53:22 +02:00
Laurent Destailleur
f217959740 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-03 14:51:30 +02:00
Laurent Destailleur
ca0dcb4db0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_supplier_orders.php
2020-10-03 14:51:18 +02:00
Laurent Destailleur
5ed7b43214 phpcs 2020-10-03 14:48:19 +02:00
Laurent Destailleur
9e48920e1d
Merge pull request #14902 from ptibogxiv/patch-368
Fix multicompany in order box
2020-10-03 14:15:11 +02:00
Laurent Destailleur
ae16b45a5b
Merge pull request #14900 from frederic34/patch-4
use create instead edit on create contract
2020-10-03 14:14:53 +02:00
Laurent Destailleur
08afb586f8
Merge pull request #14903 from ptibogxiv/patch-369
Fix multicompany in propal box
2020-10-03 14:13:29 +02:00
Laurent Destailleur
71ab4c4a70
Merge pull request #14905 from ptibogxiv/patch-371
Fix multicompany in supplier order awaiting box
2020-10-03 14:12:57 +02:00
Laurent Destailleur
3b34c496cc Code 2020-10-03 14:11:47 +02:00
ptibogxiv
af2bd76500
Fix multicompany in shipment box 2020-10-03 14:06:33 +02:00
ptibogxiv
69660d1a9d
Update box_supplier_orders.php 2020-10-03 14:02:59 +02:00
Laurent Destailleur
581a3d8808 FIX Add a better message when file size is too large 2020-10-03 14:02:53 +02:00
ptibogxiv
331db5e367
Fix multicompany in supplier order awaiting box 2020-10-03 14:01:46 +02:00
ptibogxiv
26a2fea8c7
Fix multicompany in supplier order box 2020-10-03 14:00:23 +02:00
ptibogxiv
e9c101349b
Fix multicompany in propal box 2020-10-03 13:57:37 +02:00
ptibogxiv
3840d6c0a7
Fix entity in ordre box 2020-10-03 13:52:52 +02:00
Laurent Destailleur
3de6fd8918 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-03 11:32:40 +02:00
Laurent Destailleur
272b98faab FIX #14901 2020-10-03 11:31:56 +02:00
Laurent Destailleur
1c34868028 Fix field must be null because there is no numbering ref module yet 2020-10-03 11:16:31 +02:00
Frédéric FRANCE
711339945c
use create instead edit on create contract 2020-10-02 21:41:05 +02:00
Laurent Destailleur
c2fed95dc4 FIX #14877 2020-10-02 19:54:06 +02:00
Laurent Destailleur
50ca9f4145 Clean code 2020-10-02 19:10:30 +02:00
Laurent Destailleur
1a535dc77b Clean code 2020-10-02 19:00:15 +02:00
Laurent Destailleur
e7ce888cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 16:15:38 +02:00
Laurent Destailleur
03ede71989 Clean code 2020-10-02 16:15:24 +02:00
Laurent Destailleur
b90f912099
Merge pull request #14898 from bb2a/Droit-for-Download-vcad-user
Restric for download vcar user
2020-10-02 15:43:07 +02:00
Laurent Destailleur
b15d862f36
Merge pull request #14870 from atm-john/12.0_add_filters_on_tab_soc_price
ADD : Filters more filters on customer price tab
2020-10-02 15:40:52 +02:00
Anthony Berton
533fdda848 Update vcard.php 2020-10-02 15:11:02 +02:00
stickler-ci
2ea6c092a4 Fixing style errors. 2020-10-02 13:05:50 +00:00
Laurent Destailleur
bede4040f6
Update productcustomerprice.class.php 2020-10-02 15:04:03 +02:00
Laurent Destailleur
331f751905
Merge pull request #14866 from defrance/patch-156
NEW add two hooks printFieldListFrom and printFieldSearchParam
2020-10-02 15:01:12 +02:00
Laurent Destailleur
9ea7e26458 Complete #14866 2020-10-02 15:00:39 +02:00
Laurent Destailleur
31710479dc
Update list.php 2020-10-02 14:59:18 +02:00
Laurent Destailleur
399258cc86
Update list.php 2020-10-02 14:55:02 +02:00
Laurent Destailleur
5cf738381f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 14:45:29 +02:00
Laurent Destailleur
d482594499 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 14:45:20 +02:00
Laurent Destailleur
88714cfb18 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-02 14:44:23 +02:00
Laurent Destailleur
cee28d0253 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-02 14:43:54 +02:00
Laurent Destailleur
cdc9d3dd1b
Merge pull request #14480 from OPEN-DSI/v10-fix-objectline-edit-tpl-margins-rates
FIX update margins rates on object line edit
2020-10-02 14:43:13 +02:00
Laurent Destailleur
500ef243e2
Merge pull request #14815 from ptibogxiv/patch-365
NEW restrict thirdparty to customer in takepos
2020-10-02 14:41:11 +02:00
Laurent Destailleur
954a6b5b3b CSS 2020-10-02 14:26:16 +02:00
Laurent Destailleur
bc308fc662 Look and feel v13 - Disabled users are greyed 2020-10-02 14:19:44 +02:00
Laurent Destailleur
5256229089 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 13:51:47 +02:00
Laurent Destailleur
10deb1baad Clean code - Removed no more used files orderstoinvoice.php 2020-10-02 13:51:32 +02:00
Laurent Destailleur
230edd5b67
Merge pull request #14890 from inoveaconseil/NEWHookPropalcard
New hook propalcard
2020-10-02 13:46:53 +02:00
Laurent Destailleur
d297e0b05a
Update card.php 2020-10-02 13:46:44 +02:00
Laurent Destailleur
00cb3277ec
Merge pull request #14891 from inoveaconseil/Newhidelabelvariant
NEW hide label in pdf for variants
2020-10-02 13:45:52 +02:00
Laurent Destailleur
7e414fe9da
Merge pull request #14889 from frederic34/ecm_extrafields
NEW Add extrafields support on ECM module
2020-10-02 13:44:45 +02:00
Laurent Destailleur
193c9ac803
Merge pull request #14892 from atm-john/develop_new_search_param_for_order_close_date
NEW Add search param for close date on order list
2020-10-02 13:42:02 +02:00
Laurent Destailleur
440ad2035e
Merge pull request #14893 from FHenry/develop
Add missing lang file (if order is billed the status icon "billed" is not translated
2020-10-02 13:41:23 +02:00
Laurent Destailleur
3c6fcced8e Clean code 2020-10-02 13:38:35 +02:00
Laurent Destailleur
86c9c28e7c
Merge pull request #14895 from hregis/12.0_ldap
FIX missing hook 'formConfirm' in 'addreplace' $hooktype
2020-10-02 13:33:35 +02:00
Regis Houssin
f67189aaa8 FIX missing hook 'formConfirm' in 'addreplace' $hooktype 2020-10-02 13:16:42 +02:00
Laurent Destailleur
0893f0250a Minor bug fixes 2020-10-02 12:54:56 +02:00
Florian HENRY
18c946dc75 add missing translation 2020-10-02 10:37:02 +02:00
Florian HENRY
1bbd4da0fe add missing translation 2020-10-02 10:36:16 +02:00
stickler-ci
a7b4f0ec49 Fixing style errors. 2020-10-02 07:43:29 +00:00
John Botella
f31e689480 Fix new look and feel 2020-10-02 09:39:54 +02:00
Nicolas
9e4e027495 Hide label 2020-10-02 09:39:42 +02:00
Nicolas
85dfb5bf3c Hide the label into pdf document for variants 2020-10-02 09:27:01 +02:00
Nicolas
e72fbbfe17 Hide the label into pdf document for variants 2020-10-02 09:21:44 +02:00
John Botella
ac7a747004 Merge branch '12.0_new_search_param_for_order_close_date' into develop 2020-10-02 09:19:25 +02:00
stickler-ci
4707ea2a27 Fixing style errors. 2020-10-02 06:48:14 +00:00
Nicolas
d976d474df NEW Hook on propal card 2020-10-02 08:42:48 +02:00
Laurent Destailleur
ce0fa53cb0 Fix delete of file from file manager 2020-10-02 03:07:31 +02:00
Laurent Destailleur
4e49461143 code comment 2020-10-02 02:11:04 +02:00
Laurent Destailleur
e1d156973b phpcs 2020-10-02 02:08:04 +02:00
Laurent Destailleur
813deee4a5 Fix phpcs 2020-10-02 01:14:43 +02:00
Frédéric FRANCE
16ff15b48c
fix 2020-10-02 00:29:36 +02:00
Frédéric FRANCE
b78e506e39
add files 2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields 2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm 2020-10-02 00:21:13 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
2020-10-01 19:43:23 +02:00
Laurent Destailleur
8d08290f21 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-01 19:38:11 +02:00
Laurent Destailleur
0fa139f4e3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/takepos/invoice.php
2020-10-01 19:37:56 +02:00
Laurent Destailleur
4d134ade72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/takepos/invoice.php
2020-10-01 19:35:49 +02:00
Laurent Destailleur
14736bee63
Merge pull request #14852 from inovea-conseil/newfieldwebsite
NEW website page fields
2020-10-01 19:31:14 +02:00
Laurent Destailleur
ab68d3febe
Merge pull request #14864 from aspangaro/13a20
FIX If salaries subledger account not defined, put only in the general account
2020-10-01 19:29:29 +02:00
Laurent Destailleur
a0722f2a30
Merge pull request #14862 from TobiasSekan/UseObjectFieldsOnContactList
NEW Use object field of contact in contact list (internal)
2020-10-01 19:27:49 +02:00
Laurent Destailleur
04bad37564
Merge pull request #14858 from TobiasSekan/UseObjectFieldsOnProjectList
NEW Use object field of project in project list (internal)
2020-10-01 19:26:42 +02:00
Laurent Destailleur
ed69b6ad15
Merge pull request #14863 from bomuux/patch-2
Bug: ActionComm::ref_ext is not saved properly
2020-10-01 19:21:28 +02:00
Laurent Destailleur
445e0971ac
Merge pull request #14871 from davidNDU/develop
FIX #13979 Module builder: pdf_standard_myobject.modules.php changed specific code (Facture::STATUS_DRAFT), myboject.class.php added $last_main_doc
2020-10-01 19:20:15 +02:00
Laurent Destailleur
f79bce638a
Merge pull request #14872 from FHenry/develop
fix remove php warning non-numeric value
2020-10-01 19:18:11 +02:00
Laurent Destailleur
0ef182216f
Merge pull request #14875 from ptibogxiv/patch-366
FIX date and user cloture / closing display
2020-10-01 19:15:46 +02:00
Laurent Destailleur
89dfb9baf8
Merge pull request #14887 from cfoellmann/fix-origin-user
handle fk_origin for stock movement for users the core way
2020-10-01 19:15:01 +02:00
Laurent Destailleur
26be972b71
Merge pull request #14874 from defrance/patch-157
fix typo error
2020-10-01 19:12:53 +02:00
Laurent Destailleur
580df3d503
Merge pull request #14880 from rabib-metroworks/import-proposal
NEW Can import proposals
2020-10-01 19:09:14 +02:00
Laurent Destailleur
d912908aef NEW Can build vendor invoice from vendor orders 2020-10-01 19:05:20 +02:00
Laurent Destailleur
ece8037f42 The button "Invoice orders" switch to page with lines autoselected. 2020-10-01 18:08:46 +02:00
Florian HENRY
2f5a2d0e28 fix CSRF not provided 2020-10-01 17:42:04 +02:00
Laurent Destailleur
f15ee475f1
Merge pull request #14882 from atm-john/12.0_fix_default_values_and_sended_values
FIX default accountancy values and posted values
2020-10-01 17:06:08 +02:00
Laurent Destailleur
58de8c9149 Close #14885 Merge manualy the PR to solve a conflict. 2020-10-01 17:04:24 +02:00
Laurent Destailleur
f5f2ea57e3 Fix compatibility 2020-10-01 16:57:49 +02:00
Laurent Destailleur
a2efdee865 Fix after regression of #14886 2020-10-01 16:49:27 +02:00
Laurent Destailleur
2f89d526eb Avoid to get a random result. 2020-10-01 16:43:56 +02:00
Laurent Destailleur
8bfc2bed3e Fix navigation into user list 2020-10-01 16:27:17 +02:00
Laurent Destailleur
b258a848e2 NEW Can enable/disable users in bulk actions 2020-10-01 16:21:07 +02:00
Florian
c89f8b323b Rename fk_typeobject to type_object 2020-10-01 15:18:19 +02:00
Christian Foellmann
a890b2d7ad handle fk_origin for stock movement for users the core way 2020-10-01 12:31:00 +02:00
ptibogxiv
4e16db1e5f
Update paymentmodes.php 2020-10-01 12:22:53 +02:00
ptibogxiv
3f78d8fe25
Update stripe.class.php 2020-10-01 12:19:12 +02:00
ptibogxiv
676d70d86d
FIX stripe for connect mode 2020-10-01 12:14:50 +02:00
Laurent Destailleur
298e94e574 Typo 2020-10-01 11:16:43 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
9447eb2873 Typo 2020-10-01 09:50:09 +02:00
stickler-ci
e558dc3f27 Fixing style errors. 2020-10-01 07:48:24 +00:00
John Botella
c16cd91d8e FIX default accountancy values and posted values 2020-10-01 09:40:11 +02:00
Laurent Destailleur
75ff2eb642 Typo 2020-10-01 09:39:18 +02:00
Laurent Destailleur
91f0429bd2 Fix mention for france, only for FR country 2020-10-01 09:34:10 +02:00
Ahmad Jamaly Rabib
0b35a07290 NEW ADDED IMPORT TOOL FOR PROPOSAL MODULE
Added proposal import functionality in import module
2020-10-01 11:52:56 +06:00
Laurent Destailleur
3f1c9999db urlencode 2020-09-30 18:44:26 +02:00
Laurent Destailleur
1690468da5 Fix delete of profiles 2020-09-30 18:39:23 +02:00
stickler-ci
e14c971b69 Fixing style errors. 2020-09-30 13:29:20 +00:00
ptibogxiv
9624a33e53
FIX date and user cloture / closing display
temporary fix while convert french to english term in dolibarr
2020-09-30 15:27:16 +02:00
John Botella
afbe5f6017 Add search param for close date 2020-09-30 15:26:13 +02:00
BENKE Charlene
8ab627e768
fix typo error 2020-09-30 15:17:44 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
lvessiller
259737f082 FIX set paid on total discount of a product in cash desk 2020-09-30 15:09:45 +02:00
stickler-ci
fd8e7fdfe3 Fixing style errors. 2020-09-30 12:57:36 +00:00
Sekan, Tobias
27c90abc0b address feedback 2020-09-30 14:54:24 +02:00
Florian HENRY
4602ffa990 Merge github.com:Dolibarr/dolibarr into develop 2020-09-30 13:53:42 +02:00
Florian HENRY
6b539dfad0 fix remove php warning non-numeric value 2020-09-30 13:53:27 +02:00
davidNDU
3187c38ba3 Add object Methods with module builder, add/modify user rights and left side menu 2020-09-30 14:37:47 +03:00
John Botella
1131eb240d Fix lang trans 2020-09-30 13:36:03 +02:00
geoffrey.girard
8c017ad422 ADD : Filters more filters on customer price tab 2020-09-30 13:33:05 +02:00
Laurent Destailleur
805f06fe31 Add token for GET on page to setup journal. 2020-09-30 12:54:05 +02:00
Laurent Destailleur
a3da2afe7a Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES 2020-09-30 11:58:40 +02:00
Sekan, Tobias
8d2cd144ce fix removed fields 2020-09-30 11:52:22 +02:00
Sekan, Tobias
6c46b2e8de Address feedback 2020-09-30 11:45:29 +02:00
BENKE Charlene
10f8ccd7ed
New : add two hook for more feature on list
New hook are : 
printFieldListTable : allow to add more table on sql query (from another modules)
printFieldListSearchParam : allow to keep search on new filter

If ok, i add it on all native list
2020-09-30 10:55:55 +02:00
Alexandre SPANGARO
ed26f07783 FIX If salaries subledger account not defined, put only in the general account 2020-09-30 06:46:23 +02:00
Alexandre SPANGARO
fc62ca57b5 Remove old code 2020-09-30 06:37:48 +02:00
Laurent Destailleur
f063a144c1 NEW Can add event to log into blockedlog module with a constant. 2020-09-29 21:51:39 +02:00
Laurent Destailleur
1e176fad8f Fix GETPOST on array 2020-09-29 21:28:07 +02:00
Laurent Destailleur
879d041398 Can force the typeof check of GETPOST into $fields for type text. 2020-09-29 20:48:40 +02:00
Laurent Destailleur
82da38df65 Removed dead code 2020-09-29 19:57:10 +02:00
bomuux
9ed6092ed8
Bug: ActionComm::ref_ext is not saved properly
ActionComm::ref_ext is considered to be a timestamp in ActionComm::create(), (but not in ActionComm::create()).
Correction to consider it a string.
2020-09-29 19:56:22 +02:00
ptibogxiv
09f7220470
Update index.php 2020-09-29 17:10:08 +02:00
ptibogxiv
8bef390d60
Update list.php 2020-09-29 17:09:45 +02:00
Laurent Destailleur
ac897b5b4d Fix css 2020-09-29 17:06:08 +02:00
Laurent Destailleur
e86bbe346a
Merge pull request #14837 from andreubisquerra/master
NEW: Introducing new modal boxes in TakePOS
2020-09-29 16:51:48 +02:00
Laurent Destailleur
fba8fdae6e
Merge pull request #14856 from bafbes/abb120146
new:bankline_prepare_head for bank lines
2020-09-29 16:40:51 +02:00
Laurent Destailleur
babcc3bc91
Update line.php 2020-09-29 16:39:47 +02:00
stickler-ci
ce8d240d8f Fixing style errors. 2020-09-29 13:06:23 +00:00
Sekan, Tobias
c8e11f9eae Use object fileds on contact list 2020-09-29 14:59:16 +02:00
Laurent Destailleur
708ac91a39
Merge pull request #14825 from atm-greg/fix_notification_system
Fix notification system
2020-09-29 14:13:33 +02:00
Laurent Destailleur
14e6d38fe8
Merge pull request #14860 from Tim-Otte/fix-missing-styles-in-lines
FIX: Added support for styling in lines in odt documents
2020-09-29 14:11:25 +02:00
atm-greg
a61f79c039 only update reminders if event is not past 2020-09-29 14:10:24 +02:00
atm-greg
1ed6312f4b add modification of the notifications 2020-09-29 14:08:49 +02:00
Laurent Destailleur
e08d7254e2
Merge pull request #14849 from aspangaro/13a20
NEW Add column vat rate in page to define accounting account on product/service
2020-09-29 14:02:39 +02:00
Laurent Destailleur
4e93fb1e5e
Merge pull request #14853 from c3do/patch-16
Fix API $includeparentid when get product
2020-09-29 13:34:42 +02:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
29414251f5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/files.lib.php
2020-09-29 13:19:03 +02:00
Laurent Destailleur
1f8f2c0cc3 NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr 2020-09-29 13:13:47 +02:00
Tim Otte
82b3b5612d
Update extrafields.class.php
That change should not be included in the PR
2020-09-29 12:19:19 +02:00
Tim Otte
3e612d2a94 Added support for styling in lines 2020-09-29 12:13:41 +02:00
Sekan, Tobias
c0a3aa2b5b add mising elements from last commit 2020-09-29 12:00:54 +02:00
Sekan, Tobias
2d4e2ee378 Use object field for list fields (project) 2020-09-29 10:00:14 +02:00
Alexandre SPANGARO
d8cad89dee Merge remote-tracking branch 'upstream/develop' into 13a20 2020-09-29 04:55:33 +02:00
bahfir abbes
9662c4110a new:bankline_prepare_head for bank lines 2020-09-29 01:28:39 +01:00
Laurent Destailleur
a6dcf5f1c1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-29 00:51:02 +02:00
Cédric
572b012344
Fix API $includeparentid when get product 2020-09-28 22:06:15 +02:00
Laurent Destailleur
628978be53 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/adherents/card.php
2020-09-28 21:16:25 +02:00
Nicolas
e58d0d4af4 FIX Stickler error 2020-09-28 20:56:19 +02:00
Nicolas
848ee9decf FIX Stickler error 2020-09-28 20:49:51 +02:00
Laurent Destailleur
43c167f0c8 Fix init var 2020-09-28 20:47:36 +02:00
Nicolas
dfba9a06ad NEW Field to link website page to an other object 2020-09-28 20:39:02 +02:00
Inovea Conseil
789defa46f Merge remote-tracking branch 'Dolibarr/develop' into newfieldwebsite 2020-09-28 20:08:22 +02:00
Laurent Destailleur
236c9bf1d2 Fix regression making export feature not working 2020-09-28 20:05:58 +02:00
Laurent Destailleur
bd11154bfc NEW Can filter on accounting system ref in export of chart of account 2020-09-28 18:56:53 +02:00
Laurent Destailleur
4cf6e483ca Fix export of various payments. 2020-09-28 18:49:20 +02:00
Florian
bdb38da9d3 Add 2 new field typeObject and ObjectId to website 2020-09-28 18:17:23 +02:00
Laurent Destailleur
0093671a04
Merge pull request #14846 from aspangaro/13a19
NEW Add export for various payment
2020-09-28 17:40:18 +02:00
Laurent Destailleur
0c64b01ae9
Merge pull request #14847 from OPEN-DSI/new-emailcollector-mail-header-remove
NEW MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
2020-09-28 17:25:49 +02:00
Laurent Destailleur
53b9866d20
Merge pull request #14845 from TobiasSekan/FixWrongExpectedTypeInViewcat
FIX wrong expected type for "dol_print_error" in "viewcat.php"
2020-09-28 17:23:28 +02:00
Sekan, Tobias
6c1700d84a Fix contratcs are always zero on statistics board 2020-09-28 17:22:11 +02:00
Laurent Destailleur
6b4a05cf06
Merge pull request #14843 from TobiasSekan/FixContractAlwaysZeroOnStatisticsBoard
FIX Contratcs count are always zero on statistics board
2020-09-28 17:21:19 +02:00
Laurent Destailleur
8ae3cabbac
Merge pull request #14842 from aspangaro/13a18
Fix - Accountancy - select date on periodicity by default & some fix
2020-09-28 17:20:56 +02:00
Laurent Destailleur
2cbec87ddc
Update accountancy.lang 2020-09-28 17:20:41 +02:00
Laurent Destailleur
c6c2dc53cb
Merge pull request #14844 from TobiasSekan/FixCountErrorOnUserCatgories
FIX count error on user categories
2020-09-28 17:17:49 +02:00
lvessiller
1b5a0ce3bf FIX uses price2numjs 2020-09-28 17:04:20 +02:00
Cédric
3bc9c49307
Update api_orders.class.php 2020-09-28 16:57:30 +02:00
atm-greg
988a532bed fix br 2020-09-28 16:37:17 +02:00
Laurent Destailleur
1a28d7f641 Fix missing token 2020-09-28 16:33:27 +02:00
Laurent Destailleur
b61815e95f Typo in action test 2020-09-28 16:22:15 +02:00
Laurent Destailleur
9973ffab01 Fix sanitizing 2020-09-28 13:05:12 +02:00
Laurent Destailleur
a2ad1e2fc9 Fix #yogosha4544 2020-09-28 12:49:51 +02:00
Alexandre SPANGARO
17347bf575 New Add column vat rate in page to define accounting account on product/service 2020-09-28 11:08:27 +02:00
Laurent Destailleur
2e79064098 Clean code 2020-09-28 11:07:53 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
lvessiller
7eaf26b09e NEW add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header in email collector 2020-09-28 10:14:10 +02:00
Alexandre SPANGARO
bf167ca91d Fix unused variable 2020-09-28 09:40:55 +02:00
Alexandre SPANGARO
88772726d7 New Add export for various payment 2020-09-28 09:32:49 +02:00
Sekan, Tobias
f810f2c8e4 Fix wrong expected type in viewcat.php 2020-09-28 09:13:15 +02:00
Sekan, Tobias
e3591a767e fix count error on user categories 2020-09-28 08:31:39 +02:00
Sekan, Tobias
10c034efdf Fix contratcs are always zero on statistics board 2020-09-28 08:12:12 +02:00
Alexandre SPANGARO
d50932499f Fix select date on periodicity by default 2020-09-28 07:03:22 +02:00
Alexandre SPANGARO
347537a205 Accountancy - Some fix 2020-09-28 06:44:01 +02:00
andreubisquerra
12b2c33895
Footer removed 2020-09-27 22:22:56 +02:00
Laurent Destailleur
57b7666bf1 FIX #14326 2020-09-27 22:20:24 +02:00
andreubisquerra
80641e54c9
Footer removed 2020-09-27 22:19:49 +02:00
Laurent Destailleur
e7c044cc05 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-27 21:20:51 +02:00
Laurent Destailleur
51d0856f50 Remove bad exakat rules 2020-09-27 21:20:39 +02:00
Laurent Destailleur
1aaf1fe357 Try catch on eval 2020-09-27 21:10:27 +02:00
Laurent Destailleur
f851ce2f0f
Merge pull request #14741 from Tim-Otte/fix-zero-price-lines
FIX: Allow product price equal zero in new lines
2020-09-27 20:46:36 +02:00
Laurent Destailleur
e388123a3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-27 19:32:08 +02:00
Laurent Destailleur
4a7df01339 Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be
MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD
2020-09-27 19:31:54 +02:00
Laurent Destailleur
5c9ad3ec9b
Update files.lib.php 2020-09-27 18:55:09 +02:00
Laurent Destailleur
44549bbb3b
Merge pull request #14802 from FHenry/fix_eventcreation
fix event creation bad redirection from thirdparty/event tab if on first attempt you badly fill the form
2020-09-27 18:36:32 +02:00
Laurent Destailleur
d53e7266d2
Update agenda.php 2020-09-27 18:34:35 +02:00
Laurent Destailleur
8e59d0528e
Update html.formactions.class.php 2020-09-27 18:33:13 +02:00
Laurent Destailleur
4ca481335b
Merge pull request #14812 from atm-john/13.0_new_pdf_storm_for_delivery
NEW PDF model storm for delivery
2020-09-27 18:28:22 +02:00
Florian HENRY
5ff7e37696 review code 2020-09-27 18:05:19 +02:00
Laurent Destailleur
96ae9c11f6
Revert "NEW Better currency rate editor" 2020-09-27 18:03:56 +02:00
Florian HENRY
b6b2553501 Merge branch '11.0' into 11.0_fixmultidiroutput 2020-09-27 18:02:22 +02:00
Florian HENRY
f9d4a4d2ba Merge branch 'develop' into fix_eventcreation 2020-09-27 17:58:05 +02:00
Laurent Destailleur
cdc54a9f4a
Merge pull request #14820 from ATM-Consulting/new/develop/currency_rate_editor
NEW Better currency rate editor
2020-09-27 17:57:16 +02:00
Laurent Destailleur
e495d0459e Look and feel v13 2020-09-27 17:53:17 +02:00
Laurent Destailleur
c659379307 Try a more complete fix than #14821 2020-09-27 17:21:49 +02:00
Laurent Destailleur
cb6e4d131f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-27 17:13:41 +02:00
Laurent Destailleur
ca8d9613ce
Merge pull request #14821 from cfoellmann/fix-pricestable
fix selectbox for table columns supplier prices
2020-09-27 17:12:37 +02:00
Laurent Destailleur
8157526778
Merge pull request #14822 from TobiasSekan/FixUnbeautifulErrorOnIntervention
FIX Unbeautiful error messages on intervention
2020-09-27 17:08:36 +02:00
Laurent Destailleur
52d1f57276
Merge pull request #14828 from TobiasSekan/NewAllowReopenIntervention
NEW Allow to reopen interventions (green button)
2020-09-27 17:07:45 +02:00
Laurent Destailleur
dcca79e368 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-27 16:59:39 +02:00
Laurent Destailleur
d60ab93783 Typo 2020-09-27 16:59:27 +02:00
Laurent Destailleur
10ce4029d7
Merge pull request #14831 from hregis/12.0_ldap
FIX Can create user but not update user with activedirectory
2020-09-27 16:58:33 +02:00
Laurent Destailleur
164af8bdea
Merge pull request #14829 from TobiasSekan/NewShowLineNumberOnInterventionCard
NEW Show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
2020-09-27 16:58:08 +02:00
Laurent Destailleur
43cc009b54 Typo 2020-09-27 16:27:42 +02:00
Laurent Destailleur
3ee2459dc7 Enhancement for #14835: Can filter on expiration date, add list of
members without subscriptions
2020-09-27 16:03:20 +02:00
Laurent Destailleur
5d0c40c658 FIX for #14835 2020-09-27 15:08:15 +02:00
andreubisquerra
494348356a
Fix travis 2020-09-27 11:35:07 +02:00
jove@bisquerra.com
ec54e33d81 NEW: Introducing new modal boxes in TakePOS 2020-09-27 11:11:31 +02:00
Laurent Destailleur
ba311e2cfd Fix phpcs 2020-09-26 21:24:28 +02:00
Laurent Destailleur
da4362c492 Make notification by browser popup working. 2020-09-26 21:18:09 +02:00
Laurent Destailleur
3a6b8ae202 Work on browser notification 2020-09-26 20:29:01 +02:00
Laurent Destailleur
7865381434 Clean code 2020-09-26 12:19:08 +02:00
Laurent Destailleur
9d6e3be5d1 Fix #yogosha4463 2020-09-26 05:20:33 +02:00
Laurent Destailleur
68a6239322 Clean code 2020-09-26 04:25:14 +02:00
Laurent Destailleur
33d578a660 Fix bad management of default value in database on create form 2020-09-26 04:25:06 +02:00
Laurent Destailleur
611684a9a7 FIX Substitution for member subscription was not done 2020-09-26 02:39:19 +02:00
Laurent Destailleur
e2b0c4bc41 css 2020-09-26 02:27:27 +02:00
Laurent Destailleur
d3e9815cfa Fix phpunit 2020-09-25 17:48:04 +02:00
Laurent Destailleur
48632bbb3f Clean code 2020-09-25 17:23:42 +02:00
Laurent Destailleur
1b83b55995 Fix to exclude possible sql injection 2020-09-25 17:11:54 +02:00
Laurent Destailleur
0d797a793a On technical error, return http code 500 2020-09-25 15:01:15 +02:00
root
fcbc48fa28 Bug fix last_gen should be date_last_gen 2020-09-25 14:24:26 +02:00
Laurent Destailleur
d9e7cacc84 Fix search 2020-09-25 14:16:59 +02:00
Laurent Destailleur
88b4c1e766 Fix calculation of nb of top menu in CSS files. 2020-09-25 14:09:51 +02:00
Laurent Destailleur
0dcd85485a Fix migration 2020-09-25 12:36:32 +02:00
Laurent Destailleur
7a9332815c Fix migration 2020-09-25 12:22:24 +02:00
Regis Houssin
f92f8d0fc4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-25 12:11:37 +02:00
Regis Houssin
d38c557fba FIX Can create user but not update user with activedirectory 2020-09-25 12:11:13 +02:00
Laurent Destailleur
3c6dda9dd5 Clean code 2020-09-25 10:27:30 +02:00
Laurent Destailleur
83bdd530cd Fix sql error in menu edition, column too short 2020-09-25 10:13:45 +02:00
Laurent Destailleur
d6ce6bb47f Standardize code 2020-09-25 10:05:59 +02:00
Sekan, Tobias
4210a2cfa1 New Show line number on intervention card 2020-09-25 08:25:24 +02:00
stickler-ci
6e2d12413c Fixing style errors. 2020-09-25 06:17:52 +00:00
Sekan, Tobias
6fbc536061 Remoeve double lang entry 2020-09-25 08:15:20 +02:00
Sekan, Tobias
00951a8144 New allow to reopen interventions 2020-09-25 08:10:48 +02:00
Laurent Destailleur
4fe0300701 phpcs 2020-09-24 22:17:09 +02:00
Laurent Destailleur
ed2dd3f55f Clean code 2020-09-24 22:02:10 +02:00
Laurent Destailleur
6e2a9dc0c9 Fix error management in Stripe 2020-09-24 21:54:21 +02:00
Laurent Destailleur
bc7b5b1468 Update website templates for v13 2020-09-24 21:37:21 +02:00
Laurent Destailleur
64c8053b67 Fix restrict extension of files 2020-09-24 21:09:58 +02:00
Laurent Destailleur
72e9e1b387 Fix asset module 2020-09-24 17:37:57 +02:00
Laurent Destailleur
9a831e3249 Fix permission test 2020-09-24 17:24:23 +02:00
Laurent Destailleur
ca7b9efec2 Add missing token 2020-09-24 17:08:31 +02:00
Laurent Destailleur
f066da1811 Minor security fixes 2020-09-24 16:19:24 +02:00
Laurent Destailleur
2404856409 Fix sql inj 2020-09-24 15:38:27 +02:00
atm-greg
554948d3e2 bad user for getNomUrl 2020-09-24 15:34:52 +02:00
atm-greg
5244c05abb reminders in the future can be displayed too 2020-09-24 15:30:29 +02:00
atm-greg
6aad3b47f5 remove fields size modification 2020-09-24 15:28:41 +02:00
atm-greg
b269af5bf6 delete reminders on ActionComm::delete 2020-09-24 15:26:35 +02:00
atm-greg
e6eff6511e fix reminder offsetunit and display problems 2020-09-24 15:20:30 +02:00
stickler-ci
efd8ffe390 Fixing style errors. 2020-09-24 11:29:30 +00:00
Sekan, Tobias
56dd28ca78 fix wrong color 2020-09-24 13:25:40 +02:00
Sekan, Tobias
3c879ddd34 Fix unbeautiful error message on intervention 2020-09-24 13:15:51 +02:00
Laurent Destailleur
0e820d4c2b FIX link to home in takepos 2020-09-24 13:00:56 +02:00
atm-greg
101405b052 fix notification creation => must create for every user linked to the event 2020-09-24 12:31:28 +02:00
Christian Foellmann
be05a44860 fix selectbox for table columns supplier prices 2020-09-24 11:49:59 +02:00
atm-greg
732bb70826 fix sql 2020-09-24 11:47:41 +02:00
stickler-ci
3c48d2933c Fixing style errors. 2020-09-24 08:08:15 +00:00
ptibogxiv
6a85fdbd7f
Update list.php 2020-09-24 10:06:35 +02:00
Laurent Destailleur
becf91904f css 2020-09-24 08:55:33 +02:00
Laurent Destailleur
1d6a4f528a Fix css 2020-09-24 00:07:55 +02:00
Laurent Destailleur
a16788f753 Fix syntax error 2020-09-24 00:06:02 +02:00
Laurent Destailleur
ece46511f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-23 23:02:52 +02:00
Laurent Destailleur
95cf3d2f51 NEW Can use desired stock of a given warehouse for replenishment 2020-09-23 23:02:31 +02:00
ptibogxiv
ca07b19796
Update list.php 2020-09-23 22:39:24 +02:00
ptibogxiv
5f8f9c6a4a
NEW restrict thirdparty to customer in takepos
only display customer (better when long list and avoid supplier)
2020-09-23 22:38:06 +02:00
Laurent Destailleur
28d25f596b
Merge pull request #14671 from Tim-Otte/feature-add-incoterms-to-odt
NEW: Added incoterms to substitution array
2020-09-23 20:10:22 +02:00
Laurent Destailleur
6f919f1dd0
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 20:02:48 +02:00
Laurent Destailleur
93af72c272
Merge pull request #14805 from hansemschnokeloch/patch-1
Fix label inversion
2020-09-23 19:53:35 +02:00
Laurent Destailleur
fb68a71f77
Merge pull request #14808 from TobiasSekan/FixFicinterGlobalSearch
FIX Not working global search on interventions by description
2020-09-23 19:53:12 +02:00
Laurent Destailleur
c4145b7922
Merge pull request #14798 from andreubisquerra/master
NEW Show available stock in TakePOS
2020-09-23 19:50:49 +02:00
Laurent Destailleur
32a93eb067
Update invoice.php 2020-09-23 19:50:39 +02:00
Laurent Destailleur
5a93628611
Merge pull request #14806 from hregis/12_bug
FIX missing field entity
2020-09-23 19:45:05 +02:00
Laurent Destailleur
80ec1ad69f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-23 19:29:07 +02:00
Laurent Destailleur
905f676c71 Fix 12.0.3 2020-09-23 19:27:55 +02:00
Laurent Destailleur
306f61d04d
Merge pull request #14811 from zecsn/patch-1
Fix SQL Error
2020-09-23 19:25:32 +02:00
Laurent Destailleur
0cced26e46 fix phpunit 2020-09-23 19:23:33 +02:00
Laurent Destailleur
693a8430a5 Prepare 12.0.4 2020-09-23 19:17:36 +02:00
Laurent Destailleur
bb10379768 NEW Can change a product in line of recurring invoice or contract 2020-09-23 18:45:19 +02:00
Laurent Destailleur
72b5c3253b Clean code 2020-09-23 18:01:17 +02:00
Laurent Destailleur
06da242200 css 2020-09-23 16:43:25 +02:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Florian Mortgat
70a0b6b90f Merge branch 'new/11.0_multicurrency_rate_editor' into new/develop/currency_rate_editor 2020-09-23 16:03:10 +02:00
stickler-ci
f6513b898d Fixing style errors. 2020-09-23 13:37:35 +00:00
John Botella
a374ffd03a Merge branch '13.0_new_pdf_storm_for_delivery' of github.com:atm-john/dolibarr into 13.0_new_pdf_storm_for_delivery 2020-09-23 15:35:37 +02:00
John Botella
4a65b23bbf Fix missing fetch optionals 2020-09-23 15:35:17 +02:00
stickler-ci
9cc87e8a0c Fixing style errors. 2020-09-23 13:23:19 +00:00
John Botella
d3c9a035e9 Add new PDF model storm for delivery 2020-09-23 15:18:53 +02:00
Florian Mortgat
f98ea5b8ad +token for _actionDelete 2020-09-23 15:13:33 +02:00
Florian Mortgat
7822dacbb8 cleanup: remove commented code 2020-09-23 14:23:17 +02:00
Florian Mortgat
f97e9e4330 FIX: URL parameters vs. POST, tokens, use class CurrencyRate for CRUD 2020-09-23 14:22:27 +02:00
zecsn
98dc0bbb6e
Reformat comments 2020-09-23 16:53:04 +05:00
zecsn
a4c8a5a69d
Fix SQL Error
Fix SQL Error DB_ERROR_SYNTAX on Installation
2020-09-23 16:43:53 +05:00
stickler-ci
a88c0b97a8 Fixing style errors. 2020-09-23 11:31:17 +00:00
Sekan, Tobias
815d0c2589 Fix that a admin can remove all his user rights 2020-09-23 13:18:09 +02:00
Laurent Destailleur
d9dce98185 css 2020-09-23 12:36:37 +02:00
atm-lena
0fc6e9b84f FIX - Backtick not work with postgresql 2020-09-23 10:54:49 +02:00
Sekan, Tobias
16e23797da Fix not working global search on fichinter by desc 2020-09-23 09:51:16 +02:00
stickler-ci
e037f2e5c7 Fixing style errors. 2020-09-23 07:11:59 +00:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Sekan, Tobias
638c586a05 Merge branch 'PreselectThirpartyOnNewFromList' of https://github.com/TobiasSekan/dolibarr into PreselectThirpartyOnNewFromList 2020-09-23 08:59:45 +02:00
Sekan, Tobias
ce6758657a Fix visiblity when came from Extended POS + doc 2020-09-23 08:59:30 +02:00
Florian Mortgat
69385e6fbf FIXME: conflits params URL et POST 2020-09-22 18:44:45 +02:00
Florian Mortgat
592789c597 Exchange rate editor: +filters 2020-09-22 18:34:59 +02:00
Laurent Destailleur
85fc471d3d Fix phpunit 2020-09-22 18:15:49 +02:00
stickler-ci
06d41c029d Fixing style errors. 2020-09-22 14:41:28 +00:00
Cédric
2dc148eae0
$accepthigherpayment (tested and work)
Accept higher payments that it remains to be paid
2020-09-22 16:38:59 +02:00
Regis Houssin
fcfe5423f4 FIX missing field entity 2020-09-22 16:34:38 +02:00
Laurent Destailleur
e4bd75dbdc Enhancement for #14589 2020-09-22 16:26:53 +02:00
Florian Mortgat
b3f911f810 WIP: rate editor 2020-09-22 16:10:28 +02:00
Laurent Destailleur
72a9cf8820 FIX #14751 2020-09-22 16:03:36 +02:00
Laurent Destailleur
288fd5566f FIX #14776 2020-09-22 16:02:00 +02:00
Laurent Destailleur
5a1c05735f Fix phpcs 2020-09-22 15:55:30 +02:00
Laurent Destailleur
fea6fca7d1 Fix phpunit 2020-09-22 15:31:09 +02:00
Laurent Destailleur
6c06d2f0aa Look and feel v13 2020-09-22 15:26:29 +02:00
Laurent Destailleur
d21ee07afc NEW Can define date range of validity of a login during creation 2020-09-22 14:45:19 +02:00
Tim Otte
e373de91d9 Fixed a bug where a price equal zero would be replaced with the product price 2020-09-22 14:43:09 +02:00
Pascal Hubrecht
6d7f5ef0a8
Fix label inversion
Private and public labels where inverted.
2020-09-22 12:40:26 +02:00
Laurent Destailleur
5f4547bf7c Prepare table for future features 2020-09-22 10:38:16 +02:00
Laurent Destailleur
830bc7d871 Look and feel v13 2020-09-22 09:42:44 +02:00
Laurent Destailleur
c61e8f052b NEW Add property cssview when declaring fields of an object 2020-09-22 08:54:40 +02:00
Laurent Destailleur
aee6bc173f WIP Add start/end date of validity for user/logins 2020-09-21 18:44:20 +02:00
Florian Mortgat
bd4db13f90 NEW: rate editor for multicurrency 2020-09-21 17:42:20 +02:00
Laurent Destailleur
718497915c Enhance the IK module 2020-09-21 16:31:51 +02:00
Laurent Destailleur
438e884c01 Fix phpcs 2020-09-21 14:17:05 +02:00
Laurent Destailleur
c4ef21a8f2 Increase timeout delay for install 2020-09-21 14:04:46 +02:00
Laurent Destailleur
84cc04a2c6 Increase timeout delay for install 2020-09-21 14:04:07 +02:00
Laurent Destailleur
e52559783f Look and feel v13 2020-09-21 13:54:26 +02:00
Laurent Destailleur
3e977bc5d6 Fix css 2020-09-21 12:55:06 +02:00
Laurent Destailleur
43ed2c6c20 Fix phpunit 2020-09-21 12:35:20 +02:00
Laurent Destailleur
3ca379c9e6 FIX Restore multiselect (selection of prospect level)
Conflicts:
	htdocs/core/class/html.form.class.php
2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc FIX Restore multiselect (selection of prospect level) 2020-09-21 12:16:22 +02:00
Florian HENRY
1efec17228 remove commented code since 3 years 2020-09-21 11:53:09 +02:00
Florian HENRY
0adca0a660 fix event creation same on all page 2020-09-21 11:43:08 +02:00
stickler-ci
4cbe8d8623 Fixing style errors. 2020-09-21 07:34:00 +00:00
x
2fbb6b1125 new handle trigger method 2020-09-21 09:29:52 +02:00
Tim Otte
05275a2b67 Added check if method exists 2020-09-21 08:50:39 +02:00
Laurent Destailleur
d5d187c793 Fix phpunit 2020-09-21 01:31:35 +02:00
Laurent Destailleur
9f41f90eeb Fix responsive 2020-09-21 01:28:26 +02:00
jove@bisquerra.com
c596f80fd5 NEW Show available stock in TakePOS 2020-09-20 23:29:59 +02:00
Laurent Destailleur
43376b3abc Removed warning 2020-09-20 21:27:11 +02:00
Laurent Destailleur
906e030bfb Removed warning 2020-09-20 21:25:18 +02:00
Laurent Destailleur
cda101238d Fix #yogosha4543 2020-09-20 21:17:27 +02:00
Laurent Destailleur
2137901b0b Fix sanitizing 2020-09-20 20:49:26 +02:00
Laurent Destailleur
b4b0d682b8 css 2020-09-20 20:35:22 +02:00
Laurent Destailleur
5f6dc40d6b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-20 19:56:03 +02:00
Laurent Destailleur
2fcc0791ac Fix regression on backtopage 2020-09-20 19:55:44 +02:00
Laurent Destailleur
19141b3eb9
Merge pull request #14633 from c3do/patch-6
NEW Improve Product API for variant products
2020-09-20 19:34:12 +02:00
Laurent Destailleur
9522b12da1
Update api_products.class.php 2020-09-20 19:33:18 +02:00
Laurent Destailleur
b2f8c4c6b8 Escape output 2020-09-20 19:21:04 +02:00
Laurent Destailleur
e6fc9d3b5e NEW Add message in error_log after detection of SQL or script injection 2020-09-20 19:20:34 +02:00
Laurent Destailleur
d5e6273b45 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-20 18:06:04 +02:00
Laurent Destailleur
ad1d60740b Fix string 2020-09-20 18:05:49 +02:00
Laurent Destailleur
acf28e28af Label 2020-09-20 18:01:17 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
2020-09-20 17:56:23 +02:00
Laurent Destailleur
c5aff1769a
Merge pull request #14631 from c3do/patch-3
NEW ref_ext for Attributes and Combinations
2020-09-20 17:50:51 +02:00
Laurent Destailleur
a6a2c6cfe1
Merge pull request #14748 from andreubisquerra/master
Show buttons on products when 'Hide Product Images' is enabled
2020-09-20 17:43:35 +02:00
Laurent Destailleur
a3defd621c
Merge pull request #14726 from aspangaro/13a15
Fix display on quickadd dropdown menu
2020-09-20 17:30:35 +02:00
Laurent Destailleur
a211e3aa93
Merge pull request #14774 from TobiasSekan/FixWrongVisibilityOfCommercialMainMenu
FIX wrong visibility of commercial main menu
2020-09-20 17:21:14 +02:00
Laurent Destailleur
dccdfd3a53
Merge pull request #14766 from ptibogxiv/patch-361
FIx  product list
2020-09-20 17:18:29 +02:00
Laurent Destailleur
40d894a610
Merge pull request #14768 from atm-gauthier/develop_new_hooks_in_stats_pages
NEW : add hooks on stats pages
2020-09-20 17:17:44 +02:00
Laurent Destailleur
ba69fab76a
Merge pull request #14780 from ptibogxiv/patch-363
NEW fetch contact by email with REST API
2020-09-20 17:17:03 +02:00
Laurent Destailleur
4f2623ee81
Merge pull request #14779 from ptibogxiv/patch-362
NEW create thirdparty customer from TAKEPOS
2020-09-20 17:16:38 +02:00
Laurent Destailleur
b024ce799c
Merge pull request #14782 from b92/patch-1
FIX: Members substitution variable not substituted if empty
2020-09-20 17:13:29 +02:00
Laurent Destailleur
aba6fbb306
Merge pull request #14791 from andreubisquerra/develop
Avoid errors when Weighing Scale from the cloud in TakePOS
2020-09-20 17:12:48 +02:00
Laurent Destailleur
b4137392ea
Merge pull request #14789 from bafbes/abb120144
fix:remove deleted user params
2020-09-20 17:12:15 +02:00
Laurent Destailleur
27e81ed40c
Merge pull request #14793 from daraelmin/add-daraelmin-search_categ
Fix Category is lost on sorting member list
2020-09-20 17:10:00 +02:00
Laurent Destailleur
4ce7507518 Fix warnings 2020-09-20 17:06:53 +02:00
Laurent Destailleur
cd8ebd9500 Fix warnings 2020-09-20 16:57:53 +02:00
Laurent Destailleur
b3dd51b790 Fix warnings 2020-09-20 16:46:29 +02:00
Laurent Destailleur
2fca5e928b Fix comment 2020-09-20 16:13:20 +02:00
Laurent Destailleur
a3d0835c37 Fix param 2020-09-20 16:11:02 +02:00
Laurent Destailleur
667fb1098c Fix 2020-09-20 16:06:53 +02:00
Laurent Destailleur
1a494542c6 Fix static 2020-09-20 14:40:49 +02:00
Laurent Destailleur
3f2220bd6f Fix 2020-09-20 14:34:19 +02:00
daraelmin
b3d386fa54
Fix Category is lost on sorting member list
When sorting member list filter by tag/category the criteria is lost because of one missing GET parameter

Just adding a GET parameter to keep the category/tag parameter when sorting the list
2020-09-20 08:42:25 +02:00
Laurent Destailleur
2eb46b4900 Enhance antiXSS by excluding non printable chars used to obfuscate hack 2020-09-20 04:56:45 +02:00
Laurent Destailleur
85aa1ab402 Fix sanitizing 2020-09-20 03:37:05 +02:00
Laurent Destailleur
233aa58161 Fix sanitizing 2020-09-20 03:36:02 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Laurent Destailleur
f57b4fd2fd Fix escaping 2020-09-20 02:30:53 +02:00
Laurent Destailleur
fa86b62198 Fix escaping 2020-09-20 01:53:24 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
c191dd1a34 Fix escaping 2020-09-19 23:27:11 +02:00
Laurent Destailleur
2c660504bb Fix escape 2020-09-19 23:11:38 +02:00
Laurent Destailleur
d38168f49e Fix escape 2020-09-19 22:59:04 +02:00
Laurent Destailleur
b5703350da Fix escape 2020-09-19 22:41:05 +02:00
Cédric
a0313fdc52
Update api_invoices.class.php 2020-09-19 22:39:39 +02:00
Cédric
68ccbac49c
Update api_orders.class.php 2020-09-19 22:35:33 +02:00
stickler-ci
3deed42671 Fixing style errors. 2020-09-19 20:05:08 +00:00
Cédric
7306a949e3
Update api_invoices.class.php 2020-09-19 22:02:52 +02:00
Cédric
90d2dfcca7
FIX deleteContact 2020-09-19 22:01:48 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
14aa9c01da Neutral message if login / email exists #yohosha4542 2020-09-19 18:40:00 +02:00
Laurent Destailleur
673e1fe5aa Fix #yogosha4539 2020-09-19 18:01:06 +02:00
andreubisquerra
55a0e5f2e7
Avoid errors when Weighing Scale from the cloud in TakePOS 2020-09-19 17:12:41 +02:00
Laurent Destailleur
c6e66d1651 Fixes 2020-09-19 16:05:55 +02:00
Laurent Destailleur
7c50cc9c72 css 2020-09-19 15:17:50 +02:00
Laurent Destailleur
3bd94d52a1 Fix css 2020-09-19 15:15:49 +02:00
Cédric
fbc8fe1e0c
Update api_invoices.class.php 2020-09-19 15:14:29 +02:00
Cédric
a0efd47cce
Update api_invoices.class.php 2020-09-19 15:12:57 +02:00
Cédric
9f22882417
Update api_invoices.class.php 2020-09-19 15:05:28 +02:00
stickler-ci
e1751d4bfb Fixing style errors. 2020-09-19 12:23:53 +00:00
Cédric
720a113125
Update api_invoices.class.php 2020-09-19 14:16:17 +02:00
bahfir abbes
09f23c1d84 fix:remove deleted user params 2020-09-19 13:14:46 +01:00
Laurent Destailleur
0355dc03d8 More secured constantonoff.php 2020-09-19 13:04:23 +02:00
Laurent Destailleur
b1985950a6 Use POST to make the ajax set/del constant 2020-09-19 12:50:47 +02:00
Laurent Destailleur
46eb78cd41 Fix escape 2020-09-19 04:18:51 +02:00
Laurent Destailleur
e142b42f19 Clean code 2020-09-19 04:14:49 +02:00
Alexandre SPANGARO
f8065eb4ed Merge branch '10.0' into 10.0p46 2020-09-19 03:43:33 +02:00
Laurent Destailleur
4a5ee7f04d Better testSqlAndScriptInject (deal htmlentities encoded signatures)
More phpunits on GETPOST
2020-09-19 03:25:25 +02:00
Laurent Destailleur
eb36c3f144 Fix must use GETPOST 2020-09-19 02:27:32 +02:00
Laurent Destailleur
93b7956156 Fix sanitizing of backtopage 2020-09-19 02:12:08 +02:00
Laurent Destailleur
a0b230fa46 Fix #yogosha4534 2020-09-19 01:58:46 +02:00
Laurent Destailleur
6a45545ec1 Prepare for fix 2020-09-19 01:53:22 +02:00
Laurent Destailleur
b7a97b2c81 Prepare for fix 2020-09-19 01:45:40 +02:00
Laurent Destailleur
99c05f0923 Fix rss 2020-09-19 00:51:09 +02:00
Laurent Destailleur
f62d52f89a Fix tooltip for linkto object.
Fix security of ajax selectobject.php
2020-09-19 00:44:47 +02:00
Laurent Destailleur
63bc3aa48a Better sanitizing 2020-09-19 00:05:29 +02:00
Laurent Destailleur
6d2d5d7cae Fix #yogosha4529 2020-09-19 00:02:38 +02:00
Laurent Destailleur
d21c2f0d61 Better sanitizing 2020-09-18 23:38:45 +02:00
Laurent Destailleur
4f2d3176f5 Fix #yogosha4533 2020-09-18 23:26:05 +02:00
Laurent Destailleur
4710fedda6 Try another fix for #yogosha4514 2020-09-18 23:06:08 +02:00
Bernard Saulme
d86f541b35
FIX|members substitution variable not substituted if empty
Members substitution variables not substituted if empty for the __MEMBER_ ... variables, the variable is showed instead.
Change to display '' instead
2020-09-18 18:29:52 +02:00
stickler-ci
f9b4a0f68b Fixing style errors. 2020-09-18 15:54:37 +00:00
ptibogxiv
206b1189c9
NEW fetch contact by email with REST API 2020-09-18 17:52:48 +02:00
Laurent Destailleur
11bf662c38 Fix regression 2020-09-18 17:49:51 +02:00
Laurent Destailleur
b6c6473cce Fix sql injection when forging requests with IN 2020-09-18 17:47:40 +02:00
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
d75e1e5771 Fix #yogosha4525 2020-09-18 16:10:11 +02:00
Laurent Destailleur
72d5850a5f Fix regression 2020-09-18 15:45:26 +02:00
Laurent Destailleur
4decf20aaa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-18 14:56:38 +02:00
Laurent Destailleur
5d3168c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-18 14:55:58 +02:00
Laurent Destailleur
37c9afebd9 Fix regression 2020-09-18 14:55:32 +02:00
Laurent Destailleur
cf8e8ee68b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
2020-09-18 14:54:20 +02:00
Laurent Destailleur
f09aea90df Fix bad test 2020-09-18 14:51:04 +02:00
stickler-ci
b41bfd502a Fixing style errors. 2020-09-18 12:50:53 +00:00
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
ptibogxiv
1c65fa0c5d
NEW create thirdparty customer from TAKEPOS
avoid to switch to backend dolibarr then return to takepos (not really ergonomic and userfriendly)
2020-09-18 14:48:47 +02:00
Laurent Destailleur
0b2aa2b01d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
2020-09-18 14:46:23 +02:00
Laurent Destailleur
4e56115d2d Fix No CSRF for install module using GET 2020-09-18 14:35:30 +02:00
Laurent Destailleur
2fe9514b6b Doc 2020-09-18 14:01:00 +02:00
Laurent Destailleur
9134892c71 Fix remove useless code 2020-09-18 13:58:09 +02:00
Laurent Destailleur
cc5d648888 Enhance the anti injection layer 2020-09-18 13:41:50 +02:00
Laurent Destailleur
cddec2f4dc Fix XSS 2020-09-18 13:25:56 +02:00
stickler-ci
ccb570d87d Fixing style errors. 2020-09-18 10:23:47 +00:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b fix more different button visibility 2020-09-18 11:48:53 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7 Make button visiblity identical on most lists 2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad Add function to all list that support $socid 2020-09-18 10:36:40 +02:00
Sekan, Tobias
b879b365c3 bette code style 2020-09-18 08:30:28 +02:00
Sekan, Tobias
c82992714b Fix wrong visibility of commercial mein menu 2020-09-18 08:00:43 +02:00
Sekan, Tobias
d1f70a37df Preselect thirparty on new from list (part 1) 2020-09-18 07:56:13 +02:00
Laurent Destailleur
1ad6461ade Fix #yogosha4500 2020-09-18 06:10:41 +02:00
Laurent Destailleur
a7a8ca0a6b Fix phpcs 2020-09-18 06:03:59 +02:00
Laurent Destailleur
b35db6b9dd Clean code managing canvas 2020-09-18 06:02:52 +02:00
Laurent Destailleur
b49211b278 Phpcs 2020-09-18 05:37:20 +02:00
Laurent Destailleur
234b9f1f57 Fix CSRF 2020-09-18 05:07:58 +02:00
Laurent Destailleur
aa3f906370 Standardize code 2020-09-18 04:53:43 +02:00
Laurent Destailleur
534846c5c7 NEW Framework is ready for CSRF token protection on explicit GET URLs. 2020-09-18 04:30:24 +02:00
Laurent Destailleur
8d77bfacd2 Fix #yogosha4490 2020-09-18 03:07:13 +02:00
Laurent Destailleur
c94b3f6584 Fix transversal URL #yogosha4513 2020-09-18 01:57:23 +02:00
Laurent Destailleur
801712b423 Fix phpcs 2020-09-18 01:41:42 +02:00
Alexandre SPANGARO
19c0738b14 Merge branch '10.0' into 10.0p46 2020-09-18 01:41:25 +02:00
Laurent Destailleur
11b1e0b420 Escape output 2020-09-18 01:39:32 +02:00
Alexandre SPANGARO
f453e43cca FIX Yogosha report 4425 (backport) 2020-09-18 01:37:15 +02:00
Laurent Destailleur
7704375ccd Fix GETPOST 2020-09-18 01:36:06 +02:00
Laurent Destailleur
dc22f3ca19 Fix phpcs 2020-09-18 01:30:36 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Alexandre SPANGARO
142a27d472 Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2020-09-18 01:22:21 +02:00
Laurent Destailleur
27d03a2034 Better support of SFTP for the FTP module 2020-09-18 00:36:24 +02:00
Laurent Destailleur
57ff4784b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-17 23:17:33 +02:00
Laurent Destailleur
13646ff41e Fix #yogosha4516 2020-09-17 23:16:48 +02:00
Laurent Destailleur
f55ad8a51c
Merge pull request #14767 from Tim-Otte/fix-missing-hash-in-html-to-odt-converter
FIX: HTML to ODT converter
2020-09-17 23:07:10 +02:00
Laurent Destailleur
937d656f46 Fix #yogosha4515 2020-09-17 23:02:09 +02:00
Laurent Destailleur
7056c19cd2 css 2020-09-17 22:35:05 +02:00
Laurent Destailleur
9eaf2be9ab Prepare code for fix 2020-09-17 22:26:54 +02:00
Laurent Destailleur
9f0ca6f6fc Add file 2020-09-17 22:12:59 +02:00
ptibogxiv
08d7973b4a
Update list.php 2020-09-17 22:10:22 +02:00
Laurent Destailleur
5744b1e0a3 Fix #yogosha4512 2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8 Fix dol_string_nohtmltag: the decode of entity must be done before split 2020-09-17 21:09:16 +02:00
Laurent Destailleur
f5908c29da Fix regression in website module to get javascript files 2020-09-17 20:55:20 +02:00
Laurent Destailleur
0f0e4feeaf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modSociete.class.php
2020-09-17 19:33:29 +02:00
Laurent Destailleur
caaf0d370a Fix #yogosha4474 2020-09-17 19:01:01 +02:00
Laurent Destailleur
28fad93fb7 Typo 2020-09-17 17:30:44 +02:00
Got2be
03f37f3c1f NEW : add hooks on stats pages 2020-09-17 17:00:58 +02:00
Laurent Destailleur
eae5410ced Protect md file 2020-09-17 16:57:39 +02:00
ptibogxiv
cbd511fbb4
Update list.php 2020-09-17 16:16:35 +02:00
Laurent Destailleur
d04d1d1499 Use note_private instead of note 2020-09-17 16:13:57 +02:00
Laurent Destailleur
d73642559c Fix 2020-09-17 15:31:16 +02:00
Laurent Destailleur
5a22a07637 css 2020-09-17 15:30:20 +02:00
Laurent Destailleur
dbf8ed2fec Fix output 2020-09-17 15:29:13 +02:00
Laurent Destailleur
6bcc1d65eb Always hide hash 2020-09-17 15:28:16 +02:00
Laurent Destailleur
f575c503f1 Fix css 2020-09-17 15:21:59 +02:00
Laurent Destailleur
e123a4cb84 Fix help on minimum nb of chars 2020-09-17 15:09:29 +02:00
Laurent Destailleur
7cc75ac873 Fix: removing also " when removing " from a received parameter. 2020-09-17 14:43:58 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
31a68cfc18 FIX #yogosha4483 2020-09-17 14:30:10 +02:00
Laurent Destailleur
16b9e62866 FIX #yogosha4456 2020-09-17 14:20:37 +02:00
Tim Otte
f5c0cd25e2 Fixed html to odt converter 2020-09-17 13:19:31 +02:00
Laurent Destailleur
8029b80f08 Fix install hangs 2020-09-17 13:03:34 +02:00
Laurent Destailleur
2f100fdf79 Fix alpha into alphanohtml 2020-09-17 12:53:58 +02:00
Cédric
75b46dd535
Update api_products.class.php 2020-09-17 12:45:20 +02:00
Cédric
2b6a6e12e3
Update api_products.class.php 2020-09-17 12:43:04 +02:00
Cédric
0d20b6645d
Update ProductCombination.class.php 2020-09-17 12:37:20 +02:00
Cédric
67b565df6b
Update card.php 2020-09-17 12:34:47 +02:00
Cédric
e711ab3aa3
Update product.lib.php 2020-09-17 12:31:56 +02:00
Laurent Destailleur
0bf0312d50 FIX #yogosha4448 2020-09-17 12:30:14 +02:00
Laurent Destailleur
33cefacf91 Fix missing global 2020-09-17 12:17:14 +02:00
ptibogxiv
8284d0ee06
FIx product list
fix mistake if fk_state empty
2020-09-17 11:41:53 +02:00
Laurent Destailleur
05636c39bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-17 11:39:58 +02:00
Laurent Destailleur
939433706b FIX #yogosha4465 2020-09-17 11:37:41 +02:00
Laurent Destailleur
5daba4b0ed
Merge pull request #14752 from ptibogxiv/patch-360
NEW filter product list by country and/or state/province
2020-09-17 11:21:23 +02:00
Laurent Destailleur
5e3f6ce736
Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup
Use new table function for comm/propal + cleanup
2020-09-17 11:20:31 +02:00
Laurent Destailleur
5d8b9056b4
Merge pull request #14755 from atm-lena/10.0_FIX_SendMailFromAContact
FIX - Send mail from contact : select mail model
2020-09-17 11:15:58 +02:00
Laurent Destailleur
d92e482841 FIX #yogosha transversal path when unzipping file 2020-09-17 11:09:43 +02:00
Laurent Destailleur
004ba33695 Fix cach call of useNPR() 2020-09-17 10:11:06 +02:00
Alexandre SPANGARO
55e3f8365e FIX Yogosha report 4434 (backport) 2020-09-16 21:36:55 +02:00
Alexandre SPANGARO
6928b6543c Revert "FIX Yogosha report 4425 (backport)"
This reverts commit 23c4cfe913.
2020-09-16 21:24:24 +02:00
Alexandre SPANGARO
bc457ebb66 Stickler 2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913 FIX Yogosha report 4425 (backport) 2020-09-16 20:55:28 +02:00
Laurent Destailleur
4630887591 Fix css 2020-09-16 20:09:40 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
47031cb656 Fix phpcs 2020-09-16 18:51:19 +02:00
Laurent Destailleur
295c2b1d17 FIX #yogosha4435 2020-09-16 17:56:26 +02:00
Laurent Destailleur
7b8a206730 FIX #yogosha 2020-09-16 17:48:59 +02:00
atm-lena
3182537566 FIX - Send mail from contact : select mail model 2020-09-16 17:19:25 +02:00
Laurent Destailleur
1fd633ed21 FIX #yogosha4433 2020-09-16 16:34:19 +02:00
Laurent Destailleur
dec73da206 FIX #yogosha4430 2020-09-16 16:17:02 +02:00
Laurent Destailleur
d0c02f3714 FIX #yogosha4426 2020-09-16 14:51:46 +02:00
Laurent Destailleur
d7aa376c3c FIX Yogosha report 4425 2020-09-16 14:37:05 +02:00
Sekan, Tobias
91641e593f MAIN_DASHBOARD_USE_TOTAL_HT + more clean 2020-09-16 14:03:41 +02:00
Laurent Destailleur
09558d0ce9 Fix MAIN_OPTIMIZEFORTEXTBROWSER 2020-09-16 13:15:57 +02:00
ptibogxiv
6f564c1937
NEW filter product list by country and/or state/province 2020-09-16 12:34:07 +02:00
Laurent Destailleur
40acd8a386 Fix missing field canvas 2020-09-16 12:17:33 +02:00
stickler-ci
be27617e68 Fixing style errors. 2020-09-16 09:11:01 +00:00
Sekan, Tobias
ac1fdb4a59 Use new table function for comm/propal + cleanup 2020-09-16 10:51:19 +02:00
andreubisquerra
ffb1b5c2ca
Fix travis 2020-09-16 07:59:36 +02:00
andreubisquerra
9bb41e949d
Fix travis 2020-09-16 07:39:48 +02:00
jove@bisquerra.com
31eecae2a6 Show buttons on products when 'Hide Product Images' is enabled 2020-09-16 06:54:01 +02:00
Laurent Destailleur
382a4552eb Fix css 2020-09-16 03:39:03 +02:00
Laurent Destailleur
a3492dfb5b Clean code 2020-09-16 03:15:31 +02:00
Laurent Destailleur
adeed1464d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-16 02:56:09 +02:00
Laurent Destailleur
baa46cd502 Fix syntax error 2020-09-16 02:53:44 +02:00
Laurent Destailleur
ffa91451eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-16 02:50:36 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
4224e5da41
Merge pull request #14729 from bafbes/abb120143
allow access to adherent_extrafields table fields in printFieldListWhere hook
2020-09-16 01:14:01 +02:00
Laurent Destailleur
06a73539fe
Merge pull request #14731 from ATM-Consulting/12.0_FIX_round_virtual_stock_value_on_reassort_list
FIX 12.0 - round value of virtual stock on product stock reassort list
2020-09-16 01:12:34 +02:00
Laurent Destailleur
2da4838141
Merge pull request #14730 from ptibogxiv/patch-358
NEW get state dictionnary by REST API
2020-09-16 01:12:08 +02:00
Laurent Destailleur
584a02bc9a
Update api_setup.class.php 2020-09-16 01:11:47 +02:00
Laurent Destailleur
b7d56cbfbf Fix syntax error 2020-09-16 01:09:54 +02:00
Laurent Destailleur
ed8b4100c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-16 01:07:08 +02:00
Laurent Destailleur
b690bab1a8 Fix regression: missing column 2020-09-16 01:06:54 +02:00
Laurent Destailleur
d954de2d35
Merge pull request #14732 from ptibogxiv/patch-359
NEW add State/Province origin for products
2020-09-16 01:02:00 +02:00
stickler-ci
b3f78100bf Fixing style errors. 2020-09-15 23:01:00 +00:00
Laurent Destailleur
9e494d0bb3
Update card.php 2020-09-16 00:59:23 +02:00
Laurent Destailleur
52c9e7230f
Merge pull request #14734 from inoveaconseil/NEW_Scope_Oauth_Google
New scope oauth google
2020-09-16 00:55:10 +02:00
Laurent Destailleur
b5cac258bf
Merge pull request #14739 from defrance/patch-155
Users can now have non-binary gender
2020-09-16 00:54:07 +02:00
Laurent Destailleur
81d71589d9
Merge pull request #14743 from cfoellmann/minor-fix-bydates
fix for broken table on dispatch when hiding sellby/eatby dates
2020-09-16 00:53:03 +02:00
Laurent Destailleur
c152f8d76f
Merge branch 'develop' into patch-4 2020-09-16 00:52:16 +02:00
Laurent Destailleur
6a0c924fa8
Merge pull request #14738 from aspangaro/13a18
Debugbar - Move to Font Awesome 5 Free
2020-09-16 00:50:36 +02:00
Laurent Destailleur
7e941ff5ac
Merge pull request #14747 from daraelmin/develop
FIX #14746 Historical list of subscription shows empty member type
2020-09-16 00:49:41 +02:00
Laurent Destailleur
5c31593d43 Add date of birth in candidatures 2020-09-16 00:47:44 +02:00
daraelmin
8b928a110e
FIX #14746
Historical list of subscription shows empty member type if not recorded
2020-09-15 22:23:22 +02:00
Alexandre SPANGARO
e0c3977728 Debugbar - Move to Font Awesome 5 Free 2020-09-15 22:21:00 +02:00
Alexandre SPANGARO
c474484262 Revert "Debugbar - Move to Font Awesome 5 Free"
This reverts commit 1b5873af1f.
2020-09-15 22:10:24 +02:00
Frédéric FRANCE
070f9a0c89
uniformise scan_dir to scandir in admin supplier payments 2020-09-15 16:32:32 +02:00
Laurent Destailleur
7bcf2c9089 css 2020-09-15 14:45:51 +02:00
Christian Foellmann
c869f8fe5f fix for broken table on dispatch when hiding sellby/eatby dates 2020-09-15 14:19:02 +02:00
Laurent Destailleur
51963f4c2a css 2020-09-15 13:48:48 +02:00
Laurent Destailleur
afc6155783 FIX sign of amount with credit note and multicurrencies 2020-09-15 13:30:59 +02:00
Laurent Destailleur
cc24e9b155 Look and feel v13 2020-09-15 13:27:48 +02:00
Laurent Destailleur
5ca8141cd8 Typo 2020-09-15 12:09:48 +02:00
Laurent Destailleur
9a9b7ecb95 CSS 2020-09-15 12:07:15 +02:00
BENKE Charlene
1d0dc7cab0
Update list.php 2020-09-15 11:31:29 +02:00
BENKE Charlene
b01a68abef
Update card.php 2020-09-15 11:30:47 +02:00
Laurent Destailleur
522676d745
Merge pull request #14737 from aspangaro/13a17
Time to enable fontawesome icons on weather feature
2020-09-15 11:29:28 +02:00
Laurent Destailleur
3fd041e861
Update functions.lib.php 2020-09-15 11:28:49 +02:00
Laurent Destailleur
3dfa9acbef CSS 2020-09-15 11:18:57 +02:00
Laurent Destailleur
7a28972c8a FIX sign of amount of invoice lines for credit note with multicurrency
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
2020-09-15 11:18:21 +02:00
BENKE Charlene
0aa97a8b02
Update main.lang 2020-09-15 10:59:07 +02:00
BENKE Charlene
be704ef5e8
Update list.php 2020-09-15 10:57:48 +02:00
BENKE Charlene
0765fff355
Update card.php 2020-09-15 10:51:09 +02:00
Laurent Destailleur
cb5afc1842 CSS 2020-09-15 10:18:54 +02:00
Alexandre SPANGARO
1b5873af1f Debugbar - Move to Font Awesome 5 Free 2020-09-15 04:05:26 +02:00
Alexandre SPANGARO
4137e92430 Time to enable fontawesome icons on weather feature 2020-09-15 03:42:35 +02:00
Alexandre SPANGARO
a8c1b835db Fix display on quickadd dropdown menu 2020-09-15 03:08:06 +02:00
Laurent Destailleur
b7b1de4580 Fix position of GPAO must be after Product.
CSS
2020-09-15 02:41:08 +02:00
Laurent Destailleur
bd577e253a Fix phpcs 2020-09-14 22:31:57 +02:00
Laurent Destailleur
6dd1f522eb CSS 2020-09-14 22:30:22 +02:00
Laurent Destailleur
7712b277a6 Look and feel v13 2020-09-14 21:55:25 +02:00
Laurent Destailleur
cf423add2e Reminders visible on edit page too 2020-09-14 21:09:48 +02:00
Laurent Destailleur
59c10235b5 Show reminders on the event page 2020-09-14 21:06:40 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +02:00
Laurent Destailleur
7cbc621f6b css 2020-09-14 19:00:18 +02:00
Laurent Destailleur
cc37f4b29c Clean code. <input name="token" value="$_SESSION['newtoken']" is now
forbidden by CI. You must use newToken().
2020-09-14 16:24:02 +02:00
Florian Mortgat
06d31e8b9a FIX: missing entity check 2020-09-14 16:09:45 +02:00
stickler-ci
b39b9e4227 Fixing style errors. 2020-09-14 13:19:26 +00:00
Nicolas
ee4e209e7c NEW Oauth SCOPE for Admin SDK 2020-09-14 15:12:57 +02:00
Laurent Destailleur
8afd448def Add warning if a hidden option is on to encourage to remove it. 2020-09-14 15:05:35 +02:00
Laurent Destailleur
f6555a9077 Look and feel v12 2020-09-14 14:46:38 +02:00
Laurent Destailleur
550cec06a4 Look and feel v12 2020-09-14 14:41:11 +02:00
Laurent Destailleur
33d61333b1 Fix picto 2020-09-14 12:50:07 +02:00
Laurent Destailleur
604a807ac0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-14 12:48:00 +02:00
Laurent Destailleur
6117e0d8d7 Fix tooltip into tooltip 2020-09-14 12:47:43 +02:00
stickler-ci
ad84aaacc6 Fixing style errors. 2020-09-14 09:01:11 +00:00
ptibogxiv
92aab677e9
Update product.class.php 2020-09-14 10:59:09 +02:00
ptibogxiv
de31920f28
NEW add state origin for product
usefull for food, fruits or vegetables  or regional product

soon in other PR i will push filter by state or country in product list
2020-09-14 10:57:51 +02:00
ptibogxiv
f09655ec6c
Update api_setup.class.php 2020-09-14 10:53:38 +02:00
Florian Mortgat
4c6b0ed5b5 FIX 12.0 - round value of virtual stock on product stock reassort list 2020-09-14 10:49:44 +02:00
stickler-ci
75a9678086 Fixing style errors. 2020-09-14 08:48:04 +00:00
ptibogxiv
e98ae029e3
Update cstate.class.php 2020-09-14 10:46:19 +02:00
ptibogxiv
557a6863ba
NEW get state by REST API 2020-09-14 10:45:20 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
kamel
2a5b31da2d CORE smtps: Corrections 2020-09-14 10:22:05 +02:00
stickler-ci
3de5e0f957 Fixing style errors. 2020-09-14 02:30:37 +00:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
22edd650d3 Fix phpcs 2020-09-14 04:24:35 +02:00
Laurent Destailleur
c0ef7e8f13 fix phpcs 2020-09-14 04:23:14 +02:00
Laurent Destailleur
814f07d316 Missing picto property 2020-09-14 04:11:12 +02:00
Laurent Destailleur
b20be7074e phpcs 2020-09-14 04:08:11 +02:00
Laurent Destailleur
7ca9fd9dce Fix merge 2020-09-14 03:49:31 +02:00
Laurent Destailleur
dd06ff3a0d Label 2020-09-14 03:41:18 +02:00
Laurent Destailleur
419ac91a7a FIX #14538 2020-09-14 03:34:03 +02:00
Laurent Destailleur
78a999e6f3 css 2020-09-14 02:57:43 +02:00
Laurent Destailleur
bd8185fb49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-14 02:49:35 +02:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
2020-09-14 02:49:19 +02:00
Laurent Destailleur
701b83db38 FIX Bad number of subscription (forgotten when member was resiliated) 2020-09-14 02:38:12 +02:00
Laurent Destailleur
b2288ad2d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:33:00 +02:00
Laurent Destailleur
a891211f78 Fix bad link 2020-09-14 02:32:30 +02:00
Laurent Destailleur
c40ec37b60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:13:43 +02:00
Laurent Destailleur
c3ba8f7843 Better translation 2020-09-14 02:13:27 +02:00