Commit Graph

77873 Commits

Author SHA1 Message Date
Laurent Destailleur
9798bb1b30 Fix responsive 2020-07-27 02:29:16 +02:00
Laurent Destailleur
0011e09248 FIX Setup of clicktodial hang on smartphone 2020-07-27 02:29:11 +02:00
Laurent Destailleur
26c253113b Removed not used files 2020-07-26 22:04:19 +02:00
Laurent Destailleur
714481f7e5 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:08:31 +02:00
Laurent Destailleur
d945ef67e1 FIX Picto of HRM module
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-07-26 20:53:22 +02:00
Laurent Destailleur
353e99c26a Fix look and feel 2020-07-26 19:43:55 +02:00
Laurent Destailleur
cdf7261c7e Fix look and feel 2020-07-26 19:27:29 +02:00
Laurent Destailleur
378c45fe5c Fix look and feel 2020-07-26 19:21:47 +02:00
FlorianMortgat
93348630bf FIX 11.0: computation of the bottom margin of <body> returns NaN because body is not loaded yet 2020-07-25 11:05:05 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f FIX locataxes lost on lines when cloning a vendor invoice 2020-07-25 02:59:49 +02:00
FlorianMortgat
c48a294a2b FIX: allow more harmless html tags 2020-07-25 00:57:40 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/card.php
2020-07-25 00:17:28 +02:00
Laurent Destailleur
b82b6736d1 Look and feel 2020-07-24 18:13:01 +02:00
Laurent Destailleur
6d4b113c72 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 14:25:59 +02:00
Laurent Destailleur
d6f1a897f6 Fix size of module box 2020-07-24 13:44:32 +02:00
Laurent Destailleur
f68be08c67
Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve
Improve printStdColumnContent by passing the $pdf object
2020-07-24 13:20:03 +02:00
Laurent Destailleur
a6e728a4d8
Merge pull request #14246 from fappels/11_fix_date_fourn_price_log
FIX: date in supplier price log tooltip.
2020-07-24 13:18:36 +02:00
Laurent Destailleur
4e4e737ff2
Merge pull request #14269 from atm-gauthier/10.0_fix_wrong_invoice_template_link
FIX : wrong link to third invoice templates
2020-07-24 13:13:15 +02:00
Laurent Destailleur
fb1c226e56 Init var 2020-07-24 13:05:19 +02:00
Laurent Destailleur
ff4ec934e9
Merge pull request #14277 from atm-quentin/fix_warning_total
FIX warning
2020-07-24 12:55:24 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
Laurent Destailleur
c699d71abc
Merge pull request #14281 from ATM-Consulting/11.0_fix_multicurency_option_not_applied
Fix multicurecy option not applied
2020-07-24 12:54:27 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b
Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
Laurent Destailleur
e0d22b739d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/product/stock/class/entrepot.class.php
2020-07-24 01:53:24 +02:00
Laurent Destailleur
db9fc264d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-24 01:51:20 +02:00
Laurent Destailleur
34a9eee7a6 Minor fix in translation 2020-07-24 01:50:57 +02:00
Laurent Destailleur
0f4e00a2a3 Fix language 2020-07-24 01:43:03 +02:00
Laurent Destailleur
99935ce11f FIX Should not be able to edit qty on shipment when no stock available 2020-07-24 01:31:07 +02:00
Laurent Destailleur
431b207dab Fix to solve sql error on some databases 2020-07-24 01:02:07 +02:00
Laurent Destailleur
0890b15077 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70 FIX ClickToDial tab of users has disappeared 2020-07-24 00:06:18 +02:00
Laurent Destailleur
e5a16c530d FIX Can go on page even when module disabled 2020-07-23 23:57:12 +02:00
ATM john
921e904acc Fix MySQL rank usage for column 2020-07-23 20:34:11 +02:00
John Botella
55e65bbabf Fix variable init 2020-07-23 11:12:04 +02:00
John Botella
fc1de5b4f3 Fix multicurecy option not applied 2020-07-23 11:10:18 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +02:00
Frans Bosman
e2592d9049
Update card_presend.tpl.php
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
2020-07-22 11:44:26 +02:00
VERDOL Gauthier
55298317e3 FIX : wrong link to third invoice templates 2020-07-20 16:22:48 +02:00
florian HENRY
734a6de996 Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_fix_commerce_MenuSupplierORderOnly 2020-07-20 09:01:30 +02:00
florian HENRY
2c5e96bb28 better fix 2020-07-20 09:01:21 +02:00
Laurent Dinclaux
3cdabbaaff Explicitly pass the pdf object by reference in the printStdColumnContent hook call. 2020-07-19 21:53:06 +11:00
Francis Appels
c2030a7db5 jdate already in function listProductFournisseurPriceLog
So no conversion needed.
2020-07-19 09:43:15 +02:00
Laurent Destailleur
d598039f20
Merge pull request #14218 from Ahuahuachi/12.0
Update Mexico City name
2020-07-19 02:01:12 +02:00
Laurent Destailleur
521c4679d9 FIX #14241 Mysql 8 compatibility 2020-07-19 01:52:30 +02:00
Laurent Destailleur
f26a64fb88 FIX If using a rounding step, localtax1+2 not included in total 2020-07-19 01:47:17 +02:00
Laurent Destailleur
48adeb9dd7 FIX #14256 2020-07-19 01:38:38 +02:00
Laurent Destailleur
6fdd5ea73a Not required 2020-07-19 01:31:51 +02:00
Laurent Destailleur
ee74740384 FIX #14259 2020-07-19 01:29:42 +02:00
Laurent Destailleur
16d486e211 FIX Setup of currency limit and accuracy 2020-07-19 01:03:37 +02:00
Laurent Destailleur
32410b59c4 Code comment 2020-07-19 00:02:02 +02:00
Laurent Destailleur
3069eaa5c0
Merge pull request #14191 from Gecka-Apps/12.0-fix-14181
[REGRESSION] Fix #14181. Limits and accuracy form not saving modified values.
2020-07-18 23:59:29 +02:00
Laurent Destailleur
c30491284f Fix phpcs 2020-07-18 23:16:05 +02:00
Abdessalam@MEGALOGI
1e6273b92d Update card.php
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-18 23:11:17 +02:00
Oarces DEV
f3e3c47af3 Add the possibility for the prospect to order
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 23:04:22 +02:00
Laurent Destailleur
15cdb3ed79 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0 2020-07-18 23:00:09 +02:00
Laurent Destailleur
ac92a9fa40 Doc more complete 2020-07-18 22:59:47 +02:00
Laurent Destailleur
a252c87c82 Fix comment 2020-07-18 19:41:11 +02:00
Laurent Destailleur
384cb22d3a
Merge pull request #14220 from FHenry/11.0
fix missing entity into fetch wharehouse
2020-07-18 19:32:24 +02:00
Laurent Destailleur
cbc8187616
Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering
Fix extrafields ordering on PDFs
2020-07-18 19:30:34 +02:00
Laurent Destailleur
eef66ae6ed Fix var not defined 2020-07-18 19:22:03 +02:00
Laurent Destailleur
bb4543167f FIX #14222 2020-07-18 19:19:12 +02:00
Laurent Destailleur
ecfcbeef26
Merge pull request #14229 from FHenry/12.0_fix_ShowAdressThirdpartyOption_Extrafield_linkobject
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-18 19:13:52 +02:00
Laurent Destailleur
f07a1a6d1e FIX for #14253 2020-07-18 18:54:55 +02:00
Laurent Destailleur
6ad8145645 FIX for #14253 2020-07-18 18:52:33 +02:00
florian HENRY
d2e528d8c1 fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1 2020-07-15 17:45:45 +02:00
florian HENRY
3148a181e7 fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1 2020-07-15 17:45:34 +02:00
Francis Appels
1bc1fd4cb4 Fix date in supplier price log tooltip. 2020-07-15 11:24:11 +02:00
florian HENRY
f4074428f8 fix filter wharehouse list on ref 2020-07-14 09:38:52 +02:00
florian HENRY
72e0250117 fix extrafields linnktoObject Thirdpary option showAdress 2020-07-13 17:53:00 +02:00
florian HENRY
1173059e7b fix extrafields linnktoObject Thirdpary option showAdress 2020-07-13 17:52:41 +02:00
florian HENRY
96d26be1d4 fix extrafields linnktoObject Thirdpary option showAdress 2020-07-13 17:51:58 +02:00
florian HENRY
045fbad616 fix extrafields linnktoObject Thirdpary option showAdress 2020-07-13 17:48:21 +02:00
florian HENRY
32e4635e84 fix missing entity into fetch wharehouse 2020-07-12 21:34:13 +02:00
florian HENRY
7b5072a21b fix missing entity 2020-07-12 10:10:46 +02:00
florian HENRY
2f8968478d fix missing entity into fetch wahrehouse 2020-07-12 10:06:04 +02:00
Alfredo Altamirano
6aae68bb07 Change Mexico City name
Mexico City official name and code changed since 2016
2020-07-11 10:49:05 -05:00
Laurent Destailleur
eede2f9944 Add telangana province for india 2020-07-11 10:39:12 +02:00
Laurent Destailleur
c3375b176d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:21:01 +02:00
Laurent Destailleur
ff5a2d459d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-10 05:20:09 +02:00
Laurent Destailleur
071b909d38 FIX Fails to retraive accounting code of social contribution sometimes
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:19:21 +02:00
Laurent Destailleur
79a6246666 FIX Fails to retraive accounting code of social contribution sometimes
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:18:46 +02:00
Laurent Destailleur
86744a2e0c FIX Fails to retraive accounting code of social contribution sometimes 2020-07-10 05:14:54 +02:00
Laurent Destailleur
a36c6a8dda FIX #14209 2020-07-10 02:46:59 +02:00
Laurent Destailleur
2cc7e88f8e clean code 2020-07-10 02:32:22 +02:00
Laurent Destailleur
7fdccf4eb8 Fix error in stripe payment if no country defined 2020-07-10 02:28:00 +02:00
Laurent Destailleur
e8dd99a9cd Trans 2020-07-10 01:11:37 +02:00
Laurent Destailleur
d18188d565 Fix missing trans 2020-07-10 00:57:29 +02:00
Laurent Destailleur
fd95551940 Fix upload of file in import module
Conflicts:
	htdocs/core/lib/security.lib.php
2020-07-09 21:52:27 +02:00
gauthier
25509e74d3 FIX : order by amount ht uses wrong column 2020-07-09 17:27:14 +02:00
Laurent Destailleur
cb7f78e9d3 Fix tpl 2020-07-09 16:25:51 +02:00
Laurent Destailleur
6b5f46624c Fix label of AWP 2020-07-09 16:19:40 +02:00
Laurent Destailleur
b8721e0c64 FIX Change position of line in BOM 2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e Fix extrafields ordering on PDFs 2020-07-10 00:51:41 +11:00
Laurent Destailleur
f756864670 CSS 2020-07-09 12:44:31 +02:00
Laurent Destailleur
49faaf750f Trans 2020-07-09 12:39:43 +02:00
Laurent Destailleur
ce1649233d FIX CSS 2020-07-09 12:39:00 +02:00
Laurent Destailleur
8589e122c6 css 2020-07-09 11:58:44 +02:00
Laurent Destailleur
56c90c289a Prepare 12.0.2 2020-07-08 18:19:20 +02:00
Laurent Destailleur
1dfd2d565b FIX Reposition and nav 2020-07-08 18:18:47 +02:00
Laurent Destailleur
edb4aac8d3 CSS 2020-07-08 18:09:35 +02:00
Laurent Dinclaux
37401df106 Improve printStdColumnContent by passing the $pdf object.
It isn't possible to replace the pdf edition done by this method without the $pdf object.
2020-07-08 14:48:34 +11:00
Laurent Dinclaux
f2adc3de4f Fix Dolibarr/dolibarr#14181. Limits and accuracy form not saving modified values 2020-07-07 18:03:11 +11:00
Laurent Destailleur
67c164df07 FIX reposition was broken if url end with #anchor 2020-07-06 22:27:19 +02:00
Laurent Destailleur
415398fc66 Better contrast 2020-07-06 21:06:32 +02:00
Laurent Destailleur
e13d3ce657 Trans 2020-07-06 20:57:47 +02:00
Laurent Destailleur
f72a836231 Fix look and feel v12 2020-07-06 16:59:25 +02:00
Laurent Destailleur
4dcc073b3a Fix param GETPOST 2020-07-06 16:54:30 +02:00
Laurent Destailleur
3939a640e9 Fix note in creation 2020-07-06 16:52:28 +02:00
Laurent Destailleur
61a7f54877 Fix look and field 2020-07-06 15:55:41 +02:00
Laurent Destailleur
7d7ef1e72a FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY
Fix setup of product
2020-07-06 15:34:26 +02:00
Laurent Destailleur
471f3e66e6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-06 12:27:43 +02:00
Laurent Destailleur
6a41d5bba8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/projet/tasks/list.php
2020-07-06 12:27:25 +02:00
Laurent Destailleur
21bec139ca
Merge pull request #14183 from FHenry/12.0
remove warning when date end contract line empty
2020-07-06 12:06:42 +02:00
Laurent Destailleur
b4cd670b09
Merge pull request #14186 from atm-gauthier/10.0_fix_search_soc
FIX : soc filter doesn't work on task list
2020-07-06 12:05:40 +02:00
Laurent Destailleur
091fbb2824 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-06 11:55:06 +02:00
Laurent Destailleur
9b1163cfb8 Fix menu organisation. 2020-07-06 11:52:28 +02:00
Laurent Destailleur
1e9ae1bc02 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Laurent Destailleur
2629a98851 Fix regression 2020-07-06 11:31:05 +02:00
Laurent Destailleur
1399ac9b41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-06 11:28:17 +02:00
Laurent Destailleur
053a1a2230 Fix duplicate code 2020-07-06 11:22:30 +02:00
Laurent Destailleur
056aa81ed3 Fix responsive 2020-07-06 10:59:23 +02:00
gauthier
466b7e84ef FIX : soc filter doesn't work on task list 2020-07-06 09:58:44 +02:00
Laurent Destailleur
b76828df9f Fix use of newtoken() 2020-07-06 09:39:26 +02:00
Laurent Destailleur
9cd8c3738f Fix trans 2020-07-05 23:18:19 +02:00
Laurent Destailleur
8df431f525 Look and feel v12 2020-07-05 13:30:56 +02:00
Laurent Destailleur
54a77a604c FIX Missing token 2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e Look and feel v12
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5 Trans 2020-07-05 12:47:32 +02:00
Laurent Destailleur
b726e96f4b FIX Update form erased extrafields that were hidden 2020-07-04 17:09:20 +02:00
florian HENRY
03ae31eced remove warning when date end contract line empty 2020-07-04 16:37:50 +02:00
florian HENRY
335a767f22 remove warning when date end contract line empty 2020-07-04 16:37:11 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
9912ffd555 Fix position of button 2020-07-04 13:45:28 +02:00
Laurent Destailleur
4819e58d06 Fix trans 2020-07-04 13:04:53 +02:00
Laurent Destailleur
dd9cb8e781 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-03 19:27:42 +02:00
Laurent Destailleur
e256ce5c4b Debug credit transfer module 2020-07-03 19:27:23 +02:00
Laurent Destailleur
636f1e642d Fix param of product id to switch to list of order 2020-07-03 01:31:48 +02:00
Laurent Destailleur
4fba3ec872
Merge pull request #14115 from atm-florian/10.0
fix entity on supplier order
2020-07-03 00:50:51 +02:00
Laurent Destailleur
03aa4873d1
Merge pull request #14141 from fappels/12_fix_extrafield_html
FIX html lost on html extrafield
2020-07-03 00:49:31 +02:00
Laurent Destailleur
b88e159495 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
2020-07-03 00:46:18 +02:00
Laurent Destailleur
ec98ffb492 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:40 +02:00
Laurent Destailleur
59049cd047 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:32 +02:00
Laurent Destailleur
8d8695ccd7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:41:06 +02:00
Laurent Destailleur
53c5ec51b8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:40:59 +02:00
oscim
ca66eac76c Update project.class.php
Fix order of delete extra prev table of project
2020-07-03 00:40:15 +02:00
Laurent Destailleur
18fa4c4105
Update card.php 2020-07-03 00:38:31 +02:00
Laurent Destailleur
fd617658ef Fix syntax 2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d fix #14143 2020-07-03 00:34:50 +02:00
Tim Otte
bce0a93227 Hotfix for an error in v12 2020-07-03 00:33:54 +02:00
Laurent Destailleur
836ccfd595 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-03 00:32:25 +02:00
Laurent Destailleur
9c504c1b3d
Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields
FIX change selected fields on company card
2020-07-03 00:30:34 +02:00
Laurent Destailleur
0ea55209ae
Merge pull request #14165 from ptibogxiv/patch-345
FIX non numeric value on comm/card.php
2020-07-03 00:24:32 +02:00
ksar
0a13e03792 FIX : Correct ModuleBuilder left menu 2020-07-03 00:21:39 +02:00
Laurent Destailleur
d24c6f7a81
Merge pull request #14164 from ptibogxiv/patch-344
FIX takepos 12 hook
2020-07-03 00:20:28 +02:00
Laurent Destailleur
75409e3ed0
Merge pull request #14171 from hregis/12.0_bug
FIX missing possibility to change entity when propal cloning
2020-07-03 00:18:35 +02:00
Laurent Destailleur
6c01cc16f8
Update commande.class.php 2020-07-03 00:14:22 +02:00
Laurent Destailleur
16b327f106 Debug module credit transfer 2020-07-02 15:45:11 +02:00
quentin
642e75c3dd FIX wrong origin 2020-07-02 14:16:31 +02:00
Regis Houssin
a5431a40da FIX missing possibility to change entity when propal cloning 2020-07-02 10:16:20 +02:00
Laurent Destailleur
ae0c738980 FIX Entry from stripe intent were reported into SEPA payments
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
2020-07-01 19:42:28 +02:00
Laurent Destailleur
d3c23428d5 FIX Use of office365 TLS with SMTPs method.
Conflicts:
	htdocs/core/class/smtps.class.php
