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

21781 Commits

Author SHA1 Message Date
Florian HENRY
4bf428fbf8 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-13 08:13:54 +02:00
Laurent Destailleur
66a6415230
Merge pull request #14994 from grandoc/new_branch_12_10_2020 
fix : undefined index
 2020-10-12 19:37:37 +02:00
Laurent Destailleur
fcd4645509 Standardize code: Property product_libelle renamed into product_label 
Move common vars declaration into parent class.
 2020-10-12 19:33:00 +02:00
Philippe GRAND
4da75c4251 fix : undefined index 2020-10-12 16:11:56 +02:00
Laurent Destailleur
75997bb8f5 Minor fixes 2020-10-12 14:01:15 +02:00
Florian HENRY
739de365c0 load stat_bom 2020-10-12 13:52:50 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Laurent Destailleur
a1dd922394
Update modProduct.class.php 2020-10-12 13:04:10 +02:00
Florian HENRY
cea6eb279f add immport packaging supplier quantity 2020-10-12 11:26:09 +02:00
Laurent Destailleur
b36b9170b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-10 15:45:22 +02:00
Laurent Destailleur
437eead694 Fix bad permission 2020-10-10 15:45:04 +02:00
Laurent Destailleur
29f19d9550
Merge pull request #14964 from TobiasSekan/MoreFilterOnLeaveLog 
NEW More filter for "View change logs"
 2020-10-10 15:35:55 +02:00
Philippe GRAND
ba674d09d3 add some translations 2020-10-10 14:45:58 +02:00
Philippe GRAND
094dbc1265 add some translations 2020-10-10 14:38:57 +02:00
Philippe GRAND
37b6a43c5c add some translations 2020-10-10 14:30:22 +02:00
Alexandre SPANGARO
8876457b54 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-10 06:47:05 +02:00
Laurent Destailleur
cc82a15688 css 2020-10-09 18:43:24 +02:00
Laurent Destailleur
28e462e507 Debug a box with sql and performance errors 2020-10-09 16:49:23 +02:00
Alexandre SPANGARO
4dcd2bfcda Fix Travis 2020-10-09 13:58:35 +02:00
Laurent Destailleur
a23a91a4b9
Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch 
NEW: Add global search for customer payments and vendor payments
 2020-10-09 13:56:52 +02:00
Laurent Destailleur
a4e8773c30
Merge pull request #14973 from hregis/develop_timestamp 
FIX avoid warning "Parameter must be an array or an object that implements Countable"
 2020-10-09 13:55:10 +02:00
Laurent Destailleur
1239152368
Update dolgraph.class.php 2020-10-09 13:54:47 +02:00
Laurent Destailleur
b6fc33c454 Fix avoid error when we sumbit form to change page on conciliation 2020-10-09 11:13:02 +02:00
Regis Houssin
b591e6510b FIX avoid warning "Parameter must be an array" 2020-10-09 11:03:44 +02:00
Alexandre SPANGARO
b3b37dd9ee Fix sticklerCI 2020-10-09 09:32:50 +02:00
Sekan, Tobias
35fbc602ee Add global payment search 2020-10-09 09:22:26 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
5352eb6734
Merge pull request #14967 from hregis/develop_timestamp 
FIX add default value of timestamp for avoid error
 2020-10-08 19:40:59 +02:00
Laurent Destailleur
0628c92bdb
Merge pull request #14960 from rabib-metroworks/import-po 
NEW ADDED IMPORT TOOL FOR PO
 2020-10-08 19:29:53 +02:00
Laurent Destailleur
01ab066b7b
Merge pull request #14963 from atm-quentin/NEW_helper_functions 
NEW helper functions for export with phpspreadsheet
 2020-10-08 19:29:16 +02:00