2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54 FIX Use of office365 TLS with SMTPs method.
Conflicts:
	htdocs/core/class/smtps.class.php
2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:01:46 +02:00
ptibogxiv
cc132775f3
FIX non numeric value on comm/car.php 2020-07-01 16:18:19 +02:00
stickler-ci
92f4744d11 Fixing style errors. 2020-07-01 13:22:43 +00:00
ptibogxiv
5e259d26ab
FIX takepos hook
can add more than 1 button within 1 module
2020-07-01 15:20:42 +02:00
Laurent Destailleur
e2a9743dd4 Debug module credit transfer 2020-07-01 14:19:47 +02:00
Laurent Destailleur
5f2486049e Fix trans 2020-07-01 13:22:15 +02:00
Laurent Destailleur
5f37f54675 Fix warning 2020-07-01 13:16:06 +02:00
lvessiller
918e669c98 FIX change selected fields on company card 2020-06-30 16:33:18 +02:00
Laurent Destailleur
5afd518718 Update vat rate for Congo 2020-06-30 13:06:44 +02:00
Laurent Destailleur
4f1ac84a19 Fix can't find link to edit table plan 2020-06-30 12:07:24 +02:00
gauthier
6553c40bea FIX : create a deposit with amount using comma didn't work 2020-06-30 11:23:55 +02:00
Laurent Destailleur
9bb0ef04f5 Fix upload of file in import module 2020-06-29 18:07:51 +02:00
Laurent Destailleur
f34a3785f0 FIX CSS 2020-06-29 16:02:50 +02:00
Laurent Destailleur
3d8d55a531 Fix bad path in import section 2020-06-29 14:42:09 +02:00
Laurent Destailleur
b64fc7dc3f FIX Avoid warning when creating a module with already existing files 2020-06-29 14:37:36 +02:00
Laurent Destailleur
5b3670f300 FIX SQL syntax error when editing extrafields
Conflicts:
	htdocs/core/lib/security.lib.php
2020-06-29 14:28:53 +02:00
Laurent Destailleur
8bb11039dc Clean code 2020-06-29 09:56:04 +02:00
Laurent Destailleur
7c4e737668 Clean code 2020-06-29 09:53:55 +02:00
Laurent Destailleur
68b4866438 Trans 2020-06-29 09:43:39 +02:00
Laurent Destailleur
eb30f6ed1a Prepare 12.0.1 2020-06-29 09:15:49 +02:00
Francis Appels
5d65b5f660 fix html should not do price2num 2020-06-29 09:07:54 +02:00
Laurent Destailleur
600a24346a Some people are missing this table 2020-06-28 22:09:17 +02:00
Laurent Destailleur
a5893db106 FIX upload documents into manual ECM was reported a permission error 2020-06-28 22:05:55 +02:00
Laurent Destailleur
70efaa4235 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-28 21:48:02 +02:00
Laurent Destailleur
95729e2375 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
Laurent Destailleur
960512acd9
Update fournisseur.commande.class.php
Action with filter on rowid does not need to have test on entity
2020-06-28 21:21:35 +02:00
Laurent Destailleur
1194c61857
Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2
FIX 10.0 - fatal with postgreSQL
2020-06-28 21:20:20 +02:00
Laurent Destailleur
dfb7c3e194
Update fournisseur.commande.class.php 2020-06-28 21:14:49 +02:00
Laurent Destailleur
cf899364f3
Merge pull request #14116 from aspangaro/12p1
FIX: SQL Problem in customer invoice list
2020-06-28 21:13:17 +02:00
Laurent Destailleur
d98c54c445
Merge pull request #14132 from aspangaro/12p2
FIX: SQL Problem in supplier invoice list
2020-06-28 21:11:56 +02:00
Laurent Destailleur
08b3cc5033
Merge pull request #14133 from aspangaro/12p3
FIX: SQL Problem in social contribution list
2020-06-28 21:11:35 +02:00
Laurent Destailleur
a11f7d1070
Update list.php 2020-06-28 21:11:25 +02:00
Laurent Destailleur
4dfd016504
Merge pull request #14140 from fappels/12_missing_translate
Fix missing translate key
2020-06-28 21:07:49 +02:00
Laurent Destailleur
2de1433818 FIX #14142 2020-06-28 21:05:36 +02:00
Francis Appels
731978fda6 FIX html lost on html extrafield 2020-06-28 16:33:44 +02:00
Laurent Destailleur
194b92e70f Fix load of menu when 'perm' or 'enabled' is '0'. 2020-06-27 15:27:09 +02:00
Laurent Destailleur
41c6155922 Hiden useless entry 2020-06-27 14:44:38 +02:00
Laurent Destailleur
d5324ff3db Fix template 2020-06-27 14:41:11 +02:00
Laurent Destailleur
90bcc64547 Fix phpcs 2020-06-27 01:59:08 +02:00
Laurent Destailleur
443558e3a2 Fix phpcs 2020-06-27 01:57:01 +02:00
Laurent Destailleur
3655f6f407 FIX #14109 2020-06-26 20:38:41 +02:00
Laurent Destailleur
6df049e05c FIX #14112 2020-06-26 20:35:06 +02:00
Laurent Destailleur
8e324c36ff Prepare 11.0.5 2020-06-26 19:39:01 +02:00
Laurent Destailleur
ee0bdde8c1 FIX Filter on status, closing opening status 2020-06-26 19:36:22 +02:00
Laurent Destailleur
d6346522b8 Code comment 2020-06-26 19:36:15 +02:00
Francis Appels
f4494db73f Fix missing translate key 2020-06-26 17:34:11 +02:00
Laurent Destailleur
29ba9c82c3 Fix #14120 2020-06-26 17:17:13 +02:00
gauthier
858a751eef FIX : $_POST must be GETPOST 2020-06-26 10:51:04 +02:00
Alexandre SPANGARO
0c60c9fd0d FIX: SQL Problem in social contribution list 2020-06-25 20:53:03 +02:00
Alexandre SPANGARO
62f55b8549 FIX: SQL Problem in supplier invoice list 2020-06-25 20:43:41 +02:00
Florian Mortgat
ccfe6f18fe FIX 10.0 - fatal with postgres
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +02:00
Laurent Destailleur
18c23680f7 Fix bad object 2020-06-25 12:17:06 +02:00
Laurent Destailleur
bbb8c9418e Fix bad property 2020-06-25 11:51:46 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into
commoninvoice
2020-06-24 19:59:06 +02:00
Alexandre SPANGARO
ffaf7068d5 FIX: SQL Problem in customer invoice list 2020-06-24 14:03:16 +02:00
Laurent Destailleur
2865d6bd15 Fix set of free product 2020-06-24 13:39:00 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
florian HENRY
77868ad2a3 fix entity on supplier order 2020-06-24 12:42:41 +02:00
florian HENRY
a7f022dcea Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2020-06-24 12:24:55 +02:00
florian HENRY
8c1af0fdb8 fix enbtoty on supplier order 2020-06-24 12:24:47 +02:00
Laurent Destailleur
1762e10e69 Fix return code not returned 2020-06-24 09:55:10 +02:00
Laurent Destailleur
a854d955b8 Fix rounding 2020-06-23 16:08:31 +02:00
Laurent Destailleur
0363717476 Fix PROJECT_ELEMENTS_FOR_MINUS_MARGIN 2020-06-23 16:05:00 +02:00
Laurent Destailleur
7c992eac5e Fix option PROJECT_ELEMENTS_FOR_MINUS_MARGIN 2020-06-23 15:52:17 +02:00
Laurent Destailleur
d05c60baf0 Fix css 2020-06-23 14:33:34 +02:00
Laurent Destailleur
4d2cbf7006 Fix alert picto of expired services not visible
Fix CSS
2020-06-23 11:27:40 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
058a0d4fa7 Fix look and feel v12 2020-06-22 04:27:16 +02:00
Laurent Destailleur
1ce5b78a6b Fix error message not reported 2020-06-22 01:02:17 +02:00
Laurent Destailleur
0139a840ae Fix setup 2020-06-21 20:49:34 +02:00
Laurent Destailleur
d84fbb7165 css 2020-06-20 18:59:13 +02:00
Laurent Destailleur
bb3320f103 FIX #14104 2020-06-20 18:34:19 +02:00
Laurent Destailleur
fe1f88d2ac FIX #14092 #14093 2020-06-20 16:09:53 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
b54c18730b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
2020-06-20 12:25:08 +02:00
andreubisquerra
515d18020d Add security check 2020-06-20 12:21:14 +02:00
andreubisquerra
532fe82c6e Fix travis 2020-06-20 12:21:06 +02:00
jove@bisquerra.com
ad432e1e9b Printable QR 2020-06-20 12:20:53 +02:00
Laurent Destailleur
70039d0c41 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-20 12:19:36 +02:00
Laurent Destailleur
450c340cb1 Trans 2020-06-20 12:19:25 +02:00
Laurent Destailleur
c919d3d5aa
Merge pull request #14100 from atm-florian/12_fixAdvTargetTplWarning
fix: warning and clean old code about multiselect category for advtarget tpl
2020-06-20 12:18:35 +02:00
Laurent Destailleur
378db9ab9a
Merge pull request #14099 from atm-florian/12.0
fix: same feature on thirdparty extrafields transport to invoice as existing on orders
2020-06-20 12:16:57 +02:00
Laurent Destailleur
5a53a16c17
Merge pull request #14101 from mistraloz/patch-5
Fix: Bug when delete payment when already deleted in account
2020-06-20 12:15:59 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php 2020-06-20 12:15:48 +02:00
Laurent Destailleur
8eb23c5ee5
Merge pull request #14103 from atm-florian/12_fix_invoicelist_filterbySalesRep
fix f.fk_user_author unknow because after stange join with coma
2020-06-20 12:14:48 +02:00
Laurent Destailleur
2de3eb8ac0 Fix CSS 2020-06-20 00:00:17 +02:00
Laurent Destailleur
d632f1c6b2 Fix url 2020-06-19 23:08:29 +02:00
Laurent Destailleur
d8927143fa Fix chrome style 2020-06-19 20:01:57 +02:00
Laurent Destailleur
f24e73141e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc FIX #13877 2020-06-19 14:50:33 +02:00
Laurent Destailleur
989737af6b Update website templates 2020-06-19 10:36:19 +02:00
florian HENRY
07923e0baf fix f.fk_user_author unknow because after stange join with coma 2020-06-19 10:08:19 +02:00
florian HENRY
c2920083d8 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fixAdvTargetTplWarning 2020-06-19 09:49:50 +02:00
florian HENRY
29c049e358 set correct global conf 2020-06-19 09:49:43 +02:00
Laurent Destailleur
623a9db4e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/product/composition/card.php
	htdocs/public/notice.php
2020-06-19 00:42:20 +02:00
Laurent Destailleur
22ca5e0671 Fix XSS reported by C. Weiler <sak1.s3curity@gmail.com> in notice.php 2020-06-19 00:39:27 +02:00
Laurent Destailleur
b8c0ed13f3 Fix can't find link to generate barcode sheets 2020-06-19 00:25:59 +02:00
Mistral Oz - LWEP
2f7bb18e2b
Fix: Bug when delete payment when already deleted in account
Related to : 
https://github.com/Dolibarr/dolibarr/blame/11.0/htdocs/compta/bank/class/account.class.php#L1976

Mistake between id / rowid. I prefere add the fix here (but a fix in account class can be also a good fix). 
And best fix may use setter to do it (but to complicated : maybe latter ? i may check it in september if you want in all CommonObject properties)
2020-06-18 20:56:46 +02:00
florian HENRY
7fef9a813e fix warning and clean old code about multiselect category 2020-06-18 20:03:03 +02:00
florian HENRY
a705cc41ae fix: same feature on invoice as on orders 2020-06-18 19:44:24 +02:00
florian HENRY
835f6d42d8 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2020-06-18 19:42:34 +02:00
florian HENRY
e82d71c949 fix: same feature on invoice as on orders 2020-06-18 19:42:23 +02:00
Laurent Destailleur
b9218a1c4c Debug v12 2020-06-18 19:21:21 +02:00
Laurent Destailleur
4cfe1fcd6b Typo 2020-06-18 15:57:50 +02:00
Laurent Destailleur
c986ab95cf FIX Edit of a time spent line 2020-06-18 14:09:43 +02:00
Laurent Destailleur
ade542eee7 Sync language 2020-06-18 10:05:00 +02:00
Laurent Destailleur
fded55ddef Fix sepa supplier count 2020-06-18 03:44:26 +02:00
Laurent Destailleur
eef07afc90 Try to solve pb with too many columns. Merge 2 columns of amounts in 1 2020-06-18 03:32:13 +02:00
Laurent Destailleur
a4059882a9 Fix update pagination 2020-06-18 03:03:02 +02:00
Laurent Destailleur
1ed649ff28 Fix tooltip on project not visible sometimes 2020-06-18 02:50:46 +02:00
Laurent Destailleur
a5ce3ada0a Keep feature experimental as it need a lot of change 2020-06-18 02:35:08 +02:00
Laurent Destailleur
c0b269b9ee Fix Permissions on MO and API for MO 2020-06-18 01:09:30 +02:00
Laurent Destailleur
dc70cab2cb Fix tooltip 2020-06-17 22:29:05 +02:00
Laurent Destailleur
42860d752c Fix templates 2020-06-17 22:11:22 +02:00
Laurent Destailleur
54596d2286 FIX #13967 2020-06-17 19:26:17 +02:00
Laurent Destailleur
de5a2d738b FIX #14001 2020-06-17 18:39:25 +02:00
Laurent Destailleur
32eaa9137c FIX #14034 2020-06-17 18:29:29 +02:00
Laurent Destailleur
2f687a3c40 FIX #14033 2020-06-17 17:57:32 +02:00
Laurent Destailleur
adb988a18b FIX Add missing label of event for #14094. Still missing link to object 2020-06-17 15:45:26 +02:00
Laurent Destailleur
13cdd5bc45 FIX #14095 2020-06-17 15:42:55 +02:00
Laurent Destailleur
8f4a181380 css 2020-06-17 15:35:52 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320 FIX vulenrability reported by wizlynx WLX-2020-012 2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8 FIX vulenrability reported by wizlynx WLX-2020-012 2020-06-17 13:42:38 +02:00
Laurent Destailleur
fdbb6debc9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-17 13:30:43 +02:00
Laurent Destailleur
6660923e94 FIX Privilege escalation reported by wizlynx WLX-2020-011 2020-06-17 13:29:43 +02:00
Florian Mortgat
3d69a1dc70 FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn 2020-06-17 11:06:31 +02:00
Laurent Destailleur
bbbcd5b6b3 Fix phpcs 2020-06-16 22:48:19 +02:00
Xebax
5d76b4781e FIX Upload of documents for members using the REST API. 2020-06-16 22:48:14 +02:00
Laurent Destailleur
6ea4928c79
Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports
11.0 - FIX - missing currency columns in supplier exports
2020-06-16 22:00:56 +02:00
Laurent Destailleur
cbd99ea7a2 FIX #14088 2020-06-16 21:57:49 +02:00
gauthier
e50d239322 FIX : force rounding 2 on export ld compta 2020-06-16 11:40:01 +02:00
Florian Mortgat
18d5ec7750 11.0 - FIX - missing currency columns in supplier exports
(copy-pasted from modFacture.class.php)
2020-06-16 10:56:10 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00
Laurent Destailleur
7b64e8643f Trans and css 2020-06-15 16:08:48 +02:00
Laurent Destailleur
40e16672e3 FIX BlindBoolean SQL injection reported by Christian Weiler
<sak1.s3curity@gmail.com>
2020-06-15 15:08:52 +02:00
Laurent Destailleur
15dd1bd705 Merge 2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507 Fix escape fields 2020-06-14 21:49:25 +02:00
Laurent Destailleur
f9da31e658 Fix rounding 2020-06-14 21:49:19 +02:00
Laurent Destailleur
83263cc174 Fix supplier sepa 2020-06-14 21:49:12 +02:00
Laurent Destailleur
2c327aae66 Prepare v12 2020-06-12 19:30:23 +02:00
Laurent Destailleur
b7e7ccee54 Update demo 2020-06-12 18:55:36 +02:00
Laurent Destailleur
c90ab62989 Fix We must include version into filename 2020-06-12 15:31:12 +02:00
Laurent Destailleur
2a20fc3968 Fix missing author into export_alias 2020-06-12 15:27:28 +02:00
Laurent Destailleur
9bb5135317 Fix We never add .noexe of files into medias dir 2020-06-12 15:20:28 +02:00
Laurent Destailleur
72130dacb9
Merge pull request #14061 from atm-gauthier/10.0_fix_progress_pdf
FIX : percent must be displayed on one line
2020-06-12 14:50:49 +02:00
Laurent Destailleur
5d5fb46af6 Fix We never add .noexe of files into medias dir 2020-06-12 14:35:50 +02:00
Laurent Destailleur
1ba03566dc Fix case of delete contact not correctly implemented. 2020-06-12 02:15:02 +02:00
Laurent Destailleur
a0b6d9c4e0 css 2020-06-12 01:19:50 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/takepos/admin/setup.php
2020-06-11 23:36:55 +02:00
Laurent Destailleur
0023d14e65
Merge pull request #14037 from OPEN-DSI/v10-fix-takepos-free-text-html
FIX free text on cash desk
2020-06-11 23:33:31 +02:00
Laurent Destailleur
ffb345e724
Merge pull request #14062 from atm-florianm/11.0_FIX_missing_translation
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
2020-06-11 23:05:55 +02:00
Laurent Destailleur
9aafb82fd3
Merge pull request #14059 from atm-florianm/FIX_10.0_missing_global_langs_when_activating_modContrat
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
2020-06-11 23:02:19 +02:00
Laurent Destailleur
3698af39f1
Merge pull request #14060 from indelog/fix_measuringunitstring
Fix 11.0 -  undef func measuringUnitString() in From::select_produits_fournis…
2020-06-11 23:02:01 +02:00
Laurent Destailleur
7d4a7a4be0
Merge pull request #14067 from atm-john/11.0_fix_ticket_file_save
Fix ticket file save
2020-06-11 23:01:33 +02:00
Laurent Destailleur
f1f37c7b29
Merge pull request #14064 from atm-florianm/FIX_11.0_postgresql_fatal_on_contact_agenda
FIX 11.0 - fatal with postgres on contact/agenda.php
2020-06-11 23:01:01 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php 2020-06-11 22:58:58 +02:00
Laurent Destailleur
ee611fa7a0 Fix bad definition of field for parent 2020-06-11 18:32:05 +02:00
Laurent Destailleur
c70cd01971 Fix css 2020-06-11 17:58:00 +02:00
Laurent Destailleur
3831b56423 Missing tags 2020-06-11 17:07:41 +02:00
Laurent Destailleur
78204f92e6 Fix tag 2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a Fix tag at bad place 2020-06-11 16:59:24 +02:00
Regis Houssin
997cb214f1 FIX avoid error "Call to undefined function measuringUnitString()" 2020-06-11 16:52:24 +02:00
Laurent Destailleur
503206af88 Fix analytics tag 2020-06-11 16:38:58 +02:00
Laurent Destailleur
5b882e333d Fix tooltip on localtaxes 2020-06-10 23:00:17 +02:00
Laurent Destailleur
e94ef09977 css 2020-06-10 22:24:15 +02:00
Laurent Destailleur
5e13a7f1e2 css 2020-06-10 22:05:49 +02:00
ATM john
564b9df1e7 Fix ticket file save 2020-06-10 17:01:57 +02:00
gauthier
58ff96af30 FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php 2020-06-10 16:48:02 +02:00
Florian Mortgat
5bc80f8626 FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax 2020-06-10 16:22:48 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser
Conflicts:
	htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
9bbdaffe9d FIX Sharing buttons 2020-06-10 12:45:02 +02:00
Laurent Destailleur
756ef0b583 Fix disallow < > into meta info
Fix message page regenerated
2020-06-09 21:43:42 +02:00
Florian Mortgat
d19febc2ca FIX: missing translation value for key "NoMorePredefinedProductToDispatch" 2020-06-09 17:34:24 +02:00
gauthier
92b89437d1 FIX : percent must be displayed on one line 2020-06-09 16:02:41 +02:00
DEMAREST Maxime (Indelog)
1ac341e651 Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list 2020-06-09 15:33:10 +02:00
Florian Mortgat
0a2099e0ac FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat 2020-06-09 14:22:32 +02:00
Laurent Destailleur
063b3263cc Trans 2020-06-08 23:12:45 +02:00
Laurent Destailleur
233c7e53f1 Debug v12 2020-06-08 20:31:09 +02:00
Laurent Destailleur
cf976a2b98 Fix translation 2020-06-08 17:00:58 +02:00
Laurent Destailleur
f4f0da6de2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39 Show more info to help fix corrupted data 2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1 Error message 2020-06-08 15:12:07 +02:00
Laurent Destailleur
2e06ce306a Tooltip 2020-06-08 15:03:10 +02:00
Laurent Destailleur
70bdd59548 Fix trans 2020-06-08 11:52:43 +02:00
Laurent Destailleur
c386f4b2e3 Maxi debug of direct debit order 2020-06-08 11:43:20 +02:00
VESSILLER
7bba9db2f0 FIX replace filter parameter "none" by "restricthtml" 2020-06-08 11:28:05 +02:00
Laurent Destailleur
f7563818ac css 2020-06-07 23:12:56 +02:00
Laurent Destailleur
7ce7905d31 Fix check for mrp 2020-06-07 23:03:58 +02:00
Laurent Destailleur
d1dba53f61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/modules.php
	htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
9f8a3916c2 FIX #14051 #14052 2020-06-07 19:37:42 +02:00
Laurent Destailleur
09047dc19c Doc 2020-06-07 19:26:37 +02:00
Laurent Destailleur
81c80b254e Fix lang property on database menu entry was not propagated 2020-06-07 19:25:25 +02:00
Laurent Destailleur
5e6ce8ea70 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-07 18:59:57 +02:00
Laurent Destailleur
941362e683 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
2a1d547267 Celan dead code 2020-06-07 18:44:37 +02:00
Laurent Destailleur
4020d97362 FIX Can create a credit note on situation invoice if previous is also
credit note
2020-06-07 18:36:58 +02:00
Laurent Destailleur
180a0a4557 Info for debug 2020-06-07 18:30:46 +02:00
Marc Guenneugues
bd12972d7b replenish : select expedition quantities only from opened orders when using virtual stocks 2020-06-07 14:14:11 +02:00
Vaadasch
7b53ee2a6f Update byratecountry.php
Add "cc.code" in the "GROUP BY" clause. Error in PGSQL if absent.
Add ORDER BY country / product_type / vatrate
2020-06-07 14:13:57 +02:00
Laurent Destailleur
e17818c3dd
Merge pull request #14048 from simicar29/11.0-replenish
replenish : select expedition quantities only from opened orders when…
2020-06-07 14:12:38 +02:00
Laurent Destailleur
42d44e996f Fix link to setup page 2020-06-07 13:50:58 +02:00
Laurent Destailleur
04f68d25cd css 2020-06-07 01:34:26 +02:00
Laurent Destailleur
4169aa716c FIX can install module even if (x) was appended during download. 2020-06-07 00:23:20 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
115b827115 Prepare v12 2020-06-06 22:52:36 +02:00
Laurent Destailleur
e9a0b0c290
Merge pull request #14029 from atm-maxime/fix_user_validator_test
Fix missing test on module enabled for user validators
2020-06-06 22:23:30 +02:00
Laurent Destailleur
30ea9a497d
Merge pull request #14030 from atm-maxime/fix_contact_update_socialnetworks
Fix #14027 : emptying social network value on contact wasn't working
2020-06-06 21:57:32 +02:00
Laurent Destailleur
b221c65165 Merge 2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-06 21:52:55 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php 2020-06-06 21:47:27 +02:00
Laurent Destailleur
38d95aa5cd
Update societe.class.php 2020-06-06 21:45:53 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php 2020-06-06 21:41:33 +02:00
Laurent Destailleur
87806346c7
Update commonobject.class.php 2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da
Update commonobject.class.php 2020-06-06 21:37:53 +02:00
Laurent Destailleur
af440b7c49
Update societe.class.php 2020-06-06 21:32:25 +02:00
Laurent Destailleur
a66926cf08
Update commonobject.class.php 2020-06-06 21:30:08 +02:00
Laurent Destailleur
4f2af3bf67
Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets
FIX : Tickets mail models doesn't work
2020-06-06 21:24:04 +02:00
Laurent Destailleur
30c6ae394b
Update html.formticket.class.php 2020-06-06 21:23:35 +02:00
Laurent Destailleur
cd8dd236f4
Merge pull request #14028 from aspangaro/10.0_p38
FIX: Show ref_customer, amount on contract link object
2020-06-06 21:22:11 +02:00
Laurent Destailleur
a5b74189e6
Merge pull request #14031 from atm-florianm/10.0_FIX_copy_payment_value_date_on_account_line
FIX: copy value date of VariousPayment onto the new AccountLine
2020-06-06 21:19:11 +02:00
Laurent Destailleur
123265bf4c Fix redirect url in multilang 2020-06-06 20:37:17 +02:00
Laurent Destailleur
fb02edf254 Fix For select language component, we force on root 2020-06-06 20:25:05 +02:00
Laurent Destailleur
34778937c3 Fix link to image 2020-06-06 20:16:07 +02:00
Laurent Destailleur
2d87da8815 Fix link 2020-06-06 20:11:01 +02:00
Laurent Destailleur
7061e9b4cb Fix deletion of website page 2020-06-06 18:57:24 +02:00
Laurent Destailleur
e31e889595 Add url in error message 2020-06-06 18:30:04 +02:00
florian HENRY
0943b13ecc Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-06 17:51:31 +02:00
Laurent Destailleur
36bc266d67 css 2020-06-06 17:33:26 +02:00
Laurent Destailleur
dd5b5e9bbf Fix lang suggested in clone of page 2020-06-06 17:12:37 +02:00
Laurent Destailleur
919cc0da87 Fix num payment 2020-06-06 15:39:18 +02:00
Laurent Destailleur
a305c43901 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/societe/card.php
	htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Marc Guenneugues
cefc8dcca2 replenish : select expedition quantities only from opened orders when using virtual stocks 2020-06-06 11:39:49 +02:00
Laurent Destailleur
5dd9f4e4c4 Fix travis false positive 2020-06-06 11:36:24 +02:00
Laurent Destailleur
2344435416 Fix XSS CWE-ID CWE-79 2020-06-05 23:41:29 +02:00
Laurent Destailleur
4fcaaa3387 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-05 17:48:02 +02:00
Laurent Destailleur
ca3f62e4ac Doc repair Row size too large 2020-06-05 17:47:52 +02:00
Alexandre SPANGARO
e5f8f38fbf FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon 2020-06-05 17:24:59 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu
Fix picto in search_page
2020-06-05 13:41:33 +02:00
VESSILLER
ded7b79a6f FIX free text on cash desk 2020-06-05 12:10:03 +02:00
Laurent Destailleur
b75700cc0b Fix virtualstock activation when MRP module is on 2020-06-05 10:27:34 +02:00
Laurent Destailleur
630525b59c css 2020-06-05 02:22:16 +02:00
florian HENRY
699557adbe forget[] 2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737 forget[] 2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0 2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d Fixing style errors. 2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c fix comment 2020-06-04 20:20:43 +02:00
florian HENRY
9a3e68b594 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-04 20:14:29 +02:00
florian HENRY
7115bd7033 better fix 2020-06-04 20:14:19 +02:00
Laurent Destailleur
c7a614bd50 Fix clean data 2020-06-04 17:07:22 +02:00
Florian Mortgat
c393f8149c FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date 2020-06-04 11:29:51 +02:00
Alexandre SPANGARO
ede084a111 Fix stickler 2020-06-04 05:11:00 +02:00
Maxime Kohlhaas
f6e0ed08e2 Fix #14027 : emptying social network value on contact wasn't working 2020-06-04 00:30:17 +02:00
Maxime Kohlhaas
e19f496d62 Fix missing test on module enabled for user validators 2020-06-03 23:30:06 +02:00
Alexandre SPANGARO
9e5c7d0acf FIX: Show ref_customer, amount on contract link object 2020-06-03 23:00:53 +02:00
Laurent Destailleur
7b84518e59 Fix webp support 2020-06-03 14:05:18 +02:00
Laurent Destailleur
8023bc2fbb Fix cancel in media filemanager 2020-06-03 12:39:06 +02:00
Laurent Destailleur
51c578840c Fix cancel in media filemanager 2020-06-03 12:39:00 +02:00
Laurent Destailleur
ae3d786593 Fix crop on media file manager
Conflicts:
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/photos_resize.php
	htdocs/theme/eldy/global.inc.php
2020-06-03 12:38:42 +02:00
Laurent Destailleur
a37a4031e9 FIX Delete of website page need permission. Conflict with mass action.
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
2020-06-03 01:02:19 +02:00
Laurent Destailleur
71cb17b58b css 2020-06-02 20:58:56 +02:00
Laurent Destailleur
9e6bb6f784 Sanitize params 2020-06-02 20:19:45 +02:00
kamel
5bae9db0a8 FIX: Fix detect distached product and set to received completely when the supplier order have services (support STOCK_SUPPORTS_SERVICES) 2020-06-02 17:29:55 +02:00
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Laurent Destailleur
054d5c5f4c css 2020-06-02 17:00:08 +02:00
Laurent Destailleur
a9973ad60e Fix language key and css 2020-06-02 15:30:07 +02:00
Laurent Destailleur
9651b5a7c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-02 13:31:33 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
2020-06-02 13:31:22 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php 2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php 2020-06-02 12:12:07 +02:00
Laurent Destailleur
c6a53d9b3d
Update pdf_blochet.class.php 2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0 Fix line heiht overflow for blochet template
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
2020-06-02 11:17:37 +02:00
atm-lena
ae9c490134 Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_NEW_AddHook_SelectWarehouses 2020-06-02 09:55:56 +02:00
atm-lena
99b4bfc91e Movement of hook "selectwarehouse" 2020-06-02 09:53:30 +02:00
Laurent Destailleur
6ddabd51c0 Update commonobject.class.php 2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf fix:le résultat de explode est troujours un array 2020-06-01 21:02:45 +02:00
bahfir abbes
cb551cfd5a fix:non editable fields must not be editable in creation either 2020-06-01 20:58:20 +02:00
Laurent Destailleur
0f5eed60a2 Update commonobject.class.php 2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752 fix:bad database quotation for booleans 2020-06-01 20:40:51 +02:00
Laurent Destailleur
69c3b4b4ea
Merge pull request #14015 from ptibogxiv/patch-342
FIX php error
2020-06-01 20:17:22 +02:00
Laurent Destailleur
5141fe0a74
Merge pull request #14017 from andreubisquerra/12.0
Fix QR and add QR customer menu
2020-06-01 20:07:21 +02:00
andreubisquerra
b0f904508a
Fix travis 2020-06-01 17:52:38 +02:00
Florian Mortgat
3213148d87 FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message 2020-06-01 17:12:02 +02:00
andreubisquerra
8abe60db0b
Add Restaurant QR menu 2020-06-01 17:05:22 +02:00
andreubisquerra
3cc249a887
Update QR 2020-06-01 17:04:23 +02:00
andreubisquerra
5325971517
Update settings 2020-06-01 17:02:11 +02:00
andreubisquerra
c60982ce60
Update langs 2020-06-01 16:58:05 +02:00
Laurent Destailleur
2324834b73 Debug modulebuilder for doc generation
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
38001a4e89 Fix perms 2020-06-01 16:46:11 +02:00
Laurent Destailleur
c4d8f0b6cc css 2020-06-01 12:35:27 +02:00
florian HENRY
c655720b78 fix travis 2020-06-01 10:51:50 +02:00
florian HENRY
2337d75d92 better fix for #13968 2020-06-01 10:43:57 +02:00
florian HENRY
face2d644e Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-01 10:05:07 +02:00
Laurent Destailleur
dbac97a908 Fix several troubles into numbering modules.
Prefix for takepos moved from TK to TC (TK was already used for tasks)
2020-06-01 04:02:47 +02:00
Laurent Destailleur
5a8c4ad3f5 Debug modulebuilder 2020-06-01 00:01:23 +02:00
Laurent Destailleur
e83b754e6f Debug modulebuilder 2020-05-31 23:32:36 +02:00
Laurent Destailleur
28df07225d Debug modulebuilder 2020-05-31 23:23:56 +02:00
Laurent Destailleur
3349144f5e Fix lose enabled and default when editing field signatures in
modulebuilder
2020-05-31 23:23:42 +02:00
Laurent Destailleur
67f007ea40 Fix length of field. Make some module die. 2020-05-31 23:12:26 +02:00
Laurent Destailleur
c04903d15c Fix debug modulebuilder for doc and ref generation
Conflicts:
	htdocs/core/class/commonobject.class.php
2020-05-31 23:01:13 +02:00
ptibogxiv
a33f503a0d
FIX php error
Fatal error: Uncaught Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Call Stack: 0.0001 409544 1. {main}() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:0 0.1935 3017200 2. Form->select_produits() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:215 0.1935 3017200 3. Form->select_produits_list() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2134 0.1983 3439880 4. Form->constructProductListOption() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2451
2020-05-31 14:28:41 +02:00
Laurent Destailleur
6123596ec9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/fichinter/list.php
2020-05-31 00:28:40 +02:00
Laurent Destailleur
2b317120d3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-05-31 00:25:33 +02:00
Laurent Destailleur
8b03a5e225 Fix phpcs 2020-05-31 00:22:17 +02:00
Laurent Destailleur
94e02269ee Fix: missing fk_project 2020-05-31 00:20:01 +02:00
Laurent Destailleur
ddebe1bbba FIX Missing ref into popup 2020-05-30 23:52:47 +02:00
Laurent Destailleur
e8016a5e7e Fix credit-transfer vs direct debit 2020-05-30 23:46:14 +02:00
Laurent Destailleur
52af430ae2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-30 14:20:16 +02:00
Laurent Destailleur
e223189507 FIX #14002 2020-05-30 14:20:04 +02:00
Laurent Destailleur
dfb5f02f4b Fix token renewal 2020-05-30 02:40:05 +02:00
Laurent Destailleur
b61b8ee1fb Fix token renewal 2020-05-30 02:27:10 +02:00
Laurent Destailleur
8146e4fdbd Fix tooltip 2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +02:00
Laurent Destailleur
f9ac4c2ada Fix template 2020-05-30 01:25:51 +02:00
Laurent Destailleur
a69be00d37 Fix template 2020-05-30 01:23:47 +02:00
Laurent Destailleur
48596122e4 Fix template 2020-05-30 01:17:23 +02:00
Laurent Destailleur
c4bbf12e72 Fix css 2020-05-30 00:58:11 +02:00
Laurent Destailleur
e2656ff2f8 Update template 2020-05-30 00:49:11 +02:00
Laurent Destailleur
0fd3292715 Fix show error message 2020-05-30 00:35:11 +02:00
Laurent Destailleur
926a9f68c4 Trans 2020-05-30 00:23:14 +02:00
Laurent Destailleur
455ba002b4 css 2020-05-29 22:13:10 +02:00
Laurent Destailleur
7fc6917cfd Debug feature of alternate languages 2020-05-29 22:01:02 +02:00
Laurent Destailleur
540a64bbba Fix templates 2020-05-29 21:48:33 +02:00
Laurent Destailleur
264fd709e4 Fix template 2020-05-29 21:48:27 +02:00
Laurent Destailleur
30aa50684f Trans 2020-05-29 21:47:59 +02:00
kamel
1e208e537f FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note 2020-05-29 16:24:07 +02:00
Laurent Destailleur
91f5f8053a Fix label 2020-05-29 13:46:27 +02:00
Laurent Destailleur
f38118790e Trans 2020-05-29 12:18:47 +02:00
Laurent Destailleur
b9051bbe22 Fix admin report 2020-05-29 09:50:38 +02:00
Laurent Destailleur
b11ef125c3 FIX Force of HTML content only for ckeditor
Conflicts:
	htdocs/modulebuilder/index.php