Laurent Destailleur
e7c456f6f2 NEW Add column payment term into list of supplier invoices. 2020-10-08 19:22:21 +02:00
Laurent Destailleur
047d6f78e7 Fix status disabled of task intocombo list 2020-10-08 17:49:26 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Regis Houssin
0dc24c87b8 FIX nuke DEFAULT CURRENT_TIMESTAMP in pgsql 2020-10-08 16:16:49 +02:00
Laurent Destailleur
24d35ff9b5 CSS 2020-10-08 11:52:58 +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
quentin
7591ec6cf6 FIX style 2020-10-08 10:49:29 +02: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
70fa262293 CSS 2020-10-08 09:30:15 +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
eb41a72e27 Properties ->titre have been renamed into ->title 2020-10-07 17:41:36 +02:00
Laurent Destailleur
561ca757d7 phpcs 2020-10-07 17:17:13 +02:00
Laurent Destailleur
c7ca99accb Fix default value of enabled property of menu entry 2020-10-07 15:38:07 +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
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
5da923c80d phpcs 2020-10-07 13:42:46 +02:00
Laurent Destailleur
3ace9f638a Clean code 2020-10-07 13:20:38 +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
Sekan, Tobias
29ee420f3e Selectable columns on sup. invoice payment list 2020-10-07 11:18:31 +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
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
459ebe2e56 css 2020-10-06 17:26:55 +02:00
Laurent Destailleur
663f149982 Better error management 2020-10-06 16:48:48 +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
95f67309e2 Clean code 2020-10-06 15:11:45 +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
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
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
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
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
005cc093b9
fix typo 2020-10-05 20:02:23 +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
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
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
24527c973d
Merge pull request #14910 from ptibogxiv/patch-375 
Fix multicompany in activity box
 2020-10-05 16:42: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
Aurélien
c1b0c1f6a2
rename folder ref to Module Delivery 2020-10-05 15:32:29 +02:00
Laurent Destailleur
afd6da3b94 Better error management 2020-10-05 14:51:28 +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
cfc3c01815 Factorize code to know if a parameter is used to store a secret 2020-10-05 12:13:06 +02: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
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
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
65c6881fc9
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:49:47 +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
ptibogxiv
4aafe72bf2
Fix multicompany in activity box 2020-10-04 14:19:53 +02:00
ptibogxiv
dd1904c521
Fix multicompany in last action box 2020-10-04 13:58:46 +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
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
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
03ede71989 Clean code 2020-10-02 16:15:24 +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
bc308fc662 Look and feel v13 - Disabled users are greyed 2020-10-02 14:19: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
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
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
Laurent Destailleur
ce0fa53cb0 Fix delete of file from file manager 2020-10-02 03:07:31 +02:00
Laurent Destailleur
813deee4a5 Fix phpcs 2020-10-02 01:14:43 +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
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
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
b258a848e2 NEW Can enable/disable users in bulk actions 2020-10-01 16:21:07 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +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
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
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +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
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
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
bahfir abbes
9662c4110a new:bankline_prepare_head for bank lines 2020-09-29 01:28:39 +01:00
Laurent Destailleur
43c167f0c8 Fix init var 2020-09-28 20:47:36 +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
Laurent Destailleur
0093671a04
Merge pull request #14846 from aspangaro/13a19 
NEW Add export for various payment
 2020-09-28 17:40:18 +02:00
lvessiller
1b5a0ce3bf FIX uses price2numjs 2020-09-28 17:04:20 +02:00
Laurent Destailleur
1a28d7f641 Fix missing token 2020-09-28 16:33:27 +02:00
Laurent Destailleur
2e79064098 Clean code 2020-09-28 11:07:53 +02:00
Alexandre SPANGARO
88772726d7 New Add export for various payment 2020-09-28 09:32: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
1aaf1fe357 Try catch on eval 2020-09-27 21:10:27 +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
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
c659379307 Try a more complete fix than #14821 2020-09-27 17:21:49 +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
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
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
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
Laurent Destailleur
88b4c1e766 Fix calculation of nb of top menu in CSS files. 2020-09-25 14:09:51 +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
83bdd530cd Fix sql error in menu edition, column too short 2020-09-25 10:13:45 +02:00