2020-05-29 03:27:30 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
60dfcdba00 Fix var type 2020-05-28 21:29:30 +02:00
Laurent Destailleur
46a362b7d8 doxygen 2020-05-28 21:25:47 +02:00
Laurent Destailleur
c1b4f7ec28 Fix phpcs 2020-05-28 21:24:46 +02:00
Laurent Destailleur
2e0cf05e55 phpcs 2020-05-28 21:20:30 +02:00
Laurent Destailleur
3606ed2bda Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Laurent Destailleur
5cec3eb052 Prepare 12.0 2020-05-28 20:12:49 +02:00
Laurent Destailleur
6cbb87f224 FIX #13995 #13994 manually. 2020-05-28 20:12:06 +02:00
Laurent Destailleur
56d3a5ecf2 Fix look and feel v12 2020-05-28 19:43:12 +02:00
Laurent Destailleur
113144ea21
Merge pull request #13993 from glu000/11.0-fix-13991
Fix #13991
2020-05-28 18:27:39 +02:00
Supermanu
fd868b9d67 Fix compatibility with delete perm in massactions 2020-05-28 17:57:00 +02:00
Laurent Destailleur
3883d73f20
Merge pull request #13970 from atm-quentin/FIX_missing_menu_accountancy_report
FIX missing accountancy report menu for simple accountancy conf
2020-05-28 17:51:06 +02:00
Laurent Destailleur
873b378852 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-28 17:50:27 +02:00
Laurent Destailleur
3ae61fcd73
Merge pull request #13981 from atm-florianm/11.0_FIX_pgsql_error_in_adherents_module
11.0 FIX postgreSQL error on landing page when "members" module is on
2020-05-28 17:50:08 +02:00
Laurent Destailleur
9d7a4cae00 Fix default value 2020-05-28 17:49:56 +02:00
Laurent Destailleur
f7e57da9f9
Merge pull request #13974 from andreubisquerra/12.0
Update to Auto Order last version in Dolibarr 12
2020-05-28 17:40:30 +02:00
Laurent Destailleur
8360ca4b20
Update pdf_crabe.modules.php 2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae
Update pdf_crabe.modules.php 2020-05-28 17:37:53 +02:00
stickler-ci
56259bae9a Fixing style errors. 2020-05-28 14:18:00 +00:00
glu000
9915d97adf Fix #13991 2020-05-28 16:11:02 +02:00
atm-lena
edc6abcea8 FIX Rounding Total TVA in "crabe" model pdf 2020-05-28 15:19:37 +02:00
Laurent Destailleur
537b291fab Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/bons.php
2020-05-28 12:24:55 +02:00
Laurent Destailleur
88475025af Trans 2020-05-28 12:04:52 +02:00
Laurent Destailleur
2afcfa8463 Fix missing stat on products 2020-05-28 12:01:19 +02:00
Laurent Destailleur
1838cf92ef Look and feel v12 2020-05-28 11:51:49 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
622b5c4ac9 Doxygen 2020-05-27 23:37:22 +02:00
Laurent Destailleur
57c503091f Doxygen 2020-05-27 23:35:17 +02:00
Laurent Destailleur
57a753c303 Doxygen 2020-05-27 23:33:23 +02:00
Laurent Destailleur
029596bc40 Fix error assignement 2020-05-27 23:32:24 +02:00
Laurent Destailleur
2bababb73e Fix doc 2020-05-27 23:30:52 +02:00
Laurent Destailleur
6881610892 Doxygen 2020-05-27 23:23:01 +02:00
Laurent Destailleur
689289acd0 Doc 2020-05-27 23:20:26 +02:00
Laurent Destailleur
fbaf705c2a Look and feel v12 2020-05-27 22:50:38 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Florian Mortgat
d491f2cf54 [pgsql] type of llx_adherent_type.subscription is VARCHAR(3) so quotes are mandatory 2020-05-27 18:27:10 +02:00
Laurent Destailleur
ada9c9addc Fix count of records 2020-05-27 15:37:30 +02:00
Laurent Destailleur
2f1e653f2f Fix css 2020-05-27 15:29:09 +02:00
Laurent Destailleur
ceda05a879 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-27 14:39:38 +02:00
Laurent Destailleur
e2680fa29a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/html.form.class.php
2020-05-27 14:39:19 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Florian Mortgat
954c29786e FIX 10.0 - pagination in prelevement/bons.php 2020-05-27 12:15:42 +02:00
Laurent Destailleur
0b48ffe3cd Removed not used var $useglobalvars 2020-05-27 11:38:28 +02:00
andreubisquerra
3b884c4051
Fix travis 2020-05-27 07:03:57 +02:00
andreubisquerra
8891595993
Fix travis 2020-05-27 06:57:12 +02:00
andreubisquerra
896e3166b7
Update phone.css 2020-05-27 06:49:37 +02:00
andreubisquerra
7d323f4379
Update index.php 2020-05-27 06:48:40 +02:00
andreubisquerra
abf7fce108
Update auto_order.php 2020-05-27 06:44:00 +02:00
Laurent Destailleur
479e8ceceb Look and feel v12 2020-05-27 03:19:37 +02:00
Laurent Destailleur
3f4ae8875f Fix bad tooltip 2020-05-27 02:45:09 +02:00
Laurent Destailleur
d3e21c82f2 CSS 2020-05-27 02:38:54 +02:00
Laurent Destailleur
c0ce584487 Look and feel v12 2020-05-27 00:26:04 +02:00
Laurent Destailleur
9aeb79e80c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b FIX Default bank account was not loaded for document generation. 2020-05-26 23:22:14 +02:00
andreubisquerra
7e792928e0
Update invoice.php for Auto Order 2020-05-26 23:03:47 +02:00
andreubisquerra
56708e8c35
Update phone.php for Auto Order 2020-05-26 22:52:55 +02:00
Laurent Destailleur
44273e0570 Fix duplicate code 2020-05-26 22:31:27 +02:00
Laurent Destailleur
91ecd3455f Fix CSS 2020-05-26 22:30:11 +02:00
florian HENRY
ceb0a5b0b5 space 2020-05-26 21:32:18 +02:00
florian HENRY
e5edc06f3d spelling 2020-05-26 21:29:47 +02:00
florian HENRY
7ada0de654 FIX : #13968 2020-05-26 21:27:46 +02:00
Laurent Destailleur
7ceb236a09 Fix look and field v12 2020-05-26 14:45:45 +02:00
atm-quentin
1c45866409 FIX missing accountancy report menu for simple accountancy conf 2020-05-26 10:33:07 +02:00
laurantines
416d1d0301 Update list.php
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
2020-05-25 22:53:03 +02:00
Laurent Destailleur
2fe8e03ed6 Fix missing quote 2020-05-25 22:23:22 +02:00
Laurent Destailleur
ba047428e2 Fix duplicate \n 2020-05-25 22:21:36 +02:00
Laurent Destailleur
19bcdb6418 Fix structured data 2020-05-25 22:19:28 +02:00
Laurent Destailleur
02b9ce5901 Fix length of title 2020-05-25 18:16:36 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Laurent Destailleur
25d1a2a1d8 Restore missing png file 2020-05-25 13:36:56 +02:00
Laurent Destailleur
160ac14eb3 Update logo 2020-05-25 13:32:57 +02:00
Laurent Destailleur
0409ec00d7 CSS 2020-05-25 13:01:32 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
0dbb8224fb Fix logo 2020-05-25 12:50:54 +02:00
Laurent Destailleur
384e1e31ad Fix Popup 2020-05-25 11:30:57 +02:00
Laurent Destailleur
c67eeeaf6c CSS 2020-05-25 11:30:52 +02:00
Laurent Destailleur
2595f571c7 Fix exclude credit note when searching situation invoice to use for next 2020-05-25 00:21:09 +02:00
Laurent Destailleur
0041bca82f Fix ambiguous param 2020-05-24 23:49:33 +02:00
Laurent Destailleur
6158e41822 CSS 2020-05-24 23:44:04 +02:00
Laurent Destailleur
aee6fce9f8 Fix remove bad use 2020-05-24 20:04:26 +02:00
Laurent Destailleur
65708ec360 Fix responsive 2020-05-24 15:07:57 +02:00
Laurent Destailleur
509ce9f571 CSS 2020-05-24 01:09:45 +02:00
Laurent Destailleur
4cb0ffeb1f Fix css 2020-05-24 01:04:56 +02:00
Laurent Destailleur
ef17ed2f87 Look and feel v12 2020-05-24 00:01:52 +02:00
Laurent Destailleur
2b963479a8 Sync transifex 2020-05-23 23:50:00 +02:00
Laurent Destailleur
c843da5272 Sync transifex 2020-05-23 22:29:45 +02:00
Laurent Destailleur
024e62a582 Fix navigation 2020-05-23 20:27:25 +02:00
Laurent Destailleur
7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
2020-05-23 20:20:53 +02:00
Laurent Destailleur
fe6453194e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-23 20:18:17 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
2020-05-23 20:18:10 +02:00
Laurent Destailleur
97a4c32870 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-23 20:09:41 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
Laurent Destailleur
b10976562f
Merge pull request #13958 from fappels/12_ref_int_deprication
Fix ref_int deprecation.
2020-05-23 19:12:21 +02:00
Laurent Destailleur
64f72daa7e Fix hreflang if canonical page 2020-05-23 17:01:22 +02:00
Francis Appels
efa4ffa326 Fix ref_int deprecation.
Add to changelog and allow to use ref_ext for shipments.
2020-05-23 16:46:42 +02:00
Laurent Destailleur
7c92bb218e Fix no hreflang if not a canonical page 2020-05-23 15:33:04 +02:00
Laurent Destailleur
4004aeb257
Merge pull request #13915 from atm-quentin/Fix_missing_getnomurl_warehouse_hook
FIX missing GetNomURL Hook in warehouse class
2020-05-23 14:57:28 +02:00
Laurent Destailleur
5f3a82423f Fix regression in look and feel v12 2020-05-23 14:38:37 +02:00
Laurent Destailleur
b4223dbdec
Merge branch '12.0' into fix_board_expensereport_toapprove 2020-05-23 14:32:12 +02:00
Laurent Destailleur
b7fbda8d08
Merge pull request #13924 from atm-lena/11.0_AddHook_Massstockmove
Add Hook "Massstockmove"
2020-05-23 14:25:12 +02:00
Laurent Destailleur
1e6cc80438
Merge pull request #13923 from atm-gauthier/11.0_rename_bank_releve
FIX : We must only rename current bank receipt
2020-05-23 14:24:51 +02:00
Laurent Destailleur
e29d2588cf
Merge pull request #13931 from altatof/fixdispatch
FIX missing rollbacks on trigger bad return
2020-05-23 14:24:15 +02:00
Tobias Sekan
babcdfc99a Fix not working default value (re...) 2020-05-23 14:22:40 +02:00
Tobias Sekan
58e32aa2ff Fix not wokring default values for date (re...) 2020-05-23 14:22:30 +02:00
Frédéric FRANCE
8b4dcbaa64 Update datapolicycron.class.php 2020-05-23 14:19:28 +02:00
Frédéric FRANCE
3a93dcf2c4 Update paymentloan.class.php
same picto in loan
2020-05-23 14:18:47 +02:00
Laurent Destailleur
1979647650
Merge pull request #13954 from fappels/12_fix_batch
Fix migration, missing batch update to varchar(128)
2020-05-23 13:54:12 +02:00
Laurent Destailleur
3a15688f17 FIX #13951 2020-05-23 13:53:47 +02:00
Laurent Destailleur
83ecbef9bc FIX #13911 #13940 2020-05-23 13:46:37 +02:00
Laurent Destailleur
493becde8b Update list.php 2020-05-23 13:39:06 +02:00
Laurent Destailleur
15de6194c4 Update list.php 2020-05-23 13:38:59 +02:00
gael.langlais
af5de05a31 Change some curly braces #13929 2020-05-23 13:38:50 +02:00
Laurent Destailleur
755c47f900 Fix save of wrapper missing 2020-05-23 13:10:33 +02:00
Laurent Destailleur
aff2872fc1 Fix RSS 2020-05-23 12:57:58 +02:00
Laurent Destailleur
50d063256e NEW Povide a RSS Feed for blogposts 2020-05-23 12:54:06 +02:00
Laurent Destailleur
e947ddba10 Fix RSS feed 2020-05-23 12:51:44 +02:00
Laurent Destailleur
f2c02f5559 FIX Language for RSS 2020-05-23 12:41:06 +02:00
Francis Appels
875230ed13 Fix missing batch update to varchar(128) 2020-05-23 10:23:26 +02:00
Laurent Destailleur
c460cff01c Fix calculation and add tooltip to understand it. 2020-05-23 01:17:01 +02:00
Laurent Destailleur
43103f40a5 Fix make page of categories of web site working 2020-05-22 00:55:34 +02:00
Maxime Kohlhaas
6b1eef9827 Fix board exepense report to approve 2020-05-22 00:50:13 +02:00
Maxime Kohlhaas
fb0f31c142 Fix board filters for expense report and holiday 2020-05-22 00:33:30 +02:00
Maxime Kohlhaas
6434f255c3 Fix load_state_board doesn't take parameters 2020-05-22 00:32:55 +02:00
Maxime Kohlhaas
f89195e39f Fix SQL IF for PGSQL 2020-05-21 23:23:59 +02:00
Laurent Destailleur
76823d3e39 Clean CSS, clean code 2020-05-21 20:59:02 +02:00
Laurent Destailleur
9e295d44f0 Code comment 2020-05-21 17:14:42 +02:00
Laurent Destailleur
86de0d5e14 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/projet/class/project.class.php
2020-05-20 23:58:32 +02:00
Laurent Destailleur
9e3e8df60f Fix phpcs 2020-05-20 23:56:06 +02:00
Laurent Destailleur
a78bc86465 Trans 2020-05-20 23:51:46 +02:00
Laurent Destailleur
036617570e Doc 2020-05-20 23:46:48 +02:00
Laurent Destailleur
662970f232 Clean sql file 2020-05-20 23:42:28 +02:00
Laurent Destailleur
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
Laurent Destailleur
de11fb2783 Fix phpcs 2020-05-20 23:32:13 +02:00
Laurent Destailleur
7d6cf4c01a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/projet/class/project.class.php
2020-05-20 23:27:45 +02:00
Laurent Destailleur
650bddde0d Fix phpcs 2020-05-20 23:25:10 +02:00
Laurent Destailleur
e42fb1b57d Fix trigger name 2020-05-20 23:15:56 +02:00
Laurent Destailleur
c4d1db263c Fix end of workflow of MO 2020-05-20 23:15:18 +02:00
Laurent Destailleur
d66f54d06d Clean home page 2020-05-20 22:45:43 +02:00
Laurent Destailleur
cce72ad8d6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/bills.lang
	htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
altairis
55def0248c fix missing rollbacks 2020-05-20 14:37:35 +02:00
Laurent Destailleur
00f189c921 Introduce button to allow migration of files from old version at once 2020-05-20 13:19:32 +02:00
Laurent Destailleur
66df82f9e0 Better management of absolute url for canonical link tag 2020-05-20 12:38:38 +02:00
Laurent Destailleur
51ed77fbf7 Fix 2020-05-20 09:59:01 +02:00
Laurent Destailleur
c5e341883d Fix popup of supplier invoice 2020-05-19 23:22:40 +02:00
Laurent Destailleur
18ec65b4af Fix: action on an ID must not include test on entity. 2020-05-19 22:06:17 +02:00
Laurent Destailleur
2ba9d7f288 Fix translation 2020-05-19 21:38:42 +02:00
Laurent Destailleur
00d7947ee8 Fix link replaced twice 2020-05-19 19:55:28 +02:00
atm-lena
bf9756b8c4 Add Hook "Massstockmove" 2020-05-19 16:05:13 +02:00
atm-lena
e042807b32 Add $this to parameters 2020-05-19 15:58:16 +02:00
gauthier
f3582d891a FIX : We must only rename current bank receipt 2020-05-19 15:35:37 +02:00
atm-lena
3f28c9a461 Add parameters to hook 2020-05-19 15:31:37 +02:00
atm-lena
987fb806c6 Exclude array param 2020-05-19 15:24:53 +02:00
atm-lena
f518bafda9 11.0 - Add Hook "SelectWarehouses" 2020-05-19 15:17:06 +02:00
atm-quentin
e39774a508 add more hook param 2020-05-19 10:05:26 +02:00
atm-quentin
f073b7023a FIX missing GetNomURL Hook in warehouse class 2020-05-19 09:52:33 +02:00
Laurent Destailleur
2d0abebca3 CSS 2020-05-19 04:40:08 +02:00
Laurent Destailleur
b3a17c8da4 Look and feel v12 2020-05-19 04:21:38 +02:00
Laurent Destailleur
3e187f8ce0 Fix add check on size limit 2020-05-19 03:36:29 +02:00
Laurent Destailleur
d35a24ee76 Removed not expected file 2020-05-19 01:36:33 +02:00
Laurent Destailleur
7b29ce036a Fix input of virtual host and canonical url 2020-05-19 00:50:30 +02:00
Laurent Destailleur
76663ae3e8 Fix canonical tag 2020-05-18 22:40:32 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
2020-05-18 15:57:01 +02:00
Laurent Destailleur
82a8c42441 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-18 15:54:47 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
2020-05-18 15:54:39 +02:00
Laurent Destailleur
6d62e92e12 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-18 15:50:42 +02:00
Laurent Destailleur
45345440a4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
2020-05-18 15:50:36 +02:00
Laurent Destailleur
756c1fd73d Fix tooltip message 2020-05-18 15:26:04 +02:00
Laurent Destailleur
3d385dd378
Merge pull request #13903 from atm-maxime/fix_actioncomm_fetch_entity
Fix : entity was missing in actioncomm fetch
2020-05-18 14:59:10 +02:00
Laurent Destailleur
d3ac33ce20 Fix json-ld file 2020-05-18 14:53:35 +02:00
ptibogxiv
a9d1519f96
FIX php error if multicompany disabled 2020-05-18 14:52:33 +02:00
Laurent Destailleur
729cc4fd6f Fix do not show full path 2020-05-18 13:26:33 +02:00
Maxime Kohlhaas
3d9d5d0ad5 Fix : entity was missing in expedition fetch 2020-05-18 11:03:32 +02:00
Maxime Kohlhaas
baa502a224 Fix third merge issue with contact roles 2020-05-18 10:54:25 +02:00
Maxime Kohlhaas
cf96383bf9 Fix : entity was missing in actioncomm fetch 2020-05-18 10:44:55 +02:00
Laurent Destailleur
02d4ecb21c Fix url for youtube 2020-05-17 20:08:01 +02:00
Laurent Destailleur
9370f71d01 Fix hardcoded value 2020-05-17 20:03:56 +02:00
Laurent Destailleur
8a6ae84fb0 Fix getStructuredData for organization 2020-05-17 20:02:01 +02:00
Laurent Destailleur
6be60efaba Fix bad link in json-ld 2020-05-17 19:09:22 +02:00
Laurent Destailleur
608d3ce32f Responsive 2020-05-17 16:10:29 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
783b71a9da Fix language set 2020-05-16 16:27:23 +02:00
Laurent Destailleur
ce0d00a0ae CSS 2020-05-16 15:50:46 +02:00
Laurent Destailleur
bd4251237b css 2020-05-16 15:16:40 +02:00
Laurent Destailleur
c85233e779 Fix CSS 2020-05-16 15:12:28 +02:00
Laurent Destailleur
0781e9e227 CSS 2020-05-16 14:47:12 +02:00
Laurent Destailleur
75ac377352 Fix tar command 2020-05-16 04:26:43 +02:00
Laurent Destailleur
24f4a0be1f exclude other log files 2020-05-16 04:24:23 +02:00
Laurent Destailleur
791c4b48b6 Fix 2020-05-15 20:08:35 +02:00
Laurent Destailleur
ff84fd8118 Fix default language of user. Must separate weblangs and pagelangs. 2020-05-15 19:01:12 +02:00
Laurent Destailleur
a73eccf70d FIX env of browser not loaded in website 2020-05-15 18:41:46 +02:00
Laurent Destailleur
762ca96203 FIX #13841 2020-05-15 18:28:15 +02:00
Laurent Destailleur
4a9960797b responsive 2020-05-15 17:27:12 +02:00
Laurent Destailleur
9fb1766266 CSS 2020-05-15 17:14:28 +02:00
Laurent Destailleur
bfbe0037b6 Fix responsive 2020-05-15 16:29:18 +02:00
Laurent Destailleur
c43813ccbb Fix responsive of edition of thirdparties 2020-05-15 16:23:24 +02:00
Laurent Destailleur
5fe9c45fb2 Fix look and feel v12 2020-05-15 16:07:39 +02:00
Laurent Destailleur
86ff60f161 Fix break line and set of opportunity fields 2020-05-15 15:50:50 +02:00
Laurent Destailleur
38059ab861 Fix trans 2020-05-15 15:17:37 +02:00
Laurent Destailleur
99db3a2991 Fix field for opportunities must be visible only if we use opportinities 2020-05-15 15:15:07 +02:00
Laurent Destailleur
895833effc FIX #13864 2020-05-15 15:00:58 +02:00
Laurent Destailleur
b150edd6d0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/societe/checkvat/checkVatPopup.php
2020-05-15 14:10:53 +02:00
Laurent Destailleur
ddf3f8b244 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-15 14:09:36 +02:00
Laurent Destailleur
d430b2896e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-15 14:09:26 +02:00
Laurent Destailleur
987d3cf52e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-15 14:04:58 +02:00
Langlais115
dc6ae70aa6 Fix #13805
Add proper type check to "seuil_stock_alerte" parameter.
2020-05-15 14:00:26 +02:00
Laurent Destailleur
672ea60ffd FIX #13896 2020-05-15 13:58:34 +02:00
Laurent Destailleur
02b40ae8f6 Fix scrutinizer 2020-05-15 13:54:05 +02:00
Laurent Destailleur
91f87d6834 Fix bad param of getNomUrl 2020-05-15 13:52:35 +02:00
Laurent Destailleur
949ef8d7d8 Fix css 2020-05-15 12:49:22 +02:00
Laurent Destailleur
8a2741650a Fix css 2020-05-15 12:46:55 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
bfca151d85 Responsive 2020-05-15 11:58:50 +02:00
stickler-ci
e691045c3d Fixing style errors. 2020-05-14 23:20:39 +00:00
ptibogxiv
cb98ec4d23
Fix datapolicycron 2020-05-15 01:18:53 +02:00
Alexandre SPANGARO
3811586cd0 FIX Site ec.europa.eu has moved to https:// 2020-05-14 20:34:48 +02:00
Laurent Destailleur
0842259012 Fix lang must be set to null and not 0 when not defined 2020-05-14 18:56:07 +02:00
Laurent Destailleur
4cf7f68b6c Fix search on pages 2020-05-14 18:44:05 +02:00
Laurent Destailleur
7daef0d146 Fix bad parameters of function 2020-05-14 18:17:08 +02:00
Laurent Destailleur
949e0f2326 Fix filter on language 2020-05-14 17:27:12 +02:00
Laurent Destailleur
499c2ea30a FIX #13855 2020-05-14 16:52:21 +02:00
Laurent Destailleur
c1fb712c86 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:53 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
92b245ae93 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-05-14 16:34:24 +02:00
Laurent Destailleur
2b8da85eea Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-14 16:20:15 +02:00
Laurent Destailleur
49cfc1afd8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/install/upgrade2.php
2020-05-14 16:20:04 +02:00
Laurent Destailleur
61f1a57e2f
Merge pull request #13850 from andreubisquerra/master
TakePOS Auto Order improvements
2020-05-14 16:18:28 +02:00
Laurent Destailleur
bc581ead3b
Merge branch 'develop' into master 2020-05-14 16:17:37 +02:00
Laurent Destailleur
f5b9151f17
Merge pull request #13871 from FHenry/11.0
fix template email on propal list
2020-05-14 16:10:33 +02:00
Laurent Destailleur
136d002639
Merge pull request #13872 from simnandez/11.0
FIX: Do not show stats panel if the user does not have permissions
2020-05-14 16:09:37 +02:00
Laurent Destailleur
14fce7fe55 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:03:42 +02:00
Laurent Destailleur
3d26351c6b Fix function if hours. 2020-05-14 16:03:31 +02:00
Laurent Destailleur
2c1e1f43dc
Merge pull request #13879 from frederic34/patch-4
Update dolistore.class.php
2020-05-14 16:00:36 +02:00
Laurent Destailleur
aae1b9f7fe
Merge pull request #13873 from ptibogxiv/patch-337
Fix mailing entity
2020-05-14 16:00:04 +02:00
Laurent Destailleur
30c167c6f4
Merge pull request #13885 from atm-maxime/fix_top_menu_search
Fix top menu search method must be GET
2020-05-14 15:58:32 +02:00
Laurent Destailleur
cf039b26f9
Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7
FIX 9.0 - fatal during migration from 3.1 using PHP 7
2020-05-14 15:49:08 +02:00
Laurent Destailleur
01525e1d3b
Merge pull request #13884 from indelog/impraccountfile
Fix and imporve some points for compta/accounting-flles.php
2020-05-14 15:48:30 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
68512e0281 Look and feel v12 2020-05-14 14:56:15 +02:00
Laurent Destailleur
9a8e9bdc99 Position of fields 2020-05-14 14:30:43 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape <
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
a796122f7b Fix to solve feedbacks of
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 14:30:32 +02:00
Laurent Destailleur
0b3e917155 CSS 2020-05-14 14:30:26 +02:00
Laurent Destailleur
4a04cecbaa CSS 2020-05-14 14:30:22 +02:00
Laurent Destailleur
72c6aa81bb Trans 2020-05-14 14:30:15 +02:00
Laurent Destailleur
4a65b629ee Position of fields 2020-05-14 14:29:14 +02:00
Laurent Destailleur
bcaa83eeec FIX dol_concatdesc to escape <
Better help
2020-05-14 14:10:04 +02:00
Laurent Destailleur
1bd00b0e8c Fix to solve feedbacks of
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 12:28:17 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
DEMAREST Maxime (Indelog)
ac0b735131 Fix use date_ech for social contributions in accounting-file.php 2020-05-13 18:01:00 +02:00
DEMAREST Maxime (Indelog)
ee6e717f46 Add payment loan in accounting-files.php 2020-05-13 17:47:30 +02:00
DEMAREST Maxime (Indelog)
872518a91f Add total by credit/debit for accounting-file.php 2020-05-13 16:54:53 +02:00
DEMAREST Maxime (Indelog)
5f400d27b4 Add preview file in compta/accounting-files.php 2020-05-13 15:01:32 +02:00
Laurent Destailleur
3b87b7c359 CSS 2020-05-13 13:29:50 +02:00
Laurent Destailleur
8e6efba0be CSS 2020-05-13 12:49:53 +02:00
Laurent Destailleur
9785e0b852 Trans 2020-05-13 12:30:59 +02:00
Florian Mortgat
bd3504c473 FIX 9.0 - delete unused mandatory argument from migrate_clean_association: argument count mismatch causes a fatal error since php7 2020-05-13 10:26:44 +02:00
DEMAREST Maxime (Indelog)
fcb3b112d9 Fix use datep field for various payment in accouting-files.php 2020-05-13 09:31:14 +02:00
Maxime Kohlhaas
48183b396a Fix top menu search method must be GET 2020-05-13 08:54:42 +02:00
stickler-ci
b7ae5ffa1d Fixing style errors. 2020-05-13 06:12:45 +00:00
DEMAREST Maxime (Indelog)
0850570e95 Fix and imporve some points for compta/accounting-flles.php
* Fix zip generation for accouning-files if line has no document.
  The zip file generated if $filesarray contain a line with empty 'files'
  was unsustainable because it try to add empty files.

* Add clickable link to jump on card for other line than Invoice and
  Supplier Invoice

* Add various payment

* Use label as ref for paiements of salaries line to display more explicit line
2020-05-13 08:00:06 +02:00
Laurent Destailleur
ebbd4413f5 Fix scrutinizer error 2020-05-13 00:47:27 +02:00
Laurent Destailleur
f0d14662b9 Fix scrutinizer 2020-05-13 00:38:12 +02:00
Laurent Destailleur
b5f3be4599 Clean phpcs rule file 2020-05-13 00:29:46 +02:00
Laurent Destailleur
63d6b3c47d Look and feel v12 2020-05-12 23:44:50 +02:00
Laurent Destailleur
410694100d CSS 2020-05-12 23:42:01 +02:00
Frédéric FRANCE
366ae2f116
Update dolistore.class.php 2020-05-12 18:44:26 +02:00
gauthier
fc2f2c6da7 FIX : wrong url param 2020-05-12 17:41:21 +02:00
andreubisquerra
8bd1179b82
Update qr.php 2020-05-12 17:03:24 +02:00
Laurent Destailleur
734a8ba312 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 15:27:00 +02:00
Laurent Destailleur
0544434482 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:26:11 +02:00
Laurent Destailleur
b6afd86354 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-12 15:24:15 +02:00
Laurent Destailleur
a6708009d7 Add option PROJECT_OPEN_ALWAYS_ON_TAB 2020-05-12 14:53:03 +02:00
Laurent Destailleur
e9c405182d css 2020-05-12 14:18:31 +02:00
Laurent Destailleur
c89e8efec3 responsive 2020-05-12 14:08:28 +02:00
ptibogxiv
e1db0ef855
Update index.php 2020-05-12 10:57:51 +02:00
Juanjo Menent
66beb7c14f FIX: Do not show stats panel if the user does not have permissions 2020-05-12 10:17:47 +02:00
florian HENRY
33b663091e Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-05-12 08:38:13 +02:00
florian HENRY
d9e26b8569 fix template email on prpal list 2020-05-12 08:38:03 +02:00
Laurent Destailleur
e4611f2950 Fix filter on categories 2020-05-12 03:36:33 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search
NEW Add invoice stat graph and categ search
2020-05-12 03:31:09 +02:00
Laurent Destailleur
45caa02929
Merge pull request #13854 from bb2a/user-hide-inactive-in-config-module-users
NEW Add option to hide all inactive users into combo list of users.
2020-05-12 03:18:21 +02:00
Laurent Destailleur
3c8452aa31
Update admin.lang 2020-05-12 03:17:55 +02:00
Laurent Destailleur
6706d28eb7
Update admin.lang 2020-05-12 03:15:19 +02:00
Laurent Destailleur
2bf91c0f37
Merge pull request #13857 from bb2a/Link-phone-warehouse
Links phone on warehouse liste
2020-05-12 03:09:16 +02:00
Laurent Destailleur
92d137cde9
Update list.php 2020-05-12 03:09:04 +02:00
Laurent Destailleur
f6ac2d2545
Merge pull request #13866 from Tim-Otte/fix-11948
FIX #11948
2020-05-12 03:07:53 +02:00
Laurent Destailleur
a099858385
Update product.class.php 2020-05-12 03:07:23 +02:00
Laurent Destailleur
d459f9902c
Update card.php 2020-05-12 03:06:30 +02:00
Laurent Destailleur
632ca40b1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 03:04:59 +02:00
Laurent Destailleur
75cd7d7e72 Code comment 2020-05-12 03:04:48 +02:00
Laurent Destailleur
e5fa5be0e5
Merge pull request #13861 from aspangaro/12.0_a26
NEW Bookkeeping by account - Look & feel v12
2020-05-12 03:02:32 +02:00
Laurent Destailleur
7be47097e9
Merge pull request #13867 from frederic34/patch-4
Only add empty select if no multiselect
2020-05-12 03:00:10 +02:00
Frédéric FRANCE
4d50ba5e37
Fix dolistore search with csrf active 2020-05-11 20:42:47 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Laurent Destailleur
c4a7923b51 CSS 2020-05-11 19:02:52 +02:00
Laurent Destailleur
44d36815bd Look and feel v12 2020-05-11 19:00:27 +02:00
Frédéric FRANCE
3a46d5a3dd
Update agenda_other.php 2020-05-11 18:46:54 +02:00
Frédéric FRANCE
097de7b3cd
Only add empty select if no multiselect 2020-05-11 18:34:54 +02:00
atm-greg
64d2f906bc fix visibility of extrafields in public interface 2020-05-11 16:35:58 +02:00
Tim Otte
65011c2877 Fixed the product unit translation 2020-05-11 15:11:23 +02:00
Laurent Destailleur
a2bc46f1c0 CSS 2020-05-11 12:50:24 +02:00
Laurent Destailleur
a8dcd2d09b Clean code 2020-05-11 11:53:13 +02:00
Laurent Destailleur
02ec282812 Typo 2020-05-11 03:34:30 +02:00
Laurent Destailleur
7300b45bcd Responsive 2020-05-11 01:19:33 +02:00
Laurent Destailleur
a83af075aa Fix responsive 2020-05-11 00:35:05 +02:00
Laurent Destailleur
c511af69fe Debug look and feel v12 2020-05-10 21:07:49 +02:00
Laurent Destailleur
501f1ba2c4 Fix look and feel v12 2020-05-10 15:45:07 +02:00
Laurent Destailleur
796f97c671 Support tag $capture in input of files 2020-05-10 15:08:01 +02:00
stickler-ci
ff578198d6 Fixing style errors. 2020-05-10 04:35:52 +00:00
Alexandre SPANGARO
3da529f39c Merge remote-tracking branch 'upstream/develop' into 12.0_a26 2020-05-10 06:30:04 +02:00
Alexandre SPANGARO
f40e978475 Fix delbookkeepingyear - add hook printFieldPreListTitle - Look & Feel v12 2020-05-10 06:28:50 +02:00
Laurent Destailleur
310c5f9eb6 Fix size of field 2020-05-09 21:56:51 +02:00
Laurent Destailleur
f58dd9d02f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-09 21:49:25 +02:00
Laurent Destailleur
fe241ea321 Fix removed not reliabled info in PHP info 2020-05-09 21:49:12 +02:00
Anthony Berton
53eb891a88 Update list.php 2020-05-09 18:48:01 +02:00
Anthony Berton
3644a718d8 1 2020-05-09 01:02:51 +02:00
Alexandre SPANGARO
12fb1658ce Merge remote-tracking branch 'upstream/develop' into 12.0_a26 2020-05-08 20:45:52 +02:00
Laurent Destailleur
cd4c19f363
Merge pull request #13847 from aspangaro/12.0_a27
NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta
2020-05-08 19:48:56 +02:00
Laurent Destailleur
a2f311d25a
Merge pull request #13845 from atm-maxime/fix_missing_hook_params
Fix missing hook params for printFieldListValue
2020-05-08 19:48:08 +02:00
Laurent Destailleur
bba8ab657e Fix add missing migration 2020-05-08 18:57:15 +02:00
andreubisquerra
b89b6d7679
Name fix 2020-05-08 18:51:49 +02:00
andreubisquerra
f8ad954854
Fix URLs 2020-05-08 18:04:38 +02:00
andreubisquerra
1674048c81
Fix travis 2020-05-08 17:56:42 +02:00
jove@bisquerra.com
b93a3ceb29 TakePOS Auto Order improvements 2020-05-08 17:25:48 +02:00
Laurent Destailleur
c28a3e85a3 Fix constructor 2020-05-08 14:35:03 +02:00
Laurent Destailleur
6a2bb08107 Fix constructor 2020-05-08 14:34:02 +02:00
Laurent Destailleur
0138ab3f7c Fix $weblangs must be initialized with language of page 2020-05-08 14:29:04 +02:00
Laurent Destailleur
c98663be4a Fix sql 2020-05-08 14:05:04 +02:00
Laurent Destailleur
94d47c2acd Fix sql 2020-05-08 14:04:17 +02:00
stickler-ci
7ad80c9bf6 Fixing style errors. 2020-05-08 11:53:11 +00:00
Alexandre SPANGARO
640158ea4c NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta 2020-05-08 13:50:26 +02:00
Alexandre SPANGARO
40ffbbe616 Debug 2020-05-08 13:28:56 +02:00
Alexandre SPANGARO
a49635a825 NEW Bookkeeping by account - Add selectfields & hook 2020-05-08 07:45:01 +02:00
Laurent Destailleur
e55d9ed3b8 Trans 2020-05-08 03:02:53 +02:00
Laurent Destailleur
a649dcecf7 Look and field 2020-05-08 03:01:51 +02:00
Laurent Destailleur
42ee755ea5 Look and feel v12 2020-05-08 02:52:55 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Regis Houssin
d9a0edcf2b FIX missing file manifest.json.php 2020-05-08 00:01:56 +02:00
Laurent Destailleur
790bef98e5 Look and feel v12 2020-05-07 23:45:33 +02:00
Laurent Destailleur
830a117aa7 Suggest fix for #13824 2020-05-07 23:39:03 +02:00
Laurent Destailleur
6d17b678e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-07 23:06:30 +02:00
Laurent Destailleur
f23451e1c9
Update facture.class.php 2020-05-07 23:04:52 +02:00
Laurent Destailleur
dca3f3b31f Look adn feel v12 2020-05-07 22:59:40 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
stickler-ci
7514a625fd Fixing style errors. 2020-05-07 20:11:59 +00:00
Vaadasch
db8596743c
Update facture.class.php
Auto-update dates (if not empty) of services when cloning facture.

Actual code is only for month by month.

If empty (start or end) => do nothing

If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month

Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
2020-05-07 22:09:55 +02:00
Laurent Destailleur
b84e9141a5
Merge pull request #13840 from OPEN-DSI/new-ticket-messages-show-on-card
NEW show messages on ticket card
2020-05-07 21:30:24 +02:00
Laurent Destailleur
9ea84b87e5
Merge pull request #13836 from frederic34/patch-6
session_cache_limiter before starting session
2020-05-07 21:22:56 +02:00
Laurent Destailleur
3638a59d8d
Merge pull request #13832 from frederic34/patch-4
fix html
2020-05-07 21:21:01 +02:00
Laurent Destailleur
0cd05887ce FIX count of open day when date and start are not open should be 0 2020-05-07 17:21:27 +02:00
Frédéric FRANCE
c28e6630bb
Update functions.lib.php 2020-05-07 15:41:21 +02:00
Frédéric FRANCE
dd1d29f983
add some substitutions for date datetime 2020-05-07 15:37:32 +02:00
VESSILLER
7e8cd565f4 NEW not show linked table on add message action 2020-05-07 14:35:04 +02:00
VESSILLER
ad489ab1b4 NEW show messages on ticket card 2020-05-07 12:22:13 +02:00
Laurent Destailleur
03fddd48af Clean some constructors 2020-05-07 12:14:45 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
2020-05-07 11:59:13 +02:00
Laurent Destailleur
695771726f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-07 11:39:45 +02:00
Laurent Destailleur
d4400cf80f FIX links into emails of notifications 2020-05-07 11:39:32 +02:00
Frédéric FRANCE
91dcf10375
session_cache_limiter before starting session 2020-05-06 23:56:02 +02:00
Frédéric FRANCE
326dc7d367
fix html
file:///home/fred/Images/S%C3%A9lection_078.png
2020-05-06 17:59:40 +02:00
Laurent Destailleur
4c04ace9d8 fix reset of session 2020-05-06 15:39:07 +02:00
Laurent Destailleur
5e6b7fb6b4 Show message after pass reset 2020-05-06 15:36:14 +02:00
Laurent Destailleur
485896614b Add message during password reset 2020-05-06 15:30:00 +02:00
Laurent Destailleur
1ec8b31e46 Fix remove action param in url to allow a second try without the error
message
2020-05-06 15:15:12 +02:00
Laurent Destailleur
abdb0cc8c0 Fix use correct trackid 2020-05-06 15:03:57 +02:00
Laurent Destailleur
db40dd8e49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-06 14:48:58 +02:00
Laurent Destailleur
e7ae9c752e Fix missing trackid 2020-05-06 14:48:02 +02:00
Laurent Destailleur
bfd4ebd49d FIX Changing password message not visible if a background is set 2020-05-06 14:28:24 +02:00
Laurent Destailleur
c4d0133fbf
Merge pull request #13829 from indelog/accountreportincludevarpayloan
NEW Add include various payments and loans in accounting report with simplfified accountancy
2020-05-06 14:19:47 +02:00
Laurent Destailleur
3dbe9a4af1 Fix label 2020-05-06 13:59:15 +02:00
DEMAREST Maxime (Indelog)
889e5db4fb Fix use Form::selectyesno() for added options in admin/compta.php 2020-05-06 13:55:38 +02:00
DEMAREST Maxime (Indelog)
7bf037ab2f Fix blank line at end of control structure 2020-05-06 13:46:24 +02:00
DEMAREST Maxime (Indelog)
bf8cd51a5a Fix somes code formating errors 2020-05-06 13:37:24 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78 Add include various payments and loans in accounting report
For simplified accouning, behaviour not enable by default and must be
  enabed in simplified accounting module admin page (or by global
  settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
  ACCOUNTING_REPORTS_INCLUDE_LOAN).
2020-05-06 12:58:41 +02:00
atm-quentin
b6aa766c72 FIX stickler 2020-05-06 09:37:17 +02:00
Laurent Destailleur
a8222c2651 Look and feel v12 2020-05-06 05:10:42 +02:00
Laurent Destailleur
b09f179a16 NEW Website logs are now into a separated log file. 2020-05-06 04:32:48 +02:00
Laurent Destailleur
30fede216c Fix Add '_pw' var as var sensibles. 2020-05-06 04:03:07 +02:00
Laurent Destailleur
8512fba7db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-06 03:49:25 +02:00
Laurent Destailleur
247acdd274 Fix position of custom groups of modules 2020-05-06 03:47:28 +02:00
Laurent Destailleur
e7f0035237
Merge pull request #13811 from frederic34/patch-4
nowtime is not defined
2020-05-06 02:23:58 +02:00
Laurent Destailleur
860b6e7557
Merge pull request #13812 from mapiolca/patch-45
Fix issue in status name
2020-05-06 02:23:15 +02:00
Laurent Destailleur
8f76d19827
Merge pull request #13822 from atm-florian/develop
fix filter on date service contrat with hour
2020-05-06 02:21:10 +02:00
Laurent Destailleur
9f176c5e2d Fix trans 2020-05-06 01:41:10 +02:00
Laurent Destailleur
eacb1b3b2e Debug modulebuilder 2020-05-05 21:45:10 +02:00
Laurent Destailleur
650096ea0f Fix look and feel v12 2020-05-05 21:27:40 +02:00
Laurent Destailleur
07178fb6c0 Fix look and feel 2020-05-05 20:52:50 +02:00
Laurent Destailleur
ebe169b9ef Fix objects used for profit calculation. 2020-05-05 20:51:29 +02:00
Laurent Destailleur
d6c8988cec Look and field v12 2020-05-05 19:29:47 +02:00
Laurent Destailleur
41aaf5363d Fix templates 2020-05-05 18:53:41 +02:00
Laurent Destailleur
e354e71425 Fix link to themes on dolistore 2020-05-05 18:19:48 +02:00
Laurent Destailleur
49f9e88cc1 Look and feel v12 2020-05-05 18:16:30 +02:00
florian HENRY
ea145188b9 fix filter on date service contrat with hour 2020-05-05 18:14:38 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6
links color for table title line is equal to Text color for table title line
2020-05-05 18:12:07 +02:00
Laurent Destailleur
e871e736eb Fix for #5824 2020-05-05 17:55:03 +02:00
Laurent Destailleur
b2a9791dca Fix pagination on pages "Related items" 2020-05-05 16:33:02 +02:00
atm-quentin
eab69c3a59 NEW multiselect categorie client stats facturation 2020-05-05 16:15:33 +02:00
atm-quentin
1b35380dda NEW stats invoice graph with 3 bars 2020-05-05 16:13:04 +02:00
Laurent Destailleur
797beef79f Fix 2020-05-05 15:26:41 +02:00
Laurent Destailleur
eda22f4270 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-05 15:22:41 +02:00
Laurent Destailleur
b7fe2b31cd
Merge pull request #13813 from oscim/patch-38
Update list.php
2020-05-05 15:22:29 +02:00
Laurent Destailleur
36a0780f14 More complete fix for #13817 2020-05-05 15:20:40 +02:00
Laurent Destailleur
7e6b5a384d Code comment 2020-05-05 15:16:30 +02:00
Laurent Destailleur
d7d48936d2
Merge pull request #13816 from atm-gauthier/10.0_missinghookinit_and_tablefix
FIX : missing hook init + table class + $page not set
2020-05-05 15:15:42 +02:00
kamel
db591cdcd8 FIX: show value of the extrafields in the bank list 2020-05-05 14:47:31 +02:00
atm-lena
78a427c996 FIX wrong user right's name to top menu "commercial" 2020-05-05 14:35:03 +02:00
gauthier
c14b6884e3 FIX : missing hook init + table class + $page not set 2020-05-05 10:03:19 +02:00
oscim
c7753dd2e0
Update list.php 2020-05-05 09:44:46 +02:00
stickler-ci
204c788dec Fixing style errors. 2020-05-05 06:56:54 +00:00
oscim
d6de46cc05
Update list.php
Add massaction for payment invoice
2020-05-05 08:54:52 +02:00
Pierre Ardoin
c0b9fef229
Fix issue in status name
Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param

Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
2020-05-05 08:40:30 +02:00
Frédéric FRANCE
93e69d515d
nowtime is not defined 2020-05-05 06:38:24 +02:00
Laurent Destailleur
d2d9ce3576
Merge pull request #13794 from atm-maxime/fix_addline_titles
Fix addline titles
2020-05-04 22:08:34 +02:00
Laurent Destailleur
2afd38e2f6 FIX Combo list of available users to filter on the list of leaves. 2020-05-04 21:59:31 +02:00
Laurent Destailleur
5e4ef9266e Fix update template to use for notifications 2020-05-04 20:30:02 +02:00
Laurent Destailleur
6d894b7abd Fix missing link in message 2020-05-04 19:08:31 +02:00
Laurent Destailleur
821e11ca3c Look and feel v12 2020-05-04 17:13:31 +02:00
Laurent Destailleur
abd37c78f9 Fix responsive 2020-05-04 17:07:18 +02:00
Laurent Destailleur
f4a9490e7f Fix a page with NOLOGIN const set to 1 must be into "public" dir. 2020-05-04 16:55:53 +02:00
Laurent Destailleur
f6e0553093 fix var_dump 2020-05-04 14:29:57 +02:00
Laurent Destailleur
358bc6d5df Fix search on entities 2020-05-04 14:29:25 +02:00
Laurent Destailleur
3857c08277 Fix quick search on MO 2020-05-04 13:24:09 +02:00
Laurent Destailleur
4b34a6bd4a Look and feel 2020-05-04 12:43:47 +02:00
Laurent Destailleur
535ae612f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-03 22:48:48 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
dc5731dcd6
Merge pull request #13789 from simicar29/dev-selectproduits
Add / as a delimiter for replacement pattern in select_produits*
2020-05-03 21:47:26 +02:00
Laurent Destailleur
f0f6d6e314
Merge pull request #13793 from andreubisquerra/master
NEW tab for Bar Restaurant parameters and new AUTO ORDER
2020-05-03 21:45:08 +02:00
Laurent Destailleur
f74e3f1a90
Merge pull request #13790 from proprum/patch-1
MAIN_NO_CONCAT_DESCRIPTION in contrat/card.php
2020-05-03 21:26:52 +02:00
stickler-ci
ab20b5cb61 Fixing style errors. 2020-05-03 19:26:35 +00:00
Laurent Destailleur
2eb027833c
Update card.php 2020-05-03 21:25:49 +02:00
Laurent Destailleur
33669b6fd8
Update html.formproduct.class.php 2020-05-03 21:15:23 +02:00
stickler-ci
080db7629f Fixing style errors. 2020-05-03 15:21:00 +00:00
Anthony Berton
f42492764d Update html.formproduct.class.php
DEFAULT_WAREHOUSE is not select in sherch
2020-05-03 17:16:25 +02:00
Laurent Destailleur
d27ccb0233 Fix pb of lang subdir in exporting website 2020-05-03 14:58:53 +02:00
Laurent Destailleur
da91a857a5 Fix pb of lang subdir in cloning website 2020-05-03 14:49:06 +02:00
Laurent Destailleur
77cf9fb569 Add .dolibarr file into CMS 2020-05-03 14:28:23 +02:00
Anthony Berton
d81ae29ab7
Update style.css.php 2020-05-03 14:05:18 +02:00
Anthony Berton
dabb2f4ad3
Update theme_vars.inc.php 2020-05-03 14:01:42 +02:00
Anthony Berton
a31eaf2eb8
Update style.css.php 2020-05-03 13:59:40 +02:00
Laurent Destailleur
fcee3a68f4 Fix sort on file manager of website 2020-05-03 13:00:39 +02:00
stickler-ci
ef3f121c88 Fixing style errors. 2020-05-03 08:51:50 +00:00
Anthony Berton
fdb98dd6ed
Update admin.lang 2020-05-03 10:49:57 +02:00
Anthony Berton
30cb4f0151
Update admin.lang 2020-05-03 10:48:16 +02:00
Anthony Berton
44bafb7225
Update ihm.php 2020-05-03 10:46:48 +02:00
Anthony Berton
2f18b444d7
Update style.css.php 2020-05-03 10:44:37 +02:00
Anthony Berton
f299f0f849
Update theme_vars.inc.php 2020-05-03 10:42:49 +02:00
stickler-ci
5c1eb08b3f Fixing style errors. 2020-05-03 08:42:45 +00:00
Anthony Berton
87d86f32ee
Update usergroups.lib.php 2020-05-03 10:40:52 +02:00
Anthony Berton
c3521502de
Update global.inc.php 2020-05-03 10:34:56 +02:00
Maxime Kohlhaas
e0ebe85c13 Fix addline titles 2020-05-03 09:15:12 +02:00
andreubisquerra
fe98e430ce
Fix travis 2020-05-03 00:10:12 +02:00
andreubisquerra
8530db6dab
Fix travis 2020-05-03 00:09:17 +02:00
andreubisquerra
32923daa9d
Fix travis 2020-05-03 00:07:52 +02:00
andreubisquerra
ac75cf318e
Fix travis 2020-05-03 00:07:04 +02:00
andreubisquerra
35713ef004
Fix travis 2020-05-03 00:05:59 +02:00
jove@bisquerra.com
81c808692e NEW Bar Restaurant tab and Auto order 2020-05-02 22:00:04 +02:00
proprum
1929f9132d
MAIN_NO_CONCAT_DESCRIPTION in contrat/card.php
Idem to propal/card.php
2020-05-02 17:25:22 +02:00
Marc Guenneugues
b5abb72c5b Add / as a delimiter for replacement pattern in select_produits* 2020-05-02 16:36:40 +02:00
Laurent Destailleur
48e62eca0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-02 15:19:09 +02:00
Laurent Destailleur
a88ab40384 Clean phpcs 2020-05-02 15:18:59 +02:00
Laurent Destailleur
099871e217
Merge pull request #13649 from atm-john/12.0_add_class_unitstools
NEW class tool for converting units
2020-05-02 13:05:51 +02:00
Laurent Destailleur
a5341bed9e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-02 12:56:33 +02:00
Laurent Destailleur
e9c60e64d6 Typo 2020-05-02 12:56:22 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
c4b87d01ce Fix non traversable var 2020-05-02 03:36:01 +02:00
Laurent Destailleur
90bbb9beac Fix API to delete purchase price 2020-05-02 03:33:33 +02:00
Laurent Destailleur
4606b9fd9f Fix name of class Service (already used by APIs) 2020-05-02 03:29:33 +02:00
Laurent Destailleur
7c6dc930d2 Fix var not defined 2020-05-02 03:25:34 +02:00
Laurent Destailleur
62a2469c71 Fix position of modules 2020-05-02 00:41:27 +02:00
Laurent Destailleur
c2c0e6517f Fix init data of units D and H. 2020-05-01 22:44:46 +02:00
Laurent Destailleur
cc4a9ed10d
Merge pull request #13768 from TobiasSekan/MeasuringDirectoryToolTip
NEW tooltip for Unit_type and scale in "Dictionary setup - Measuring Units"
2020-05-01 22:36:04 +02:00
Laurent Destailleur
dc24738f93 Group columns about thirdparty data together 2020-05-01 22:34:49 +02:00
Laurent Destailleur
16e4c25caf
Merge pull request #13761 from aspangaro/12.0_a26
NEW: Accountancy add column thirdparty on binding page
2020-05-01 22:25:49 +02:00
Laurent Destailleur
3957b74d9a Revert "FIX: add auto incrementation to llx_c_typent.sql"
This reverts commit 14a3aa2165.
2020-05-01 22:17:33 +02:00
Laurent Destailleur
994b60b1d8 Revert use of autoincrement not possible with value 0 2020-05-01 22:17:13 +02:00
Laurent Destailleur
efb79a4008 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-01 22:16:21 +02:00
Laurent Destailleur
10af669719 Fix missing autoincrement 2020-05-01 22:14:09 +02:00
Laurent Destailleur
b3dd873656
Merge pull request #13777 from lecoqlibre/develop
FIX: add auto incrementation to llx_c_typent.sql
2020-05-01 22:13:57 +02:00
Laurent Destailleur
63bb4b82e9
Merge pull request #13772 from andreubisquerra/master
Finish send receipt by email from TakePOS
2020-05-01 22:05:57 +02:00
Laurent Destailleur
8208e81622
Merge pull request #13767 from indelog/statsbytype
Add possibility to filter stats by ThirdParty type and categorie
2020-05-01 22:05:06 +02:00
Laurent Destailleur
18a36de69b
Merge pull request #13779 from frederic34/patch-4
$tmpplugin was defined after use
2020-05-01 22:02:04 +02:00
Laurent Destailleur
b74a4c6995 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-01 22:00:11 +02:00
Laurent Destailleur
75dd5f268f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/sendings.lib.php
2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Laurent Destailleur
14a81eea5f
Merge pull request #13781 from nervo/reindent-module-template
Reindent module template
2020-05-01 20:45:47 +02:00
Laurent Destailleur
cb48011b17
Merge pull request #13780 from nervo/psr-2-noncompliance
PSR-2 Noncompliance
2020-05-01 20:43:30 +02:00
Laurent Destailleur
c1b530f58f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/get_menudiv.php
2020-05-01 15:56:01 +02:00
Laurent Destailleur
1c7873b4f4 FIX Sanitizing menu parameter 2020-05-01 15:53:56 +02:00
nervo
ba0ca3f7f7 Reindent module template 2020-05-01 08:40:55 +02:00
nervo
bc32b75fd2 PSR-2 Noncompliance 2020-05-01 08:13:03 +02:00
Frédéric FRANCE
fddbe7c929
$tmpplugin was defined after use 2020-05-01 07:50:46 +02:00
Laurent Destailleur
625c7216a9 Can show date of validation in list 2020-04-30 19:51:24 +02:00
Laurent Destailleur
e4edd143c5 Fix field name 2020-04-30 19:41:46 +02:00
Laurent Destailleur
c27b3c5966 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2020-04-30 18:49:20 +02:00
Laurent Destailleur
4c27ae6530 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-04-30 18:47:18 +02:00
Laurent Destailleur
b1495e12ce FIX A variable was erased by a temporary variable 2020-04-30 18:45:00 +02:00
Maxime Lecoq
14a3aa2165 FIX: add auto incrementation to llx_c_typent.sql 2020-04-30 18:21:25 +02:00
Laurent Destailleur
5948d385a3 Look and feel v12 2020-04-30 14:46:49 +02:00
Laurent Destailleur
82ace4b4ef FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2020-04-30 11:52:30 +02:00
andreubisquerra
281a97404a
Fix travis 2020-04-30 01:27:55 +02:00
jove@bisquerra.com
4dbd16077e Finish send receipt by email from TakePOS 2020-04-30 01:10:12 +02:00
Laurent Destailleur
6d79eed8c1 Fix colspan alignement 2020-04-29 20:36:14 +02:00
Laurent Destailleur
6ec6a4465a FIX Setup of thirdparty or contact for external users 2020-04-29 20:21:17 +02:00
Laurent Destailleur
908e5d7f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/api/class/api_setup.class.php
2020-04-29 18:05:01 +02:00
Laurent Destailleur
84bca036c9 FIX Link missing into email of some notification 2020-04-29 18:03:28 +02:00
DEMAREST Maxime (Indelog)
790cffb7ae Correct select label for categories in stats pages 2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)
398b0234ea Correct label for select thirdparty categorie in invoice stats 2020-04-29 14:10:06 +02:00
Tobias Sekan
9e7c0c14d9
Add two new lang entries (admin) 2020-04-29 13:30:58 +02:00
Tobias Sekan
56dee72b66
add tooltip for unit_type and scale (admin) 2020-04-29 13:30:14 +02:00
DEMAREST Maxime (Indelog)
1bd9372022 Forgot comments to document news params for the modified methods 2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0 Add possibility to filter stats by ThirdParty type and categorie 2020-04-29 09:17:44 +02:00
Laurent Destailleur
f8dfe886ac Fix css 2020-04-28 20:52:24 +02:00
Laurent Destailleur
293034dd89 css 2020-04-28 19:47:31 +02:00
Laurent Destailleur
a7815e0aac css 2020-04-28 19:44:32 +02:00
Laurent Destailleur
e68f51c4cd csss 2020-04-28 19:42:39 +02:00
Laurent Destailleur
4d22baabfe CSS 2020-04-28 19:40:25 +02:00
Laurent Destailleur
a0c013d87b Fix missing link
Conflicts:
	htdocs/core/class/notify.class.php
2020-04-28 19:18:31 +02:00
Laurent Destailleur
66b33573ef Fix menu 2020-04-28 18:30:38 +02:00
Laurent Destailleur
93a894df5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-28 18:08:37 +02:00
Laurent Destailleur
483935493c Fix look and feel 2020-04-28 18:08:26 +02:00
Laurent Destailleur
478bd60ad2
Merge pull request #13760 from ptibogxiv/patch-336
FIX files download by API/entity
2020-04-28 18:01:42 +02:00
Laurent Destailleur
6990bef6a2
Merge pull request #13764 from Tim-Otte/fixProjectTaskListStatusSearch
Fixed project task list search
2020-04-28 18:01:10 +02:00
Laurent Destailleur
aa9ee060d5 Look and feel v12 2020-04-28 17:34:11 +02:00
Laurent Destailleur
c22e13b138 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:27:51 +02:00
Laurent Destailleur
a8740352af FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:27:42 +02:00
Laurent Destailleur
91523b4b64 FIX Can switch from double to price type for extrafields
Conflicts:
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
2020-04-28 14:27:22 +02:00
Laurent Destailleur
dd3a5949c0 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:25:07 +02:00
Laurent Destailleur
2b00ae9e92 FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:22:52 +02:00
Laurent Destailleur
7a73915e92 FIX Can switch from double to price type for extrafields 2020-04-28 14:22:13 +02:00
Tim Otte
947609fc12 Minor fix 2020-04-28 12:59:15 +02:00
Tim Otte
afbd73b946
Merge pull request #3 from Dolibarr/develop
Merging changes from Dolibarr
2020-04-28 12:42:05 +02:00
Tim Otte
4a8173f498 Fixed search_projectstatus to allow default values 2020-04-28 12:40:10 +02:00
Laurent Destailleur
72c8397e36 css 2020-04-28 11:24:13 +02:00
Alexandre SPANGARO
1f6c959b72 NEW: Accountancy add column thirdparty on binding page 2020-04-28 04:55:54 +02:00
Alexandre SPANGARO
b3efa4f793 Merge remote-tracking branch 'upstream/develop' into 12.0_a26 2020-04-28 04:45:24 +02:00
Alexandre SPANGARO
31583c9b63 NEW: Accountancy add column thirdparty on binding page 2020-04-28 04:45:06 +02:00
Laurent Destailleur
a40c2fdbfc Debug v12 2020-04-28 02:58:33 +02:00
Laurent Destailleur
fb8bdefbaa Look and feel v12 2020-04-28 02:10:26 +02:00
Laurent Destailleur
52fc149faa Fix permissions 2020-04-28 01:04:37 +02:00
ptibogxiv
9764c85ee3
FIX files download by API/entity
TODO need more clean of this file with multicompany
2020-04-27 19:15:17 +02:00
Laurent Destailleur
a8613661fc Fix sql 2020-04-27 19:03:04 +02:00
Laurent Destailleur
12e090eed6 Fix search in correct language 2020-04-27 18:48:35 +02:00
Laurent Destailleur
0de8cb7096 Add property shortlang 2020-04-27 18:38:11 +02:00
ATM john
41e597e739 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools 2020-04-27 17:46:22 +02:00
Laurent Destailleur
fe6fb12d18 Fix missing link 2020-04-27 17:13:23 +02:00
Laurent Destailleur
635b9bb0fe FIX #13641 2020-04-27 15:27:03 +02:00
Laurent Destailleur
6b1a1e5e58 FIX #13743 2020-04-27 15:09:27 +02:00
Laurent Destailleur
ed045b2673 FIX #13749 2020-04-27 15:04:31 +02:00
Laurent Destailleur
a1142f884d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-27 15:03:34 +02:00
Laurent Destailleur
581d4dbcd9 Look and feel v12 2020-04-27 14:39:38 +02:00
Laurent Destailleur
50d9f466d4 FIX #13749 2020-04-27 14:38:45 +02:00
stickler-ci
fdc0543b4d Fixing style errors. 2020-04-27 12:16:24 +00:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
d8ba28185a
Merge pull request #13706 from leninrivas/develop
Cancel shipping
2020-04-27 14:06:39 +02:00
Laurent Destailleur
17a4447ccb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-27 14:02:28 +02:00
Laurent Destailleur
ed63287797 Fix font 2020-04-27 14:02:18 +02:00
Laurent Destailleur
fe3359022a
Merge pull request #13747 from bb2a/patch-7
Link Phone in list
2020-04-27 13:49:30 +02:00
Laurent Destailleur
a7de160290
Merge pull request #13740 from simicar29/develop-hook-updateTotalPrice
ADD: New hook updateTotalPrice in commonObject update_price
2020-04-27 13:43:13 +02:00
Laurent Destailleur
3c1d989c30 FIX #13751 2020-04-27 11:41:35 +02:00
gauthier
7f56c4a785 FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element" 2020-04-27 11:18:53 +02:00
Ferran Marcet
b90a6024f5 FIX: Wrong Sql on getListOfTowns api method 2020-04-27 10:15:47 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
31ba277da7 Fix phpcs 2020-04-26 23:18:09 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
a36d0c96c1 Fix sql 2020-04-26 22:28:43 +02:00
Laurent Destailleur
06cb0194d5 Look and feel v12 2020-04-26 14:12:51 +02:00
Laurent Destailleur
58409ce93e Look and feel v12 2020-04-26 14:11:25 +02:00
Anthony Berton
62ca9a984e
Update list.php 2020-04-25 21:42:59 +02:00
Laurent Destailleur
1d68510c7d Fix syntax error 2020-04-25 19:32:18 +02:00
Laurent Destailleur
6caa872280 Enable more PHPCS rules 2020-04-25 19:27:42 +02:00
Laurent Destailleur
068a890c36 Enable more PHPCS rules 2020-04-25 19:13:20 +02:00
Laurent Destailleur
b426bbe758 Fix bad code 2020-04-25 17:47:41 +02:00
Laurent Destailleur
3090eb578b Look and feel v12 2020-04-25 17:43:12 +02:00
Marc Guenneugues
a040cd0305 Properly assign ->id in expensereport fetch_lines 2020-04-25 15:19:47 +02:00
Laurent Destailleur
0aec776d82
Merge pull request #13737 from lecoqlibre/develop
FIX CUnit->fetch id/rowid
2020-04-25 13:53:16 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
731864eb4a Removed useless translation keys 2020-04-25 12:43:41 +02:00
Marc Guenneugues
fb2759eaf6 Correct lint errors 2020-04-25 10:32:35 +02:00
Marc Guenneugues
966fedc501 ADD: New hook updateTotalPrice in commonObject update_price 2020-04-25 10:19:09 +02:00
Laurent Destailleur
99f445962b Fix regression 2020-04-25 03:38:12 +02:00
Laurent Destailleur
4dc8e59e7f Fix order of thumbs 2020-04-25 03:34:31 +02:00
Laurent Destailleur
5ce3174181 Look and feel v12 2020-04-25 03:31:47 +02:00
Laurent Destailleur
38f2aad0c6 Debug asset module 2020-04-25 03:19:30 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
c9f242406c Look and feel v12 2020-04-25 02:44:24 +02:00
Laurent Destailleur
291664d109 Look and feel v12 2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Anthony Berton
ac872b6d3d
Update global.inc.php 2020-04-24 23:36:37 +02:00
Laurent Destailleur
d416edab1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/accounting-files.php
2020-04-24 22:49:59 +02:00
Maxime Lecoq
9ed7ff80a1 FIX CUnit->fetch id/rowid 2020-04-24 21:08:47 +02:00
Laurent Destailleur
fc1a1c6afe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 19:56:29 +02:00
Laurent Destailleur
d11dcc35c3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2020-04-24 19:56:19 +02:00
Laurent Destailleur
6798e9e6f5 Fix remove warning missing the seller in update_price 2020-04-24 19:52:54 +02:00
Laurent Destailleur
df10b86d1f FIX consistency of price w/wo vat wrong when price entered with tax 2020-04-24 19:52:34 +02:00
Laurent Destailleur
48245cf134
Merge pull request #13735 from atm-gauthier/11.0_fix_elementtype
FIX : Access to undeclared static property: Contact::$table_element
2020-04-24 19:02:11 +02:00
Laurent Destailleur
e84601f5ed
Merge pull request #13710 from TobiasSekan/FixMissingErrorOnCloneObject
FIX not shown error on clone vendor invoice with ExtraFields
2020-04-24 19:01:42 +02:00
Laurent Destailleur
4564a5cffd
Update accounting-files.php 2020-04-24 19:01:08 +02:00
Laurent Destailleur
708f89c9dc
Merge pull request #13732 from pstructures/new-devlelop
Fixed Translation Issue Default Contact Address For Field
2020-04-24 19:00:04 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
florian HENRY
a685026756 fix: remove php warning 2020-04-24 17:22:35 +02:00
Laurent Destailleur
d2e17c5427 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 16:27:56 +02:00
Laurent Destailleur
b77892451f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 16:21:58 +02:00
Laurent Destailleur
21665cdc85 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/class/facture.class.php
2020-04-24 16:21:51 +02:00
Laurent Destailleur
df91780552 FIX Situation invoice take into account the credit notes. 2020-04-24 15:57:08 +02:00
gauthier
e98671e404 FIX : Access to undeclared static property: Contact::$table_element 2020-04-24 15:22:38 +02:00
Laurent Destailleur
b2b580f6fb Report error 2020-04-24 15:21:38 +02:00
Laurent Destailleur
42ee9845ad Report error 2020-04-24 15:21:02 +02:00
Laurent Destailleur
9764af7e9c
Merge pull request #13731 from simicar29/11.0-reception
Clean line extrafields when deleting reception
2020-04-24 15:16:51 +02:00
Laurent Destailleur
eda3643639
Merge pull request #13730 from simicar29/11.0-expedition
Clean line extrafields when deleting expedition
2020-04-24 15:16:41 +02:00
Laurent Destailleur
c96937d101
Merge pull request #13729 from simicar29/11.0-contrat
Clean line extrafields when deleting contrat
2020-04-24 15:16:29 +02:00
stickler-ci
6d4d638ec1 Fixing style errors. 2020-04-24 12:38:46 +00:00
Tobias Sekan
05bb94cd3f
fix wrong set e-mail for vCard + docu update 2020-04-24 14:12:43 +02:00
Tobias Sekan
5d9432e4d0
fix style 2020-04-24 14:02:54 +02:00
Tobias Sekan
cab4f35438
fix missing vcard values 2020-04-24 14:01:08 +02:00
Frédéric FRANCE
1aafd4667b
fix countable php7 warning 2020-04-24 11:57:23 +02:00
Matt Sidnell
dd070cc680 Update commonobject.class.php 2020-04-23 20:37:15 +01:00
Laurent Destailleur
5756e3be09 Look and feel v12 2020-04-23 20:45:51 +02:00
Laurent Destailleur
997c2344cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-23 20:03:52 +02:00
Laurent Destailleur
2ba6e65feb Fix label 2020-04-23 20:03:41 +02:00
stickler-ci
ababad540a Fixing style errors. 2020-04-23 17:29:52 +00:00
Laurent Destailleur
a90398af06
Merge pull request #13726 from simicar29/11.0-supplierproposal
Clean line extrafields when deleting supplier proposal
2020-04-23 19:27:39 +02:00
Laurent Destailleur
2fcb2ff19f
Merge pull request #13727 from simicar29/11.0-fichinter
Clean line extrafields when deleting fichinter
2020-04-23 19:27:22 +02:00
Marc Guenneugues
b4fbb86548 Clean line extrafields when deleting reception 2020-04-23 19:22:25 +02:00
Marc Guenneugues
3ea8d1895b Clean line extrafields when deleting expedition 2020-04-23 19:09:05 +02:00
stickler-ci
b8a4c0d83b Fixing style errors. 2020-04-23 17:02:57 +00:00
Marc Guenneugues
a70be95760 Clean line extrafields when deleting contrat 2020-04-23 19:00:47 +02:00
Laurent Destailleur
7f0e019c78
Merge pull request #13725 from simicar29/11.0-supplierorder
Clean line extrafields when deleting supplier order
2020-04-23 18:56:09 +02:00
stickler-ci
93735bf9cd Fixing style errors. 2020-04-23 16:55:36 +00:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
9679b1f04c
Merge pull request #13704 from frederic34/actioncomm_note
actioncomm note deprecated
2020-04-23 18:52:56 +02:00
Marc Guenneugues
285f215acf Clean line extrafields when deleting fichinter 2020-04-23 18:52:45 +02:00
Laurent Destailleur
4e6017e5bf Look and feel v12 2020-04-23 18:50:20 +02:00
Laurent Destailleur
0aa0d62f43 Fix constant 2020-04-23 18:42:59 +02:00
Laurent Destailleur
201a2349f6
Merge branch 'develop' into patch-324 2020-04-23 18:39:30 +02:00
Laurent Destailleur
388e98fdf0
Merge pull request #13724 from simicar29/11.0-supplierinvoice
Clean line extrafields when deleting supplier invoice
2020-04-23 18:35:34 +02:00
Marc Guenneugues
ab5c2b1fd5 Clean line extrafields when deleting supplier proposal 2020-04-23 18:33:58 +02:00
Laurent Destailleur
922efaf49b
Merge pull request #13714 from simnandez/11.0
FIX: Error update SQL into stock reception
2020-04-23 18:31:11 +02:00
Laurent Destailleur
02c5530e1f
Update mouvementstock.class.php 2020-04-23 18:31:01 +02:00
stickler-ci
4b58213e5b Fixing style errors. 2020-04-23 16:29:36 +00:00
Marc Guenneugues
64d877bc7b Clean line extrafields when deleting supplier order 2020-04-23 18:27:06 +02:00
Laurent Destailleur
bcad90ccf2
Merge pull request #13715 from ndrosis/patch-25
Fix check VAT ID HTTP to HTTPS
2020-04-23 18:22:39 +02:00
Laurent Destailleur
00e9ed1452
Merge pull request #13716 from atm-florian/11.0
fix: remove debug pring
2020-04-23 18:22:18 +02:00
Laurent Destailleur
dc0978e88b
Merge pull request #13720 from FHenry/dev_fix_odt
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 18:22:00 +02:00
Laurent Destailleur
8401f68bde
Update doc_generic_task_odt.modules.php 2020-04-23 18:21:17 +02:00
stickler-ci
b5f48fb815 Fixing style errors. 2020-04-23 16:17:37 +00:00
Marc Guenneugues
039fe92209 Clean line extrafields when deleting supplier invoice 2020-04-23 18:14:56 +02:00
Laurent Destailleur
5edd8b1206
Merge pull request #13722 from simicar29/11.0-commande
Clean line extrafields when deleting order
2020-04-23 18:13:34 +02:00
Laurent Destailleur
c8a93437ff
Merge pull request #13721 from simicar29/11.0
Clean line extrafields when deleting invoice
2020-04-23 18:12:28 +02:00
Marc Guenneugues
94be1870ec Clean line extrafields when deleting proposal 2020-04-23 18:02:53 +02:00
Laurent Destailleur
1101c4e587 Fix trans 2020-04-23 18:01:04 +02:00
Laurent Destailleur
f7d4d78008 Fix error 500 2020-04-23 17:55:55 +02:00
Marc Guenneugues
be46b2062e Clean line extrafields when deleting order 2020-04-23 17:51:06 +02:00
Laurent Destailleur
86be024dcc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
Laurent Destailleur
cd1368cb71 Fix dispatch in ledger for various payment done in same account when
there is 2 different transaction in 2 different account (backport v12)
2020-04-23 17:10:40 +02:00
stickler-ci
2633e90890 Fixing style errors. 2020-04-23 15:03:14 +00:00
simicar29
ce94788dd9
Clean line extrafields when deleting recurring invoice
Delete extrafields recurring invoice lines when deleting parent object
Delete extrafields when deleting a recurring invoice line
2020-04-23 17:01:40 +02:00
stickler-ci
aebc04d30a Fixing style errors. 2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
2020-04-23 16:29:22 +02:00
florian HENRY
32385b75e1 travis 2020-04-23 16:18:31 +02:00
florian HENRY
7a206df96f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-04-23 16:04:58 +02:00
florian HENRY
6dafb30ee8 fix time duration substitution 2020-04-23 15:57:06 +02:00
florian HENRY
55a9aa5991 fix: missing duration odt task substitution 2020-04-23 15:55:37 +02:00
Laurent Destailleur
68e9d8463a Debug MAIN_USE_ALTERNATE_TRANSLATION_FOR variable 2020-04-23 15:52:15 +02:00
florian HENRY
da80bacf9b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-04-23 15:50:53 +02:00
florian HENRY
882b39628f fix: uniformize extrafeild replacemnt for ODT docs 2020-04-23 15:50:42 +02:00
Laurent Destailleur
defef24c3c Fix regression 2020-04-23 13:57:27 +02:00
Laurent Destailleur
6819255b76 FIX #13650 2020-04-23 13:49:18 +02:00
florian HENRY
7972174787 remove debug pring 2020-04-23 13:44:23 +02:00
Laurent Destailleur
436362502c CSS 2020-04-23 13:41:51 +02:00
Laurent Destailleur
3a9add0e70 FIX #13663 2020-04-23 13:37:43 +02:00
Laurent Destailleur
86928efb95 Var not defined 2020-04-23 13:35:40 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
4475df14b4 Finish removal of duplicate hook/trigger 2020-04-23 12:54:28 +02:00
Laurent Destailleur
e1129babbc Code comment 2020-04-23 12:44:30 +02:00
Laurent Destailleur
93278b2dca FIX #13713 2020-04-23 12:42:03 +02:00
Laurent Destailleur
46716f2259 Typo 2020-04-23 12:34:37 +02:00
Laurent Destailleur
8f8ae5a4db Fix typo 2020-04-23 12:33:22 +02:00
Drosis Nikos
d11396be3e
Fix check VAT ID HTTP to HTTPS
No response to HTTP
2020-04-23 13:22:30 +03:00
Laurent Destailleur
18d3d68cae Fix def 2020-04-23 12:22:24 +02:00
Laurent Destailleur
da02863242 Code comment 2020-04-23 12:19:51 +02:00
Juanjo Menent
0999f5e6f2 FIX: Error update SQL into stock reception 2020-04-23 12:12:50 +02:00
Laurent Destailleur
69f4a3e7b0 Doc 2020-04-23 11:41:03 +02:00
Sekan, Tobias
f793844862 Fix missing errror on facture clone 2020-04-23 11:04:14 +02:00
stickler-ci
ff694c22d1 Fixing style errors. 2020-04-23 05:54:13 +00:00
Lenin Rivas
47654fd629
Shipment Canceled
Shipment canceled, not delete ref and recovery stock.
2020-04-23 00:49:31 -05:00
Lenin Rivas
e152567122
Add Button Cancel
And cancel confirmation
2020-04-23 00:38:08 -05:00
Frédéric FRANCE
177008ab65
actioncomm note deprecated 2020-04-23 00:45:33 +02:00
Frédéric FRANCE
4220d6b253
actioncomm note deprecated 2020-04-23 00:38:42 +02:00
ATM john
3f5270cf39 Remove getValue Method : usage of fetch_row is deprecated 2020-04-22 23:12:15 +02:00
ATM john
bf592489c0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools 2020-04-22 23:09:10 +02:00
Laurent Destailleur
b971aabf3c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 22:13:04 +02:00
Laurent Destailleur
b6786c515a picto 2020-04-22 22:12:53 +02:00
Laurent Destailleur
b19e0d43fd
Merge pull request #13701 from frederic34/patch-1
Update api_bankaccounts.class.php
2020-04-22 22:12:09 +02:00
Laurent Destailleur
a7641cdb90 CSS 2020-04-22 22:02:25 +02:00
Laurent Destailleur
9bda294edc Fix set default warehouse of product in MO consumption 2020-04-22 21:41:56 +02:00
Laurent Destailleur
ead78ae777 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 21:29:44 +02:00
Laurent Destailleur
de90f24bd4 Fix phpcs 2020-04-22 21:29:15 +02:00
Laurent Destailleur
245f89ceaa Look and feel v12 2020-04-22 21:28:23 +02:00
Frédéric FRANCE
4605b9ec61
Update api_bankaccounts.class.php 2020-04-22 19:16:58 +02:00
Laurent Destailleur
3170060c65 Help show format of price 2020-04-22 18:34:52 +02:00
Laurent Destailleur
52c8e3aff1 Look and feel v12 2020-04-22 18:30:25 +02:00
Laurent Destailleur
3101f72b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 18:28:59 +02:00
Laurent Destailleur
39c454d07b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
6b8ff56c20 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/html.formother.class.php
2020-04-22 18:26:26 +02:00
Laurent Destailleur
80271cc852 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-22 18:24:00 +02:00
Laurent Destailleur
7bc8a70b0a FIX #13670 2020-04-22 18:23:48 +02:00
Laurent Destailleur
bbfb93bc42
Merge pull request #13690 from OPEN-DSI/new-societe-import-update-contacts
NEW can update contact in import model
2020-04-22 18:09:49 +02:00
Laurent Destailleur
8598fd99c2 if not exists not required 2020-04-22 18:08:02 +02:00
Laurent Destailleur
31c8645a35
Merge pull request #13694 from frederic34/patch-1
Update 11.0.0-12.0.0.sql
2020-04-22 18:06:27 +02:00
Laurent Destailleur
2dc586c325
Merge pull request #13660 from jribal/patch-2
add project object dependency
2020-04-22 18:02:42 +02:00
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
Laurent Destailleur
a61d2c9d62 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 16:36:05 +02:00
Laurent Destailleur
eee9e79436 Tooltip 2020-04-22 16:35:25 +02:00
gauthier
43f4c5ac96 FIX : model export list must be sorted by label 2020-04-22 15:29:54 +02:00
Frédéric FRANCE
63186a60ae
Update 11.0.0-12.0.0.sql 2020-04-22 14:23:38 +02:00
Laurent Destailleur
7e9fe20365
Merge pull request #13664 from indelog/socinfoonprint
NEW possibility to show society info when print page
2020-04-22 14:11:34 +02:00
Laurent Destailleur
4777c74366
Update main.inc.php 2020-04-22 14:11:03 +02:00
Laurent Destailleur
5c133b9c6c
Merge pull request #13686 from frederic34/patch-10
add extrafields in note for enstein and azur
2020-04-22 13:19:07 +02:00
Laurent Destailleur
c1d0cae24d
Merge pull request #13692 from hregis/11.0_bug
FIX missing fk_bank during export of suppliers invoices
2020-04-22 13:18:46 +02:00
Laurent Destailleur
22162ac57e Fix rounding of quantities 2020-04-22 13:14:50 +02:00
Laurent Destailleur
e91d263a6a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 12:57:02 +02:00
Laurent Destailleur
a5def19cff Fix calculation from a BOM > 1 2020-04-22 12:56:52 +02:00
Laurent Destailleur
e93db1f3c5
Merge pull request #13671 from leninrivas/develop
Fix calculator to consume with to produce
2020-04-22 12:56:29 +02:00
Laurent Destailleur
8754fc1d1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 12:40:21 +02:00
Laurent Destailleur
9a5986e190 css 2020-04-22 12:40:11 +02:00
Laurent Destailleur
169378f276
Update mo.class.php 2020-04-22 12:34:02 +02:00
Laurent Destailleur
1788b1b252
Update mo.class.php
Use the accuracy of stock for rounding
2020-04-22 12:32:20 +02:00
Regis Houssin
f6f9ca48dd FIX missing fk_bank during export of suppliers invoices 2020-04-22 12:23:26 +02:00
florian HENRY
8be14060d6 fix: avoid php notice 2020-04-22 12:08:05 +02:00
VESSILLER
cce3085a79 NEW can update contact in import model 2020-04-22 10:44:23 +02:00
Frédéric FRANCE
8ed9c30a89
clean tab/whitespace 2020-04-22 09:02:02 +02:00
Laurent Destailleur
35b5ee28ef
Merge pull request #13680 from adrienjacob/patch-3
Add API endpoints for supplier invoice lines
2020-04-22 01:06:57 +02:00
Laurent Destailleur
2541d41809
Merge pull request #13669 from pstructures/new-devlelop
Add default values to extrafields
2020-04-22 01:06:04 +02:00
Laurent Destailleur
292d93405d
Merge pull request #13667 from frederic34/patch-4
Update 11.0.0-12.0.0.sql
2020-04-22 01:04:24 +02:00
Laurent Destailleur
5a42af1e07
Merge pull request #13674 from adrienjacob/patch-2
FIX Delete extra fields for supplier invoice line
2020-04-22 00:59:57 +02:00
Laurent Destailleur
ae519a1009
Update fournisseur.facture.class.php 2020-04-22 00:59:22 +02:00
Laurent Destailleur
735bf4dc2d
Merge pull request #13683 from frederic34/patch-7
Update modMyModule.class.php
2020-04-22 00:57:59 +02:00
Laurent Destailleur
cea24db829
Merge pull request #13684 from frederic34/patch-8
Update modulebuilder.lang for typo
2020-04-22 00:56:00 +02:00
Laurent Destailleur
f52408cec1 Look and feel v12 2020-04-22 00:55:38 +02:00
Laurent Destailleur
5c573e197b Look and feel v12 2020-04-22 00:50:04 +02:00
Laurent Destailleur
39345a574e
Merge pull request #13681 from frederic34/patch-6
fix phpunit usergroup class
2020-04-22 00:39:18 +02:00
Laurent Destailleur
3e2f0d0156
Merge pull request #13665 from joseplluis/patch-6
FIX type member extrafields are duplicated on edit
2020-04-22 00:37:50 +02:00
Laurent Destailleur
11e9cc68b7
Merge pull request #13666 from frederic34/patch-1
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
2020-04-22 00:37:19 +02:00
Laurent Destailleur
e8ead1d924
Update expensereport.class.php 2020-04-22 00:36:46 +02:00
Frédéric FRANCE
8f42707220
Update pdf_crabe.modules.php 2020-04-21 23:20:11 +02:00
Frédéric FRANCE
7972a35e36
Update pdf_azur.modules.php 2020-04-21 23:12:12 +02:00
Frédéric FRANCE
2fde77703d
add extrafields in note for enstein 2020-04-21 23:06:41 +02:00
Laurent Paumier
cf05796f31 FIX #13027 expensereport status in generated pdf 2020-04-21 23:01:21 +02:00
Frédéric FRANCE
14cdf19bf5
Update modulebuilder.lang 2020-04-21 22:57:48 +02:00
Frédéric FRANCE
50ea0ee92a
Update modMyModule.class.php 2020-04-21 22:40:24 +02:00
Laurent Destailleur
770fca0b33 Debug the double language feature in pdf 2020-04-21 20:16:36 +02:00
Laurent Destailleur
97b0cabb14 Trans 2020-04-21 18:47:31 +02:00
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
2020-04-21 18:33:11 +02:00
Laurent Destailleur
f670a68b04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/mails.php
2020-04-21 18:29:50 +02:00
Laurent Destailleur
0b790ef327 Sync lang files 2020-04-21 18:18:07 +02:00
Frédéric FRANCE
86e5713233
Update card.php 2020-04-21 16:26:02 +02:00
Frédéric FRANCE
d3c5173c5b
Update usergroup.class.php 2020-04-21 16:14:38 +02:00
stickler-ci
9f4d2ee881 Fixing style errors. 2020-04-21 14:11:33 +00:00
Adrien Jacob
23c2335396
Add API endpoints for supplier invoice lines 2020-04-21 16:07:49 +02:00
Laurent Destailleur
7b99ebfca5 Debug generic translation of fields 2020-04-21 14:54:30 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +02:00
Laurent Destailleur
536ab95207 FIX: The "test smtp connectivity" failed on page to setup mass emailing
Conflicts:
	htdocs/admin/mails.php
2020-04-21 12:50:20 +02:00
Laurent Destailleur
f8ae5d9972 Fix Do not show value if null 2020-04-21 12:00:14 +02:00
Laurent Destailleur
ff5bf040e8 FIX text version of html emailing (removed the body style) 2020-04-21 11:19:27 +02:00
stickler-ci
d4a8718e6c Fixing style errors. 2020-04-21 08:00:14 +00:00
Adrien Jacob
5353082154
FIX Delete extra fields for supplier invoice line 2020-04-21 09:57:45 +02:00
Lenin Rivas
b469775718
More Presition to 8 decimals 2020-04-21 01:21:08 -05:00
Lenin Rivas
f3ebc33d1e
Fix calculator to consume with to produce
i.e. to produce 100 then Order can be produce 135.
2020-04-21 01:14:02 -05:00
mattsidnell
9040c9680d
Removed whitespace 2020-04-20 23:44:23 +01:00
mattsidnell
3f42bfb40f
change 2020-04-20 23:42:12 +01:00
Matt Sidnell
59b574742b Update commonobject.class.php 2020-04-20 22:52:36 +01:00
Matt Sidnell
ea9f0097a2 Add default values for Create
Added default extrafield values for html and text fields to prepopulate data on record create only.
2020-04-20 22:42:13 +01:00
Laurent Destailleur
cadb52c5b3 Look and feel v12 2020-04-20 19:39:34 +02:00
Frédéric FRANCE
b0069f4fed
Update 11.0.0-12.0.0.sql 2020-04-20 18:46:11 +02:00
Frédéric FRANCE
f09fa5226a
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql 2020-04-20 18:43:05 +02:00
Laurent Destailleur
230fe26b58 Look and feel v12 2020-04-20 18:38:25 +02:00
Josep Lluís
e1f1e2bf97
FIX type member extrafields are duplicated on edit
type member extrafields are duplicated on edit, and old usage on create (without tpl)
2020-04-20 17:50:19 +02:00
stickler-ci
f4d1ca94b3 Fixing style errors. 2020-04-20 14:49:18 +00:00
DEMAREST Maxime (Indelog)
66ad197fc5 NEW possibility to show society info when print page
If global config key SHOW_SOCINFO_ON_PRINT is set, this add a block in
top of page which display basic society information when the layout for
printing is activated (print button in top bar is cliqued).
2020-04-20 16:23:54 +02:00
Laurent Destailleur
acc7c371cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/vcard.php
	htdocs/core/boxes/box_birthdays.php
	htdocs/core/boxes/box_birthdays_members.php
	htdocs/core/lib/date.lib.php
2020-04-20 16:10:19 +02:00
Laurent Destailleur
b8e68a5ef7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-20 16:06:31 +02:00
Laurent Destailleur
1e0e4d5d6d
Merge pull request #13653 from atm-maxime/fix_box_birthdays
Fix birthdays boxes and filter on month
2020-04-20 16:04:52 +02:00
Laurent Destailleur
4cd5a1d885
Merge pull request #13661 from frederic34/patch-1
remove debug
2020-04-20 16:03:25 +02:00